Replace PermissionType in chrome/ with ContentSettingsType

chrome/browser/media/webrtc/media_permission.cc

Index: chrome/browser/media/webrtc/media_permission.cc
diff --git a/chrome/browser/media/webrtc/media_permission.cc b/chrome/browser/media/webrtc/media_permission.cc
index d05a130cda4b7b1020fb349a574fb19726384ce4..278f7ede84e1516f4762c17d115d7703751e68a8 100644
--- a/chrome/browser/media/webrtc/media_permission.cc
+++ b/chrome/browser/media/webrtc/media_permission.cc
@@ -11,25 +11,10 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/permission_manager.h"
-#include "content/public/browser/permission_type.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
 #include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
 
-namespace {
-
-content::PermissionType ContentSettingsTypeToPermission(
-    ContentSettingsType content_setting) {
-  if (content_setting == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) {
-    return content::PermissionType::AUDIO_CAPTURE;
-  } else {
-    DCHECK_EQ(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, content_setting);
-    return content::PermissionType::VIDEO_CAPTURE;
-  }
-}
-
-}  // namespace
-
 MediaPermission::MediaPermission(ContentSettingsType content_type,
                                  const GURL& requesting_origin,
                                  const GURL& embedding_origin,
@@ -48,12 +33,10 @@ ContentSetting MediaPermission::GetPermissionStatus(
     return CONTENT_SETTING_BLOCK;
   }
 
-  content::PermissionType permission_type =
-      ContentSettingsTypeToPermission(content_type_);
   PermissionManager* permission_manager = PermissionManager::Get(profile_);
 
   // Find out if the kill switch is on. Set the denial reason to kill switch.
-  if (permission_manager->IsPermissionKillSwitchOn(permission_type)) {
+  if (permission_manager->IsPermissionKillSwitchOn(content_type_)) {
     *denial_reason = content::MEDIA_DEVICE_KILL_SWITCH_ON;
     return CONTENT_SETTING_BLOCK;
   }
@@ -61,7 +44,7 @@ ContentSetting MediaPermission::GetPermissionStatus(
   // Check policy and content settings.
   blink::mojom::PermissionStatus status =
       permission_manager->GetPermissionStatus(
-          permission_type, requesting_origin_, embedding_origin_);
+          content_type_, requesting_origin_, embedding_origin_);
   switch (status) {
     case blink::mojom::PermissionStatus::DENIED:
       *denial_reason = content::MEDIA_DEVICE_PERMISSION_DENIED;