Prepare MediaDrmBridge to work with MediaCodecPlayer

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 media {
-class BrowserCdm;
-}
-
 namespace content {
 
 // This class manages all CDM objects. It receives control operations from the
 // the render process, and forwards them to corresponding CDM object. Callbacks
 // from CDM objects are converted to IPCs and then sent to the render process.
 class CONTENT_EXPORT BrowserCdmManager : public BrowserMessageFilter {
  public:
   // Returns the BrowserCdmManager associated with the |render_process_id|.
   // Returns NULL if no BrowserCdmManager is associated.
   static BrowserCdmManager* FromProcess(int render_process_id);
@@ skipping 149 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, scoped_ptr<media::BrowserCdm>> CdmMap;
+  typedef base::ScopedPtrHashMap<uint64, media::BrowserCdmPtr> 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_