Make PermissionManager use ContentSettingsType internally more

chrome/browser/permissions/permission_util.cc

 // Copyright 2015 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_util.h"
 
 #include "build/build_config.h"
 #include "base/feature_list.h"
 #include "base/logging.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
 #include "chrome/common/chrome_features.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/permission_type.h"
 
 using content::PermissionType;
 
-std::string PermissionUtil::GetPermissionString(
-    ContentSettingsType content_type) {
-  PermissionType permission_type;
-  bool success = PermissionUtil::GetPermissionType(
-      content_type, &permission_type);
-  DCHECK(success);
-  return GetPermissionString(permission_type);
-}
-
 // The returned strings must match the RAPPOR metrics in rappor.xml,
 // and any Field Trial configs for the Permissions kill switch e.g.
 // Permissions.Action.Geolocation etc..
-std::string PermissionUtil::GetPermissionString(PermissionType permission) {
-  switch (permission) {
-    case PermissionType::GEOLOCATION:
+std::string PermissionUtil::GetPermissionString(
+    ContentSettingsType content_type) {
+  switch (content_type) {
+    case CONTENT_SETTINGS_TYPE_GEOLOCATION:
       return "Geolocation";
-    case PermissionType::NOTIFICATIONS:
+    case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
       return "Notifications";
-    case PermissionType::MIDI_SYSEX:
+    case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
       return "MidiSysEx";
-    case PermissionType::PUSH_MESSAGING:
+    case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
       return "PushMessaging";
-    case PermissionType::DURABLE_STORAGE:
+    case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE:
       return "DurableStorage";
-    case PermissionType::PROTECTED_MEDIA_IDENTIFIER:
+    case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
       return "ProtectedMediaIdentifier";
-    case PermissionType::AUDIO_CAPTURE:
+    case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
       return "AudioCapture";
-    case PermissionType::VIDEO_CAPTURE:
+    case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
       return "VideoCapture";
-    case PermissionType::MIDI:
+    case CONTENT_SETTINGS_TYPE_MIDI:
       return "Midi";
-    case PermissionType::BACKGROUND_SYNC:
+    case CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC:
       return "BackgroundSync";
-    case PermissionType::FLASH:
+    case CONTENT_SETTINGS_TYPE_PLUGINS:
       return "Flash";
     default:
       break;
   }
   NOTREACHED();
   return std::string();
 }
 
 std::string PermissionUtil::ConvertContentSettingsTypeToSafeBrowsingName(
     ContentSettingsType permission_type) {
@@ skipping 131 matching lines @@
   ContentSetting final_content_setting = settings_map->GetContentSetting(
       primary_url_, secondary_url_, content_type_, std::string());
   if (final_content_setting != CONTENT_SETTING_ALLOW) {
     PermissionType permission_type;
     if (PermissionUtil::GetPermissionType(content_type_, &permission_type)) {
       PermissionUmaUtil::PermissionRevoked(content_type_, source_ui_,
                                            primary_url_, profile_);
     }
   }
 }