media: Rename PERMISSION_PROTECTED_MEDIA to PERMISSION_PROTECTED_MEDIA_IDENTIFIER.

This makes the naming consistent with other use cases, e.g. CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, ProtectedMediaIdentifierPermissionContext etc.

BUG=446263
TEST=Renaming only.

Review URL: https://codereview.chromium.org/881023002

Cr-Commit-Position: refs/heads/master@{#313582}

8 files changed, 15 insertions, 13 deletions

diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index 0d2d46f..c38ce6a 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -399,7 +399,7 @@ void AwContentBrowserClient::RequestPermission(
       }
       delegate->RequestGeolocationPermission(origin, result_callback);
       break;
-    case content::PERMISSION_PROTECTED_MEDIA:
+    case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER:
       if (!delegate) {
         DVLOG(0) << "Dropping ProtectedMediaIdentifierPermission request";
         result_callback.Run(false);
@@ -436,7 +436,7 @@ void AwContentBrowserClient::CancelPermissionRequest(
     case content::PERMISSION_GEOLOCATION:
       delegate->CancelGeolocationPermissionRequests(origin);
       break;
-    case content::PERMISSION_PROTECTED_MEDIA:
+    case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER:
       delegate->CancelProtectedMediaIdentifierPermissionRequests(origin);
       break;
     case content::PERMISSION_MIDI_SYSEX:
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 8cadba99..b6e6de5 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1913,7 +1913,7 @@ void ChromeContentBrowserClient::RequestPermission(
                               user_gesture,
                               result_callback);
       break;
-    case content::PERMISSION_PROTECTED_MEDIA:
+    case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER:
 #if defined(OS_ANDROID)
       ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(profile)
           ->RequestPermission(web_contents,
@@ -1962,7 +1962,7 @@ content::PermissionStatus ChromeContentBrowserClient::GetPermissionStatus(
     case content::PERMISSION_GEOLOCATION:
       context = GeolocationPermissionContextFactory::GetForProfile(profile);
       break;
-    case content::PERMISSION_PROTECTED_MEDIA:
+    case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER:
 #if defined(OS_ANDROID)
       context = ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(
           profile);
@@ -2018,7 +2018,7 @@ void ChromeContentBrowserClient::CancelPermissionRequest(
       GeolocationPermissionContextFactory::GetForProfile(profile)
           ->CancelPermissionRequest(web_contents, request_id);
       break;
-    case content::PERMISSION_PROTECTED_MEDIA:
+    case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER:
 #if defined(OS_ANDROID)
       ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(profile)
           ->CancelPermissionRequest(web_contents, request_id);
@@ -2048,7 +2048,7 @@ static ContentSettingsType PermissionToContentSetting(
     case content::PERMISSION_GEOLOCATION:
       return CONTENT_SETTINGS_TYPE_GEOLOCATION;
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
-    case content::PERMISSION_PROTECTED_MEDIA:
+    case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER:
       return CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER;
 #endif
     default:
diff --git a/chrome/browser/chrome_content_browser_client_unittest.cc b/chrome/browser/chrome_content_browser_client_unittest.cc
index 9ea8f8c..ebc8d21 100644
--- a/chrome/browser/chrome_content_browser_client_unittest.cc
+++ b/chrome/browser/chrome_content_browser_client_unittest.cc
@@ -174,7 +174,8 @@ TEST_F(PermissionBrowserClientTest, GetPermissionStatusDefault) {
   CheckPermissionStatus(PERMISSION_NOTIFICATIONS, PERMISSION_STATUS_ASK);
   CheckPermissionStatus(PERMISSION_GEOLOCATION, PERMISSION_STATUS_ASK);
 #if defined(OS_ANDROID)
-  CheckPermissionStatus(PERMISSION_PROTECTED_MEDIA, PERMISSION_STATUS_ASK);
+  CheckPermissionStatus(PERMISSION_PROTECTED_MEDIA_IDENTIFIER,
+                        PERMISSION_STATUS_ASK);
 #endif
 }
 
@@ -195,7 +196,8 @@ TEST_F(PermissionBrowserClientTest, GetPermissionStatusAfterSet) {
 #if defined(OS_ANDROID)
   SetPermission(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
                 CONTENT_SETTING_ALLOW);
-  CheckPermissionStatus(PERMISSION_PROTECTED_MEDIA, PERMISSION_STATUS_GRANTED);
+  CheckPermissionStatus(PERMISSION_PROTECTED_MEDIA_IDENTIFIER,
+                        PERMISSION_STATUS_GRANTED);
 #endif
 }
 
diff --git a/chrome/browser/content_settings/permission_context_uma_util.cc b/chrome/browser/content_settings/permission_context_uma_util.cc
index 2712646..2f496384 100644
--- a/chrome/browser/content_settings/permission_context_uma_util.cc
+++ b/chrome/browser/content_settings/permission_context_uma_util.cc
@@ -111,7 +111,7 @@ void RecordPermissionRequest(
       break;
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
     case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
-      type = content::PERMISSION_PROTECTED_MEDIA;
+      type = content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER;
       break;
 #endif
     default:
diff --git a/content/browser/media/cdm/browser_cdm_manager.cc b/content/browser/media/cdm/browser_cdm_manager.cc
index 940867e..358f42f 100644
--- a/content/browser/media/cdm/browser_cdm_manager.cc
+++ b/content/browser/media/cdm/browser_cdm_manager.cc
@@ -517,7 +517,7 @@ void BrowserCdmManager::RequestSessionPermission(
   WebContents* web_contents = WebContents::FromRenderFrameHost(rfh);
   DCHECK(web_contents);
   GetContentClient()->browser()->RequestPermission(
-      content::PERMISSION_PROTECTED_MEDIA, web_contents,
+      content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER, web_contents,
       0,  // bridge id
       security_origin,
       // Only implemented for Android infobars which do not support
diff --git a/content/browser/permissions/permission_service_impl.cc b/content/browser/permissions/permission_service_impl.cc
index 0124d00..5665d2d 100644
--- a/content/browser/permissions/permission_service_impl.cc
+++ b/content/browser/permissions/permission_service_impl.cc
@@ -19,7 +19,7 @@ PermissionType PermissionNameToPermissionType(PermissionName name) {
     case PERMISSION_NAME_NOTIFICATIONS:
       return PERMISSION_NOTIFICATIONS;
     case PERMISSION_NAME_PROTECTED_MEDIA_IDENTIFIER:
-      return PERMISSION_PROTECTED_MEDIA;
+      return PERMISSION_PROTECTED_MEDIA_IDENTIFIER;
   }
 
   NOTREACHED();
diff --git a/content/public/browser/permission_type.h b/content/public/browser/permission_type.h
index 1a3b261..c6e5c65 100644
--- a/content/public/browser/permission_type.h
+++ b/content/public/browser/permission_type.h
@@ -17,7 +17,7 @@ enum PermissionType {
   PERMISSION_PUSH_MESSAGING = 2,
   PERMISSION_NOTIFICATIONS = 3,
   PERMISSION_GEOLOCATION = 4,
-  PERMISSION_PROTECTED_MEDIA = 5,
+  PERMISSION_PROTECTED_MEDIA_IDENTIFIER = 5,
 
   // Always keep this at the end.
   PERMISSION_NUM,
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index e4072d5..63efb57 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -54060,7 +54060,7 @@ To add a new entry, add it with any value and run test to compute valid value.
   <int value="2" label="PERMISSION_PUSH_MESSAGING"/>
   <int value="3" label="PERMISSION_NOTIFICATIONS"/>
   <int value="4" label="PERMISSION_GEOLOCATION"/>
-  <int value="5" label="PERMISSION_PROTECTED_MEDIA"/>
+  <int value="5" label="PERMISSION_PROTECTED_MEDIA_IDENTIFIER"/>
 </enum>
 
 <enum name="PhotoEditorFileType" type="int">