media: Make MediaKeys ref-counted.

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 <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 "base/memory/weak_ptr.h"
 #include "content/common/content_export.h"
 #include "content/common/media/cdm_messages.h"
 #include "content/common/media/cdm_messages_enums.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/common/permission_status.mojom.h"
 #include "ipc/ipc_message.h"
-#include "media/base/browser_cdm.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/eme_constants.h"
 #include "media/base/media_keys.h"
 #include "url/gurl.h"
 
 struct CdmHostMsg_CreateSessionAndGenerateRequest_Params;
 
 namespace content {
 
 // This class manages all CDM objects. It receives control operations from the
@@ skipping 11 matching lines @@
   // all messages are posted to the browser UI thread.
   BrowserCdmManager(int render_process_id,
                     const scoped_refptr<base::TaskRunner>& task_runner);
 
   // BrowserMessageFilter implementations.
   void OnDestruct() const override;
   base::TaskRunner* OverrideTaskRunnerForMessage(
       const IPC::Message& message) override;
   bool OnMessageReceived(const IPC::Message& message) override;
 
-  media::BrowserCdm* GetCdm(int render_frame_id, int cdm_id) const;
+  // Returns the CDM associated with |render_frame_id| and |cdm_id|. Returns
+  // null if no such CDM exists.
+  scoped_refptr<media::MediaKeys> GetCdm(int render_frame_id, int cdm_id) const;
 
   // Notifies that the render frame has been deleted so that all CDMs belongs
   // to this render frame needs to be destroyed as well. This is needed because
   // in some cases (e.g. fast termination of the renderer), the message to
   // destroy the CDM will not be received.
   void RenderFrameDeleted(int render_frame_id);
 
   // Promise handlers.
   void ResolvePromise(int render_frame_id, int cdm_id, uint32_t promise_id);
   void ResolvePromiseWithSession(int render_frame_id,
@@ skipping 123 matching lines @@
 
   const int render_process_id_;
 
   // TaskRunner to dispatch all CDM messages to. If it's NULL, all messages are
   // dispatched to the browser UI thread.
   scoped_refptr<base::TaskRunner> task_runner_;
 
   // The key in the following maps is a combination of |render_frame_id| and
   // |cdm_id|.
 
-  // Map of managed BrowserCdms.
-  typedef base::ScopedPtrHashMap<uint64, media::ScopedBrowserCdmPtr> CdmMap;
+  // Map of managed CDMs.
+  typedef std::map<uint64, scoped_refptr<media::MediaKeys>> CdmMap;
   CdmMap cdm_map_;
 
   // Map of CDM's security origin.
   std::map<uint64, GURL> cdm_security_origin_map_;
 
   base::WeakPtrFactory<BrowserCdmManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserCdmManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_