Refactor ProtectedMediaIdentifierPermissionContext to derive from PermissionContextBase.

chrome/browser/content_settings/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 "base/metrics/histogram.h"
 #include "chrome/browser/content_settings/permission_context_uma_util.h"
 #include "content/public/browser/permission_type.h"
 #include "url/gurl.h"
 
 // UMA keys need to be statically initialized so plain function would not
@@ skipping 23 matching lines @@
 enum PermissionAction {
   GRANTED = 0,
   DENIED = 1,
   DISMISSED = 2,
   IGNORED = 3,
 
   // Always keep this at the end.
   PERMISSION_ACTION_NUM,
 };
 
 void RecordPermissionAction(

[Miguel Garcia, 2014/12/03 18:57:36]

Don't you need to add media here as well?

[timvolodine, 2014/12/04 17:22:26]

Done.

       ContentSettingsType permission,
       PermissionAction action,
       bool secure_origin) {
   switch (permission) {
       case CONTENT_SETTINGS_TYPE_GEOLOCATION:
         PERMISSION_ACTION_UMA(
             secure_origin,
             "ContentSettings.PermissionActions_Geolocation",
             "ContentSettings.PermissionActionsSecureOrigin_Geolocation",
             "ContentSettings.PermissionActionsInsecureOrigin_Geolocation",
@@ skipping 43 matching lines @@
       break;
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
       type = content::PERMISSION_NOTIFICATIONS;
       break;
     case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
       type = content::PERMISSION_MIDI_SYSEX;
       break;
     case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
       type = content::PERMISSION_PUSH_MESSAGING;
       break;
+#if defined(OS_ANDROID)

[Miguel Garcia, 2014/12/03 18:57:36]

You need a change in histograms.xml to add the new type don't you?

[timvolodine, 2014/12/04 17:22:26]

Yes, thanks for catching this. Done.

+    case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
+      type = content::PERMISSION_PROTECTED_MEDIA;
+      break;
+#endif
     default:
       NOTREACHED() << "PERMISSION " << permission << " not accounted for";
       return;
   }
   UMA_HISTOGRAM_ENUMERATION(
       "ContentSettings.PermissionRequested", type, content::PERMISSION_NUM);
   if (secure_origin) {
     UMA_HISTOGRAM_ENUMERATION(
         "ContentSettings.PermissionRequested_SecureOrigin",
         type,
@@ skipping 31 matching lines @@
     ContentSettingsType permission, const GURL& requesting_origin) {
   RecordPermissionAction(permission, DISMISSED,
                          requesting_origin.SchemeIsSecure());
 }
 
 void PermissionContextUmaUtil::PermissionIgnored(
     ContentSettingsType permission, const GURL& requesting_origin) {
   RecordPermissionAction(permission, IGNORED,
                          requesting_origin.SchemeIsSecure());
 }