Refactor ProtectedMediaIdentifierPermissionContext to derive from PermissionContextBase.

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 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/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 1879 matching lines @@
       GeolocationPermissionContextFactory::GetForProfile(profile)
           ->RequestPermission(web_contents,
                               request_id,
                               requesting_frame.GetOrigin(),
                               user_gesture,
                               result_callback);
       break;
     case content::PERMISSION_PROTECTED_MEDIA:
 #if defined(OS_ANDROID)
       ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(profile)
-          ->RequestProtectedMediaIdentifierPermission(
-              web_contents, requesting_frame, result_callback);
+          ->RequestPermission(web_contents,
+                              request_id,
+                              requesting_frame.GetOrigin(),
+                              user_gesture,
+                              result_callback);
 #else
       NOTIMPLEMENTED();
 #endif
       break;
     case content::PERMISSION_PUSH_MESSAGING:
       gcm::PushMessagingPermissionContextFactory::GetForProfile(profile)
           ->RequestPermission(web_contents,
                               request_id,
                               requesting_frame.GetOrigin(),
                               user_gesture,
@@ skipping 32 matching lines @@
       NOTIMPLEMENTED();
 #endif
       break;
     case content::PERMISSION_GEOLOCATION:
       GeolocationPermissionContextFactory::GetForProfile(profile)
           ->CancelPermissionRequest(web_contents, request_id);
       break;
     case content::PERMISSION_PROTECTED_MEDIA:
 #if defined(OS_ANDROID)
       ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(profile)
-          ->CancelProtectedMediaIdentifierPermissionRequests(
-              render_process_id, render_view_id, requesting_frame);
+          ->CancelPermissionRequest(web_contents, request_id);
 #else
       NOTIMPLEMENTED();
 #endif
       break;
     case content::PERMISSION_PUSH_MESSAGING:
       NOTIMPLEMENTED() << "CancelPermission not implemented for " << permission;
       break;
     case content::PERMISSION_NUM:
       NOTREACHED() << "Invalid CancelPermission for " << permission;
       break;
   }
 }
 
 // Helper method to translate from Permissions to ContentSettings
 static ContentSettingsType PermissionToContentSetting(
     content::PermissionType permission) {
   switch (permission) {
     case content::PERMISSION_MIDI_SYSEX:
       return CONTENT_SETTINGS_TYPE_MIDI_SYSEX;
     case content::PERMISSION_PUSH_MESSAGING:
       return CONTENT_SETTINGS_TYPE_PUSH_MESSAGING;
     case content::PERMISSION_NOTIFICATIONS:
       return CONTENT_SETTINGS_TYPE_NOTIFICATIONS;
     case content::PERMISSION_GEOLOCATION:
       return CONTENT_SETTINGS_TYPE_GEOLOCATION;
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
     case content::PERMISSION_PROTECTED_MEDIA:
       return CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER;
 #endif
     default:
       NOTREACHED() << "Unknown content setting for permission " << permission;
       return CONTENT_SETTINGS_TYPE_DEFAULT;
   }
 }
 
 void ChromeContentBrowserClient::RegisterPermissionUsage(
@@ skipping 559 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome