Group the different permission related methods in the content api.

content/browser/media/cdm/browser_cdm_manager.cc

 // Copyright 2014 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 "content/browser/media/cdm/browser_cdm_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/task_runner.h"
@@ skipping 234 matching lines @@
     NOTREACHED();
     SendSessionError(render_frame_id, cdm_id, session_id);
     return;
   }
   GURL security_origin = iter->second;
 
   RenderFrameHost* rfh =
       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 */,

[Peter Beverloo, 2014/10/24 14:37:28]

Please use c++ style comments:

0,  // bridge_id

[Miguel Garcia, 2014/10/24 16:05:32]

Done.

       security_origin,
+      /* only implemented for android infobars which do not support
+         user gesture */
+      true,

[Peter Beverloo, 2014/10/24 14:37:28]

true,  // Only implemented for Android infobars which do not support
       // user gestures.

(also fixes capitalization and spelling)

[Miguel Garcia, 2014/10/24 16:05:32]

Done.

       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(
     int render_frame_id,
     int cdm_id,
     uint32 session_id,
     const std::vector<uint8>& response) {
   BrowserCdm* cdm = GetCdm(render_frame_id, cdm_id);
   if (!cdm) {
     DLOG(WARNING) << "No CDM found for: " << render_frame_id << ", " << cdm_id;
@@ skipping 94 matching lines @@
     DLOG(WARNING) << "No CDM found for: " << render_frame_id << ", " << cdm_id;
     SendSessionError(render_frame_id, cdm_id, session_id);
     return;
   }
 
   // This could fail, in which case a SessionError will be fired.
   cdm->CreateSession(session_id, content_type, &init_data[0], init_data.size());
 }
 
 }  // namespace content