Make content::PermissionType an enum class.

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 80 matching lines @@
       default:
         NOTREACHED() << "PERMISSION " << permission << " not accounted for";
     }
 }
 
 void RecordPermissionRequest(
     ContentSettingsType permission, bool secure_origin) {
   content::PermissionType type;
   switch (permission) {
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
-      type = content::PERMISSION_GEOLOCATION;
+      type = content::PermissionType::GEOLOCATION;
       break;
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
-      type = content::PERMISSION_NOTIFICATIONS;
+      type = content::PermissionType::NOTIFICATIONS;
       break;
     case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
-      type = content::PERMISSION_MIDI_SYSEX;
+      type = content::PermissionType::MIDI_SYSEX;
       break;
     case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
-      type = content::PERMISSION_PUSH_MESSAGING;
+      type = content::PermissionType::PUSH_MESSAGING;
       break;
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
     case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
-      type = content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER;
+      type = content::PermissionType::PROTECTED_MEDIA_IDENTIFIER;
       break;
 #endif
     default:
       NOTREACHED() << "PERMISSION " << permission << " not accounted for";
       return;
   }
   UMA_HISTOGRAM_ENUMERATION(
-      "ContentSettings.PermissionRequested", type, content::PERMISSION_NUM);
+      "ContentSettings.PermissionRequested",
+      static_cast<base::HistogramBase::Sample>(type),
+      static_cast<base::HistogramBase::Sample>(content::PermissionType::NUM));
   if (secure_origin) {
     UMA_HISTOGRAM_ENUMERATION(
         "ContentSettings.PermissionRequested_SecureOrigin",
-        type,
-        content::PERMISSION_NUM);
+        static_cast<base::HistogramBase::Sample>(type),
+        static_cast<base::HistogramBase::Sample>(content::PermissionType::NUM));
   } else {
     UMA_HISTOGRAM_ENUMERATION(
         "ContentSettings.PermissionRequested_InsecureOrigin",
-        type,
-        content::PERMISSION_NUM);
+        static_cast<base::HistogramBase::Sample>(type),
+        static_cast<base::HistogramBase::Sample>(content::PermissionType::NUM));
   }
 }
 
 } // namespace
 
 // Make sure you update histograms.xml permission histogram_suffix if you
 // add new permission
 void PermissionContextUmaUtil::PermissionRequested(
     ContentSettingsType permission, const GURL& requesting_origin) {
   RecordPermissionRequest(permission, requesting_origin.SchemeIsSecure());
@@ skipping 15 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());
 }