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

chrome/browser/permissions/permission_context_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_context_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 54 matching lines @@
       action_str = "Dismissed";
       break;
     case IGNORED:
       action_str = "Ignored";
       break;
     default:
       NOTREACHED();
       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())
     return "";
   return base::StringPrintf("ContentSettings.PermissionActions_%s.%s.Url",
                             permission_str.c_str(), action_str.c_str());
 }
 
 void RecordPermissionAction(ContentSettingsType permission,
                             PermissionAction action,
@@ skipping 43 matching lines @@
             action);
         break;
 #endif
       case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE:
         PERMISSION_ACTION_UMA(
             secure_origin, "ContentSettings.PermissionActions_DurableStorage",
             "ContentSettings.PermissionActionsSecureOrigin_DurableStorage",
             "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";
   }
 
   // There are two sets of semi-redundant RAPPOR metrics being reported:
   // The soon-to-be-deprecated single dimensional ones, and the new
   // multi-dimensional ones.
   rappor::RapporService* rappor_service = g_browser_process->rappor_service();
   const std::string rappor_metric = GetRapporMetric(permission, action);
   if (!rappor_metric.empty())
@@ skipping 152 matching lines @@
 
 void PermissionContextUmaUtil::PermissionDismissed(
     ContentSettingsType permission, const GURL& requesting_origin) {
   RecordPermissionAction(permission, DISMISSED, requesting_origin);
 }
 
 void PermissionContextUmaUtil::PermissionIgnored(
     ContentSettingsType permission, const GURL& requesting_origin) {
   RecordPermissionAction(permission, IGNORED, requesting_origin);
 }