Add details (where missing) for histograms and remove a few that are not worth providing more details for.

BUG=None

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270409 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/enumerate_modules_model_win.cc b/chrome/browser/enumerate_modules_model_win.cc
index a3597c3..78c01a43 100644
--- a/chrome/browser/enumerate_modules_model_win.cc
+++ b/chrome/browser/enumerate_modules_model_win.cc
@@ -814,13 +814,6 @@
   return Singleton<EnumerateModulesModel>::get();
 }
 
-// static
-void EnumerateModulesModel::RecordLearnMoreStat(bool from_menu) {
-  UMA_HISTOGRAM_ENUMERATION("ConflictingModule.UserSelection",
-      from_menu ? ACTION_MENU_LEARN_MORE : ACTION_BUBBLE_LEARN_MORE,
-      ACTION_BOUNDARY);
-}
-
 bool EnumerateModulesModel::ShouldShowConflictWarning() const {
   // If the user has acknowledged the conflict notification, then we don't need
   // to show it again (because the scanning only happens once per the lifetime
diff --git a/chrome/browser/enumerate_modules_model_win.h b/chrome/browser/enumerate_modules_model_win.h
index a0a6b27f4..aece435 100644
--- a/chrome/browser/enumerate_modules_model_win.h
+++ b/chrome/browser/enumerate_modules_model_win.h
@@ -250,9 +250,6 @@
 
   static EnumerateModulesModel* GetInstance();
 
-  // Record via UMA what the user selected.
-  static void RecordLearnMoreStat(bool from_menu);
-
   // Returns true if we should show the conflict notification. The conflict
   // notification is only shown once during the lifetime of the process.
   bool ShouldShowConflictWarning() const;
diff --git a/chrome/browser/extensions/dev_mode_bubble_controller.cc b/chrome/browser/extensions/dev_mode_bubble_controller.cc
index db7e36c..b8b0f0e 100644
--- a/chrome/browser/extensions/dev_mode_bubble_controller.cc
+++ b/chrome/browser/extensions/dev_mode_bubble_controller.cc
@@ -105,13 +105,13 @@
 
 void DevModeBubbleDelegate::LogExtensionCount(size_t count) {
   UMA_HISTOGRAM_COUNTS_100(
-      "DevModeExtensionBubble.ExtensionsInDevModeCount", count);
+      "ExtensionBubble.ExtensionsInDevModeCount", count);
 }
 
 void DevModeBubbleDelegate::LogAction(
     ExtensionMessageBubbleController::BubbleAction action) {
   UMA_HISTOGRAM_ENUMERATION(
-      "DevModeExtensionBubble.UserSelection",
+      "ExtensionBubble.DevModeUserSelection",
       action, ExtensionMessageBubbleController::ACTION_BOUNDARY);
 }
 
diff --git a/chrome/browser/extensions/ntp_overridden_bubble_controller.cc b/chrome/browser/extensions/ntp_overridden_bubble_controller.cc
index 632e88d..9a0477fb 100644
--- a/chrome/browser/extensions/ntp_overridden_bubble_controller.cc
+++ b/chrome/browser/extensions/ntp_overridden_bubble_controller.cc
@@ -153,14 +153,14 @@
 }
 
 void NtpOverriddenBubbleDelegate::LogExtensionCount(size_t count) {
-  UMA_HISTOGRAM_COUNTS_100("NtpOverriddenBubble.ExtensionCount", count);
 }
 
 void NtpOverriddenBubbleDelegate::LogAction(
     ExtensionMessageBubbleController::BubbleAction action) {
-  UMA_HISTOGRAM_ENUMERATION("NtpOverriddenBubble.UserSelection",
-                            action,
-                            ExtensionMessageBubbleController::ACTION_BOUNDARY);
+  UMA_HISTOGRAM_ENUMERATION(
+      "ExtensionOverrideBubble.NtpOverriddenUserSelection",
+      action,
+      ExtensionMessageBubbleController::ACTION_BOUNDARY);
 }
 
 }  // namespace
diff --git a/chrome/browser/extensions/settings_api_bubble_controller.cc b/chrome/browser/extensions/settings_api_bubble_controller.cc
index 93fd83bf..b795d88 100644
--- a/chrome/browser/extensions/settings_api_bubble_controller.cc
+++ b/chrome/browser/extensions/settings_api_bubble_controller.cc
@@ -243,14 +243,30 @@
 }
 
 void SettingsApiBubbleDelegate::LogExtensionCount(size_t count) {
-  UMA_HISTOGRAM_COUNTS_100("SettingsApiBubble.ExtensionCount", count);
 }
 
 void SettingsApiBubbleDelegate::LogAction(
     ExtensionMessageBubbleController::BubbleAction action) {
-  UMA_HISTOGRAM_ENUMERATION("SettingsApiBubble.UserSelection",
-                            action,
-                            ExtensionMessageBubbleController::ACTION_BOUNDARY);
+  switch (type_) {
+    case extensions::BUBBLE_TYPE_HOME_PAGE:
+      UMA_HISTOGRAM_ENUMERATION(
+          "ExtensionOverrideBubble.SettingsApiUserSelectionHomePage",
+          action,
+          ExtensionMessageBubbleController::ACTION_BOUNDARY);
+      break;
+    case extensions::BUBBLE_TYPE_STARTUP_PAGES:
+      UMA_HISTOGRAM_ENUMERATION(
+          "ExtensionOverrideBubble.SettingsApiUserSelectionStartupPage",
+          action,
+          ExtensionMessageBubbleController::ACTION_BOUNDARY);
+      break;
+    case extensions::BUBBLE_TYPE_SEARCH_ENGINE:
+      UMA_HISTOGRAM_ENUMERATION(
+          "ExtensionOverrideBubble.SettingsApiUserSelectionSearchEngine",
+          action,
+          ExtensionMessageBubbleController::ACTION_BOUNDARY);
+      break;
+  }
 }
 
 }  // namespace
diff --git a/chrome/browser/extensions/suspicious_extension_bubble_controller.cc b/chrome/browser/extensions/suspicious_extension_bubble_controller.cc
index 83e5354b..4b95c40 100644
--- a/chrome/browser/extensions/suspicious_extension_bubble_controller.cc
+++ b/chrome/browser/extensions/suspicious_extension_bubble_controller.cc
@@ -105,13 +105,13 @@
 void SuspiciousExtensionBubbleDelegate::LogExtensionCount(
     size_t count) {
   UMA_HISTOGRAM_COUNTS_100(
-      "ExtensionWipeoutBubble.ExtensionWipeoutCount", count);
+      "ExtensionBubble.ExtensionWipeoutCount", count);
 }
 
 void SuspiciousExtensionBubbleDelegate::LogAction(
     ExtensionMessageBubbleController::BubbleAction action) {
   UMA_HISTOGRAM_ENUMERATION(
-      "ExtensionWipeoutBubble.UserSelection",
+      "ExtensionBubble.WipeoutUserSelection",
       action, ExtensionMessageBubbleController::ACTION_BOUNDARY);
 }
 
diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
index 821f669..96933fc 100644
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -180,7 +180,6 @@
   if (model->modules_to_notify_about() > 0) {
     GURL help_center_url = model->GetFirstNotableConflict();
     if (help_center_url.is_valid()) {
-      EnumerateModulesModel::RecordLearnMoreStat(true);
       ShowSingletonTab(browser, help_center_url);
       model->AcknowledgeConflictNotification();
       return;
diff --git a/chrome/browser/ui/views/conflicting_module_view_win.cc b/chrome/browser/ui/views/conflicting_module_view_win.cc
index eb4a1e0..2aba72f1 100644
--- a/chrome/browser/ui/views/conflicting_module_view_win.cc
+++ b/chrome/browser/ui/views/conflicting_module_view_win.cc
@@ -193,7 +193,6 @@
 void ConflictingModuleView::ButtonPressed(views::Button* sender,
                                           const ui::Event& event) {
   if (sender == learn_more_button_) {
-    EnumerateModulesModel::RecordLearnMoreStat(false);
     browser_->OpenURL(
         content::OpenURLParams(help_center_url_,
                                content::Referrer(),