Rename ContentSettings.PermissionActions histogram to Permission.Actions

chrome/browser/permissions/permission_uma_util.cc

 // Copyright 2014 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/permissions/permission_uma_util.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/permissions/permission_manager.h"
@@ skipping 77 matching lines @@
 
 void RecordPermissionAction(ContentSettingsType permission,
                             PermissionAction action,
                             const GURL& requesting_origin) {
   bool secure_origin = content::IsOriginSecure(requesting_origin);
 
   switch (permission) {
       case CONTENT_SETTINGS_TYPE_GEOLOCATION:
         PERMISSION_ACTION_UMA(
             secure_origin,
-            "ContentSettings.PermissionActions_Geolocation",
-            "ContentSettings.PermissionActionsSecureOrigin_Geolocation",
-            "ContentSettings.PermissionActionsInsecureOrigin_Geolocation",
+            "Permissions.Action.Geolocation",
+            "Permissions.Action.SecureOrigin.Geolocation",
+            "Permissions.Action.InsecureOrigin.Geolocation",
             action);
         break;
       case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
         PERMISSION_ACTION_UMA(
             secure_origin,
-            "ContentSettings.PermissionActions_Notifications",
-            "ContentSettings.PermissionActionsSecureOrigin_Notifications",
-            "ContentSettings.PermissionActionsInsecureOrigin_Notifications",
+            "Permissions.Action.Notifications",
+            "Permissions.Action.SecureOrigin.Notifications",
+            "Permissions.Action.InsecureOrigin.Notifications",
             action);
         break;
       case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
         PERMISSION_ACTION_UMA(
             secure_origin,
-            "ContentSettings.PermissionActions_MidiSysEx",
-            "ContentSettings.PermissionActionsSecureOrigin_MidiSysEx",
-            "ContentSettings.PermissionActionsInsecureOrigin_MidiSysEx",
+            "Permissions.Action.MidiSysEx",
+            "Permissions.Action.SecureOrigin.MidiSysEx",
+            "Permissions.Action.InsecureOrigin.MidiSysEx",
             action);
         break;
       case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
         PERMISSION_ACTION_UMA(
             secure_origin,
-            "ContentSettings.PermissionActions_PushMessaging",
-            "ContentSettings.PermissionActionsSecureOrigin_PushMessaging",
-            "ContentSettings.PermissionActionsInsecureOrigin_PushMessaging",
+            "Permissions.Action.PushMessaging",
+            "Permissions.Action.SecureOrigin.PushMessaging",
+            "Permissions.Action.InsecureOrigin.PushMessaging",
             action);
         break;
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
       case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
         PERMISSION_ACTION_UMA(
             secure_origin,
-            "ContentSettings.PermissionActions_ProtectedMedia",
-            "ContentSettings.PermissionActionsSecureOrigin_ProtectedMedia",
-            "ContentSettings.PermissionActionsInsecureOrigin_ProtectedMedia",
+            "Permissions.Action.ProtectedMedia",
+            "Permissions.Action.SecureOrigin.ProtectedMedia",
+            "Permissions.Action.InsecureOrigin.ProtectedMedia",
             action);
         break;
 #endif
       case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE:
         PERMISSION_ACTION_UMA(
-            secure_origin, "ContentSettings.PermissionActions_DurableStorage",
-            "ContentSettings.PermissionActionsSecureOrigin_DurableStorage",
-            "ContentSettings.PermissionActionsInsecureOrigin_DurableStorage",
+            secure_origin,
+            "Permissions.Action.DurableStorage",
+            "Permissions.Action.SecureOrigin.DurableStorage",
+            "Permissions.Action.InsecureOrigin.DurableStorage",
             action);
         break;
       case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
         // Media permissions are disabled on insecure origins, so there's no
         // need to record metrics for secure/insecue.
         UMA_HISTOGRAM_ENUMERATION("Permissions.Action.AudioCapture", action,
                                   PERMISSION_ACTION_NUM);
         break;
       case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
         UMA_HISTOGRAM_ENUMERATION("Permissions.Action.VideoCapture", action,
@@ skipping 164 matching lines @@
 
 void PermissionUmaUtil::PermissionDismissed(
     ContentSettingsType permission, const GURL& requesting_origin) {
   RecordPermissionAction(permission, DISMISSED, requesting_origin);
 }
 
 void PermissionUmaUtil::PermissionIgnored(
     ContentSettingsType permission, const GURL& requesting_origin) {
   RecordPermissionAction(permission, IGNORED, requesting_origin);
 }