media: Remove BrowserCdmFactory inferface.

chromecast/browser/media/cast_browser_cdm_factory.cc

Index: chromecast/browser/media/cast_browser_cdm_factory.cc
diff --git a/chromecast/browser/media/cast_browser_cdm_factory.cc b/chromecast/browser/media/cast_browser_cdm_factory.cc
index e93927b0f488c4e1d8641ac0ad7703ced9dcf571..c657a691ddfe159fff3081b444ee1d1e546a20f5 100644
--- a/chromecast/browser/media/cast_browser_cdm_factory.cc
+++ b/chromecast/browser/media/cast_browser_cdm_factory.cc
@@ -10,51 +10,60 @@
 #include "chromecast/media/base/media_message_loop.h"
 #include "chromecast/media/cdm/browser_cdm_cast.h"
 #include "media/base/bind_to_current_loop.h"
+#include "media/base/cdm_config.h"
 #include "media/base/cdm_key_information.h"
 
 namespace chromecast {
 namespace media {
 
-scoped_refptr<::media::MediaKeys> CastBrowserCdmFactory::CreateBrowserCdm(
-    const std::string& key_system_name,
-    bool use_hw_secure_codecs,
+void CastBrowserCdmFactory::Create(
+    const std::string& key_system,
+    const GURL& security_origin,
+    const ::media::CdmConfig& cdm_config,
     const ::media::SessionMessageCB& session_message_cb,
     const ::media::SessionClosedCB& session_closed_cb,
     const ::media::LegacySessionErrorCB& legacy_session_error_cb,
     const ::media::SessionKeysChangeCB& session_keys_change_cb,
-    const ::media::SessionExpirationUpdateCB& session_expiration_update_cb) {
-  DCHECK(!use_hw_secure_codecs)
+    const ::media::SessionExpirationUpdateCB& session_expiration_update_cb,
+    const ::media::CdmCreatedCB& cdm_created_cb) {
+  // Bound |cdm_created_cb| so we always fire it asynchronously.
+  ::media::CdmCreatedCB bound_cdm_created_cb =
+      ::media::BindToCurrentLoop(cdm_created_cb);
+
+  DCHECK(!cdm_config.use_hw_secure_codecs)
       << "Chromecast does not use |use_hw_secure_codecs|";
 
-  CastKeySystem key_system(GetKeySystemByName(key_system_name));
+  CastKeySystem cast_key_system(GetKeySystemByName(key_system));
 
   scoped_refptr<chromecast::media::BrowserCdmCast> browser_cdm;
-  if (key_system == chromecast::media::KEY_SYSTEM_CLEAR_KEY) {
+  if (cast_key_system == chromecast::media::KEY_SYSTEM_CLEAR_KEY) {
     // TODO(gunsch): handle ClearKey decryption. See crbug.com/441957
   } else {
-    browser_cdm = CreatePlatformBrowserCdm(key_system);
+    browser_cdm = CreatePlatformBrowserCdm(cast_key_system);
   }
 
-  if (browser_cdm) {
-    MediaMessageLoop::GetTaskRunner()->PostTask(
-        FROM_HERE,
-        base::Bind(&BrowserCdmCast::Initialize,
-                   base::Unretained(browser_cdm.get()),
-                   ::media::BindToCurrentLoop(session_message_cb),
-                   ::media::BindToCurrentLoop(session_closed_cb),
-                   ::media::BindToCurrentLoop(legacy_session_error_cb),
-                   ::media::BindToCurrentLoop(session_keys_change_cb),
-                   ::media::BindToCurrentLoop(session_expiration_update_cb)));
-    return scoped_refptr<::media::MediaKeys>(
-        new BrowserCdmCastUi(browser_cdm, MediaMessageLoop::GetTaskRunner()));
+  if (!browser_cdm) {
+    LOG(INFO) << "No matching key system found: " << cast_key_system;
+    bound_cdm_created_cb.Run(nullptr, "No matching key system found.");
+    return;
   }
 
-  LOG(INFO) << "No matching key system found.";
-  return nullptr;
+  MediaMessageLoop::GetTaskRunner()->PostTask(
+      FROM_HERE,
+      base::Bind(&BrowserCdmCast::Initialize,
+                 base::Unretained(browser_cdm.get()),
+                 ::media::BindToCurrentLoop(session_message_cb),
+                 ::media::BindToCurrentLoop(session_closed_cb),
+                 ::media::BindToCurrentLoop(legacy_session_error_cb),
+                 ::media::BindToCurrentLoop(session_keys_change_cb),
+                 ::media::BindToCurrentLoop(session_expiration_update_cb)));
+
+  bound_cdm_created_cb.Run(
+      new BrowserCdmCastUi(browser_cdm, MediaMessageLoop::GetTaskRunner()), "");
 }
 
 scoped_refptr<BrowserCdmCast> CastBrowserCdmFactory::CreatePlatformBrowserCdm(
-    const CastKeySystem& key_system) {
+    const CastKeySystem& cast_key_system) {
   return nullptr;
 }