Group the different permission related methods in the content api.

chrome/browser/media/protected_media_identifier_permission_context.cc

 // Copyright 2013 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/media/protected_media_identifier_permission_context.h"
 
 #include <functional>
 #include <string>
 #include <vector>
 
@@ skipping 30 matching lines @@
   // ProtectedMediaIdentifierPermissionContext may be destroyed on either
   // the UI thread or the IO thread, but the PermissionQueueController must have
   // been destroyed on the UI thread.
   DCHECK(!permission_queue_controller_.get());
 }
 
 void ProtectedMediaIdentifierPermissionContext::
     RequestProtectedMediaIdentifierPermission(
         content::WebContents* web_contents,
         const GURL& origin,
-        base::Callback<void(bool)> result_callback,
-        base::Closure* cancel_callback) {
+        base::Callback<void(bool)> result_callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (shutting_down_)
     return;
 
   int render_process_id = web_contents->GetRenderProcessHost()->GetID();
   int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();
-  if (cancel_callback) {
-    *cancel_callback = base::Bind(
-        &ProtectedMediaIdentifierPermissionContext::
-            CancelProtectedMediaIdentifierPermissionRequests,
-        this, render_process_id, render_view_id, origin);
-  }
 
   const PermissionRequestID id(
       render_process_id, render_view_id, 0, origin);
 
 #if defined(ENABLE_EXTENSIONS)
   if (extensions::GetViewType(web_contents) !=
       extensions::VIEW_TYPE_TAB_CONTENTS) {
     // The tab may have gone away, or the request may not be from a tab at all.
     LOG(WARNING)
         << "Attempt to use protected media identifier in tabless renderer: "
@@ skipping 141 matching lines @@
                    origin));
     return;
   }
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (shutting_down_)
     return;
   QueueController()->CancelInfoBarRequest(
       PermissionRequestID(render_process_id, render_view_id, 0,
                           origin));
 }