Add Rappor reporting for grant/deny/cancel/ignore of Mediastream permissions

chrome/browser/permissions/permission_context_uma_util.cc

Index: chrome/browser/permissions/permission_context_uma_util.cc
diff --git a/chrome/browser/permissions/permission_context_uma_util.cc b/chrome/browser/permissions/permission_context_uma_util.cc
index a503ec0c8b18068236f3f509af735a75ea5c09ce..a343997ee6af4facda8709497db572bfd4f27dc5 100644
--- a/chrome/browser/permissions/permission_context_uma_util.cc
+++ b/chrome/browser/permissions/permission_context_uma_util.cc
@@ -72,6 +72,11 @@ const std::string GetRapporMetric(ContentSettingsType permission,
       break;
   }
 
+  // Do not record the deprecated RAPPOR metrics for media permissions.
+  if (permission == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA ||
+      permission == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC)

[tommi (sloooow) - chröme, 2015/10/29 08:30:16]

nit: {}

[tsergeant, 2015/11/05 02:34:42]

Done.

+    return "";
+
   std::string permission_str =
       PermissionUtil::GetPermissionString(permission);
   if (permission_str.empty())
@@ -135,6 +140,16 @@ void RecordPermissionAction(ContentSettingsType permission,
             "ContentSettings.PermissionActionsInsecureOrigin_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,
+                                  PERMISSION_ACTION_NUM);
+        break;
       default:
         NOTREACHED() << "PERMISSION " << permission << " not accounted for";
   }