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..d3d4630cb08b54547ac2494d541e47b9589d7875 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 gestures.
+      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;

[xhwang, 2015/01/21 05:43:20]

We used to have this code here to cancel the info bar when the CDM is destroyed.
This code now is removed and we are not calling CancelPermissionRequest(). I
suspect the info bar will persist even after we destroy the CDM that requested
the info bar.

I'll double check this tomorrow and see what's the best way to fix it.

+                 render_frame_id,
+                 cdm_id,
+                 session_id,
+                 mime_type,
+                 init_data));
 }
 
 void BrowserCdmManager::OnUpdateSession(