media: Remove BrowserCdmFactory inferface.

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/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/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 CdmFactory;
+}
+
 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 33 matching lines @@
                      media::MediaKeys::Exception exception,
                      uint32_t system_code,
                      const std::string& error_message);
 
  protected:
   friend class base::RefCountedThreadSafe<BrowserCdmManager>;
   friend class base::DeleteHelper<BrowserCdmManager>;
   ~BrowserCdmManager() override;
 
  private:
+  // Returns the CdmFactory that can be used to create CDMs. Returns null if
+  // CDM is not supported.
+  media::CdmFactory* GetCdmFactory();
+
   // CDM callbacks.
   void OnSessionMessage(int render_frame_id,
                         int cdm_id,
                         const std::string& session_id,
                         media::MediaKeys::MessageType message_type,
                         const std::vector<uint8>& message,
                         const GURL& legacy_destination_url);
   void OnSessionClosed(int render_frame_id,
                        int cdm_id,
                        const std::string& session_id);
@@ skipping 38 matching lines @@
   void OnCloseSession(int render_frame_id,
                       int cdm_id,
                       uint32_t promise_id,
                       const std::string& session_id);
   void OnRemoveSession(int render_frame_id,
                        int cdm_id,
                        uint32_t promise_id,
                        const std::string& session_id);
   void OnDestroyCdm(int render_frame_id, int cdm_id);
 
-  // Adds a new CDM identified by |cdm_id| for the given |key_system| and
-  // |security_origin|.
-  void AddCdm(int render_frame_id,
-              int cdm_id,
-              uint32_t promise_id,
-              const std::string& key_system,
-              const GURL& security_origin,
-              bool use_hw_secure_codecs);
+  // Callback for CDM creation.
+  void OnCdmCreated(int render_frame_id,
+                    int cdm_id,
+                    const GURL& security_origin,
+                    scoped_ptr<media::SimpleCdmPromise> promise,
+                    const scoped_refptr<media::MediaKeys>& cdm,
+                    const std::string& error_message);
 
   // Removes all CDMs associated with |render_frame_id|.
   void RemoveAllCdmForFrame(int render_frame_id);
 
   // Removes the CDM with the specified id.
   void RemoveCdm(uint64 id);
 
   using PermissionStatusCB = base::Callback<void(bool)>;
 
   // Checks protected media identifier permission for the given
@@ skipping 28 matching lines @@
                               const std::string& session_id,
                               scoped_ptr<media::NewSessionCdmPromise> promise,
                               bool permission_was_allowed);
 
   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_;
 
+  scoped_ptr<media::CdmFactory> cdm_factory_;
+
   // The key in the following maps is a combination of |render_frame_id| and
   // |cdm_id|.
 
   // 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_