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

chrome/browser/permissions/permission_uma_util.cc

Index: chrome/browser/permissions/permission_uma_util.cc
diff --git a/chrome/browser/permissions/permission_uma_util.cc b/chrome/browser/permissions/permission_uma_util.cc
index f7fbd6a05b2b842d1f921955bd72a0761e0c5c0d..b9e60b2e0fa912cf1092ba6a7dc06ceaf94640e8 100644
--- a/chrome/browser/permissions/permission_uma_util.cc
+++ b/chrome/browser/permissions/permission_uma_util.cc
@@ -72,6 +72,12 @@ 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) {
+    return "";
+  }
+
   std::string permission_str =
       PermissionUtil::GetPermissionString(permission);
   if (permission_str.empty())
@@ -135,6 +141,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";
   }