Fix some UMA warnings across chromium.

Some BrowserPlugin and WebView related UMAs were not updated.
Indent some UserMetricsAction() constructor to specify the UMA name to
appear on the same line so there are no warnings, note that this also
lead to shortening some string to fit in 80 chars but should not be an
issue.

BUG=317084
Test=None

Review URL: https://codereview.chromium.org/77673002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236312 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 32 insertions, 12 deletions

diff --git a/chrome/browser/ui/passwords/password_manager_presenter.cc b/chrome/browser/ui/passwords/password_manager_presenter.cc
index 6637087..6223656 100644
--- a/chrome/browser/ui/passwords/password_manager_presenter.cc
+++ b/chrome/browser/ui/passwords/password_manager_presenter.cc
@@ -89,8 +89,7 @@ void PasswordManagerPresenter::RemovePasswordException(size_t index) {
     return;
   store->RemoveLogin(*password_exception_list_[index]);
   content::RecordAction(
-      content::UserMetricsAction(
-          "PasswordManager_RemovePasswordException"));
+      content::UserMetricsAction("PasswordManager_RemovePasswordException"));
 }
 
 void PasswordManagerPresenter::RequestShowPassword(size_t index) {
diff --git a/chrome/browser/ui/views/profile_reset_bubble_view.cc b/chrome/browser/ui/views/profile_reset_bubble_view.cc
index bc55d01..58d951e 100644
--- a/chrome/browser/ui/views/profile_reset_bubble_view.cc
+++ b/chrome/browser/ui/views/profile_reset_bubble_view.cc
@@ -379,8 +379,8 @@ void ProfileResetBubbleView::ButtonPressed(views::Button* sender,
                                            const ui::Event& event) {
   if (sender == controls_.reset_button) {
     DCHECK(!resetting_);
-    content::RecordAction(content::UserMetricsAction(
-        "SettingsResetBubble.Reset"));
+    content::RecordAction(
+        content::UserMetricsAction("SettingsResetBubble.Reset"));
 
     // Remember that the user chose to reset, and that resetting is underway.
     chose_to_reset_ = true;
@@ -397,8 +397,8 @@ void ProfileResetBubbleView::ButtonPressed(views::Button* sender,
     }
   } else if (sender == controls_.no_thanks_button) {
     DCHECK(!resetting_);
-    content::RecordAction(content::UserMetricsAction(
-        "SettingsResetBubble.NoThanks"));
+    content::RecordAction(
+        content::UserMetricsAction("SettingsResetBubble.NoThanks"));
 
     if (global_error_)
       global_error_->OnBubbleViewNoThanksButtonPressed();
@@ -413,8 +413,8 @@ void ProfileResetBubbleView::ButtonPressed(views::Button* sender,
 }
 
 void ProfileResetBubbleView::LinkClicked(views::Link* source, int flags) {
-  content::RecordAction(content::UserMetricsAction(
-      "SettingsResetBubble.LearnMore"));
+  content::RecordAction(
+      content::UserMetricsAction("SettingsResetBubble.LearnMore"));
   navigator_->OpenURL(content::OpenURLParams(
       GURL(chrome::kResetProfileSettingsLearnMoreURL), content::Referrer(),
       NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false));
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index 6b080a0..08894f9 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -1261,8 +1261,8 @@ void ContentSettingsHandler::SetContentFilter(const ListValue* args) {
           UserMetricsAction("Options_DefaultMediaStreamMicSettingChanged"));
       break;
     case CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS:
-      content::RecordAction(UserMetricsAction(
-          "Options_DefaultMultipleAutomaticDownloadsSettingChanged"));
+      content::RecordAction(
+          UserMetricsAction("Options_DefaultMultipleAutomaticDLSettingChange"));
       break;
     case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
       content::RecordAction(
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
index db6ff7d..a02a376 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -215,8 +215,7 @@ class BrowserPluginGuest::JavaScriptDialogRequest : public PermissionRequest {
   JavaScriptDialogRequest(const DialogClosedCallback& callback)
       : callback_(callback) {
     RecordAction(
-        UserMetricsAction(
-            "BrowserPlugin.Guest.PermissionRequest.JavaScriptDialog"));
+        UserMetricsAction("BrowserPlugin.Guest.PermissionRequest.JSDialog"));
   }
 
   virtual void Respond(bool should_allow,
diff --git a/tools/metrics/actions/chromeactions.txt b/tools/metrics/actions/chromeactions.txt
index 33f9f63..4972707 100644
--- a/tools/metrics/actions/chromeactions.txt
+++ b/tools/metrics/actions/chromeactions.txt
@@ -257,11 +257,24 @@
 0xdd4859340407e122	BrowserPlugin.Guest.PermissionRequest
 0x20ba04d2331f9bfa	BrowserPlugin.Guest.PermissionRequest.Download
 0x8d7c904ec99c12fd	BrowserPlugin.Guest.PermissionRequest.Geolocation
+0x5f74e8609b46daa5	BrowserPlugin.Guest.PermissionRequest.JSDialog
 0xf9453f6f98d12f02	BrowserPlugin.Guest.PermissionRequest.Media
 0x2b75a893f779e6df	BrowserPlugin.Guest.PermissionRequest.NewWindow
 0x2ff464e34165d946	BrowserPlugin.Guest.PermissionRequest.PointerLock
 0x69b219de7f17c077	BrowserPlugin.Guest.Responsive
 0x7784cf1f8b1cc3f0	BrowserPlugin.Guest.Terminate
+0xd09d482ae9adff4b	BrowserPlugin.PermissionAllow.Download
+0x3a3bb14eac6426bb	BrowserPlugin.PermissionAllow.Geolocation
+0x442d4c824f5b759b	BrowserPlugin.PermissionAllow.JSDialog
+0xdc67748c325b2bef	BrowserPlugin.PermissionAllow.Media
+0xacb04f4eac00b0c1	BrowserPlugin.PermissionAllow.NewWindow
+0x22e3b8fb14f52567	BrowserPlugin.PermissionAllow.PointerLock
+0x72265ae5cdb0f2a7	BrowserPlugin.PermissionDeny.Download
+0x26bf51e48e5d3ea9	BrowserPlugin.PermissionDeny.Geolocation
+0xd04b55f5fd0ebf0e	BrowserPlugin.PermissionDeny.JSDialog
+0x7fd68dfe783d4d92	BrowserPlugin.PermissionDeny.Media
+0x5d9f67464e131ce8	BrowserPlugin.PermissionDeny.NewWindow
+0x0e3e6d08f647aa69	BrowserPlugin.PermissionDeny.PointerLock
 0x24941c4fd42fb51f	CanCommitURL_BlockedAndKilled
 0xea4788705e6873b4	Cancel
 0xb1c07c66ce4ae2ac	Caption_ClickTogglesMaximize
@@ -327,6 +340,7 @@
 0x5fb63579fc981698	Copy
 0x89d1b3eda3d01e3a	CopyToFindPboard
 0xb3d0f42456c6eaf6	CopyURLToClipBoard
+0x7f1e737de964f0e9	CreateHostedApp
 0x2aeb39c03cc86464	CreateLink
 0x1225d110ef7fba17	CreateProfile
 0x30604f84327d0ae5	CreateShortcut
@@ -1304,6 +1318,7 @@
 0x04303682ca0b2a8d	Options_DefaultMediaStreamMicSettingChanged
 0x6a97ed68e3457d0e	Options_DefaultMediaStreamSettingChanged
 0xfca02a749fa0f811	Options_DefaultMouseLockSettingChanged
+0xef2e38e7df25f488	Options_DefaultMultipleAutomaticDLSettingChange
 0xbc49f9107e7c7c7c	Options_DefaultNotificationsSettingChanged
 0x6b91203aa4b5fb3c	Options_DefaultPluginsSettingChanged
 0x8b20daa9a0c1a0a6	Options_DefaultPopupsSettingChanged
@@ -1573,6 +1588,9 @@
 0x2d9491c68a4ec635	SelectTab5
 0x8fa9d8e88271c82d	SelectTab6
 0xdaa611aa645914e5	SelectTab7
+0x47c724f97b092332	SettingsResetBubble.LearnMore
+0x3dfc1380fca28405	SettingsResetBubble.NoThanks
+0x695a1dd28410f12d	SettingsResetBubble.Reset
 0x7eb3241cff786567	SettingsResetBubble.Show
 0x9ab81dfe74af9e92	Shelf_AlignmentSetBottom
 0x10ae2fefd987bcfa	Shelf_AlignmentSetLeft
@@ -1691,6 +1709,10 @@
 0x462194a5096cab5e	WebView.ClearData
 0x1058b3af68275a1d	WebView.ExecuteScript
 0xbe313bfe6325dad0	WebView.Go
+0xa63d5515805909a0	WebView.Guest.ClearData
+0xd3e3c2a0e45dd70c	WebView.Guest.OverrideUA
+0x5b65b0b495331715	WebView.Guest.PermissionAllow.PluginLoad
+0xa813e2cd71aa848d	WebView.Guest.PermissionDeny.PluginLoad
 0x8d7ae1bf68c5a2fe	WebView.Guest.PluginLoadAllowed
 0x26c605f6aa82b885	WebView.Guest.PluginLoadDenied
 0xdc50ad37450d2f2d	WebView.Guest.PluginLoadRequest