Group the different permission related methods in the content api.

content/browser/media/cdm/browser_cdm_manager.cc

Index: content/browser/media/cdm/browser_cdm_manager.cc
diff --git a/content/browser/media/cdm/browser_cdm_manager.cc b/content/browser/media/cdm/browser_cdm_manager.cc
index ff88aba0c32426390fe3c1f68a1931692888abb3..53ad576c6cda745b594c8eb5e77bd48d82c1288e 100644
--- a/content/browser/media/cdm/browser_cdm_manager.cc
+++ b/content/browser/media/cdm/browser_cdm_manager.cc
@@ -252,20 +252,21 @@ void BrowserCdmManager::OnCreateSession(
       RenderFrameHost::FromID(render_process_id_, render_frame_id);
   WebContents* web_contents = WebContents::FromRenderFrameHost(rfh);
   DCHECK(web_contents);
-
-  base::Closure cancel_callback;
-  GetContentClient()->browser()->RequestProtectedMediaIdentifierPermission(
+  GetContentClient()->browser()->RequestPermission(
+      content::PERMISSION_PROTECTED_MEDIA,
       web_contents,
+      0 /* bridge id */,
       security_origin,
+      /* only implemented for android infobars which do not support
+         user gesture */
+      true,
       base::Bind(&BrowserCdmManager::CreateSessionIfPermitted,
                  this,
-                 render_frame_id, cdm_id, session_id,
-                 mime_type, init_data),
-      &cancel_callback);
-
-  if (cancel_callback.is_null())
-    return;
-  cdm_cancel_permission_map_[GetId(render_frame_id, cdm_id)] = cancel_callback;
+                 render_frame_id,
+                 cdm_id,
+                 session_id,
+                 mime_type,
+                 init_data));
 }
 
 void BrowserCdmManager::OnUpdateSession(