Fix UserActionsMetrics calls for content settings UMA

chrome/browser/ui/webui/options/content_settings_handler.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/content_settings_handler.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 673 matching lines @@
   if (content_type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS) {
     Profile* profile = Profile::FromWebUI(web_ui_);
     DesktopNotificationServiceFactory::GetForProfile(profile)->
         SetDefaultContentSetting(default_setting);
   } else {
     GetContentSettingsMap()->
         SetDefaultContentSetting(content_type, default_setting);
   }
   switch (content_type) {
     case CONTENT_SETTINGS_TYPE_COOKIES:
-      UserMetrics::RecordAction(UserMetricsAction(
-          "ContentSetting_DefaultCookieSettingChanged"));
+      UserMetrics::RecordAction(
+          UserMetricsAction("Options_DefaultCookieSettingChanged"));
       break;
     case CONTENT_SETTINGS_TYPE_IMAGES:
-      UserMetrics::RecordAction(UserMetricsAction(
-          "ContentSetting_DefaultImagesSettingChanged"));
+      UserMetrics::RecordAction(
+          UserMetricsAction("Options_DefaultImagesSettingChanged"));
       break;
     case CONTENT_SETTINGS_TYPE_JAVASCRIPT:
-      UserMetrics::RecordAction(UserMetricsAction(
-          "ContentSetting_DefaultJavaScriptSettingChanged"));
+      UserMetrics::RecordAction(
+          UserMetricsAction("Options_DefaultJavaScriptSettingChanged"));
       break;
     case CONTENT_SETTINGS_TYPE_PLUGINS:
-      UserMetrics::RecordAction(UserMetricsAction(
-          "ContentSetting_DefaultPluginsSettingChanged"));
+      UserMetrics::RecordAction(
+          UserMetricsAction("Options_DefaultPluginsSettingChanged"));
       break;
     case CONTENT_SETTINGS_TYPE_POPUPS:
-      UserMetrics::RecordAction(UserMetricsAction(
-          "ContentSettings_DefaultPopupsSettingChanged"));
+      UserMetrics::RecordAction(
+          UserMetricsAction("Options_DefaultPopupsSettingChanged"));
       break;
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
-      UserMetrics::RecordAction(UserMetricsAction(
-          "ContentSettings_DefaultNotificationsSettingChanged"));
+      UserMetrics::RecordAction(
+          UserMetricsAction("Options_DefaultNotificationsSettingChanged"));
       break;
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
-      UserMetrics::RecordAction(UserMetricsAction(
-          "ContentSetting_DefaultGeolocationSettingChanged"));
+      UserMetrics::RecordAction(
+          UserMetricsAction("Options_DefaultGeolocationSettingChanged"));
       break;
     case CONTENT_SETTINGS_TYPE_INTENTS:
-      UserMetrics::RecordAction(UserMetricsAction(
-          "ContentSetting_DefaultHandlersSettingChanged"));
+      UserMetrics::RecordAction(
+          UserMetricsAction("Options_DefaultHandlersSettingChanged"));
       break;
     case CONTENT_SETTINGS_TYPE_MOUSELOCK:
-      UserMetrics::RecordAction(UserMetricsAction(
-          "ContentSettings_DefaultMouseLockSettingChanged"));
+      UserMetrics::RecordAction(
+          UserMetricsAction("Options_DefaultMouseLockSettingChanged"));
       break;
     default:
       break;
   }
 }
 
 void ContentSettingsHandler::RemoveException(const ListValue* args) {
   size_t arg_i = 0;
   std::string type_string;
   CHECK(args->GetString(arg_i++, &type_string));
@@ skipping 130 matching lines @@
   return Profile::FromWebUI(web_ui_)->GetProtocolHandlerRegistry();
 }
 
 HostContentSettingsMap*
     ContentSettingsHandler::GetOTRContentSettingsMap() {
   Profile* profile = Profile::FromWebUI(web_ui_);
   if (profile->HasOffTheRecordProfile())
     return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap();
   return NULL;
 }