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

content/browser/media/cdm/browser_cdm_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_
 #define CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_
 
 #include <map>
+#include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
 #include "content/common/media/cdm_messages_enums.h"
 #include "ipc/ipc_message.h"
@@ skipping 89 matching lines @@
   WebContents* const web_contents_;
 
   // A map from CDM IDs to managed CDMs.
   typedef base::ScopedPtrHashMap<int, media::BrowserCdm> CdmMap;
   CdmMap cdm_map_;
 
   // Map from CDM ID to CDM's security origin.
   std::map<int, GURL> cdm_security_origin_map_;
 
   // Map from CDM ID to a callback to cancel the permission request.
-  std::map<int, base::Closure> cdm_cancel_permision_map_;
+  std::set<int> cdm_cancel_permision_set_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<BrowserCdmManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserCdmManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_