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

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/command_line.h"
 #include "content/common/media/cdm_messages.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/render_frame_host.h"
@@ skipping 137 matching lines @@
   }
 
   std::map<int, GURL>::const_iterator iter =
       cdm_security_origin_map_.find(cdm_id);
   if (iter == cdm_security_origin_map_.end()) {
     NOTREACHED();
     OnSessionError(cdm_id, session_id, MediaKeys::kUnknownError, 0);
     return;
   }
 
-  base::Closure cancel_callback;
-  GetContentClient()->browser()->RequestProtectedMediaIdentifierPermission(
+  GetContentClient()->browser()->RequestPermission(
+      content::PERMISSION_PROTECTED_MEDIA,
       web_contents_,
+      -1,
       iter->second,
+      true,
       base::Bind(&BrowserCdmManager::CreateSessionIfPermitted,
                  weak_ptr_factory_.GetWeakPtr(),
                  cdm_id,
                  session_id,
                  mime_type,
-                 init_data),
-      &cancel_callback);
-  if (!cancel_callback.is_null())
-    cdm_cancel_permision_map_[cdm_id] = cancel_callback;
+                 init_data));
 }
 
 void BrowserCdmManager::OnUpdateSession(
     int cdm_id,
     uint32 session_id,
     const std::vector<uint8>& response) {
   BrowserCdm* cdm = GetCdm(cdm_id);
   if (!cdm) {
     DLOG(WARNING) << "No CDM for ID " << cdm_id << " found";
     OnSessionError(cdm_id, session_id, MediaKeys::kUnknownError, 0);
@@ skipping 24 matching lines @@
 void BrowserCdmManager::OnDestroyCdm(int cdm_id) {
   BrowserCdm* cdm = GetCdm(cdm_id);
   if (!cdm)
     return;
 
   CancelAllPendingSessionCreations(cdm_id);
   RemoveCdm(cdm_id);
 }
 
 void BrowserCdmManager::CancelAllPendingSessionCreations(int cdm_id) {
-  if (cdm_cancel_permision_map_.count(cdm_id)) {
-    cdm_cancel_permision_map_[cdm_id].Run();
-    cdm_cancel_permision_map_.erase(cdm_id);
+  if (cdm_cancel_permision_set_.find(cdm_id)
+      != cdm_cancel_permision_set_.end()) {
+    std::map<int, GURL>::const_iterator iter =
+          cdm_security_origin_map_.find(cdm_id);
+      if (iter == cdm_security_origin_map_.end()) {
+        NOTREACHED();
+        return;
+      }
+    GetContentClient()->browser()->CancelPermissionRequest(
+              content::PERMISSION_PROTECTED_MEDIA,
+              web_contents_, -1, iter->second);
+    cdm_cancel_permision_set_.erase(cdm_id);
   }
 }
 
 void BrowserCdmManager::AddCdm(int cdm_id,
                                const std::string& key_system,
                                const GURL& security_origin) {
   DCHECK(!GetCdm(cdm_id));
   base::WeakPtr<BrowserCdmManager> weak_this = weak_ptr_factory_.GetWeakPtr();
   scoped_ptr<BrowserCdm> cdm(media::CreateBrowserCdm(
       key_system,
@@ skipping 14 matching lines @@
   cdm_security_origin_map_[cdm_id] = security_origin;
 }
 
 void BrowserCdmManager::RemoveCdm(int cdm_id) {
   // TODO(xhwang): Detach CDM from the player it's set to. In prefixed
   // EME implementation the current code is fine because we always destroy the
   // player before we destroy the DrmBridge. This will not always be the case
   // in unprefixed EME implementation.
   cdm_map_.erase(cdm_id);
   cdm_security_origin_map_.erase(cdm_id);
-  cdm_cancel_permision_map_.erase(cdm_id);
+  cdm_cancel_permision_set_.erase(cdm_id);
 }
 
 int BrowserCdmManager::RoutingID() {
   return render_frame_host_->GetRoutingID();
 }
 
 bool BrowserCdmManager::Send(IPC::Message* msg) {
   return render_frame_host_->Send(msg);
 }
 
 void BrowserCdmManager::CreateSessionIfPermitted(
     int cdm_id,
     uint32 session_id,
     const std::string& content_type,
     const std::vector<uint8>& init_data,
     bool permitted) {
-  cdm_cancel_permision_map_.erase(cdm_id);
+  cdm_cancel_permision_set_.erase(cdm_id);
   if (!permitted) {
     OnSessionError(cdm_id, session_id, MediaKeys::kUnknownError, 0);
     return;
   }
 
   BrowserCdm* cdm = GetCdm(cdm_id);
   if (!cdm) {
     DLOG(WARNING) << "No CDM for ID: " << cdm_id << " found";
     OnSessionError(cdm_id, session_id, MediaKeys::kUnknownError, 0);
     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