Refactor content client to include a single Request/CancelPermission method.

chrome/browser/media/protected_media_identifier_permission_context.h

Index: chrome/browser/media/protected_media_identifier_permission_context.h
diff --git a/chrome/browser/media/protected_media_identifier_permission_context.h b/chrome/browser/media/protected_media_identifier_permission_context.h
index 473aa4e8f5d42112d9ed54e9dfd1c5947b9b6e15..5b8d0544c04480995a2d52991d105f1547266af7 100644
--- a/chrome/browser/media/protected_media_identifier_permission_context.h
+++ b/chrome/browser/media/protected_media_identifier_permission_context.h
@@ -31,8 +31,12 @@ class ProtectedMediaIdentifierPermissionContext
   void RequestProtectedMediaIdentifierPermission(
       content::WebContents* web_contents,
       const GURL& origin,
-      base::Callback<void(bool)> result_callback,
-      base::Closure* cancel_callback);
+      base::Callback<void(bool)> result_callback);
+
+  void CancelProtectedMediaIdentifierPermissionRequests(
+      int render_process_id,
+      int render_view_id,
+      const GURL& origin);
 
   // Called on the UI thread when the profile is about to be destroyed.
   void ShutdownOnUIThread();
@@ -48,11 +52,6 @@ class ProtectedMediaIdentifierPermissionContext
   // if necessary.
   PermissionQueueController* QueueController();
 
-  void CancelProtectedMediaIdentifierPermissionRequests(
-      int render_process_id,
-      int render_view_id,
-      const GURL& origin);
-
   // Notifies whether or not the corresponding bridge is allowed to use
   // protected media identifier via
   // SetProtectedMediaIdentifierPermissionResponse(). Called on the UI thread.