Initialize the CDM asynchronously

content/renderer/media/crypto/proxy_media_keys.cc

Index: content/renderer/media/crypto/proxy_media_keys.cc
diff --git a/content/renderer/media/crypto/proxy_media_keys.cc b/content/renderer/media/crypto/proxy_media_keys.cc
index 9f121fe4482726d3f5f7f25f61966facbb95c88d..ccec954c326d6065a325aec685049f68ecff3f84 100644
--- a/content/renderer/media/crypto/proxy_media_keys.cc
+++ b/content/renderer/media/crypto/proxy_media_keys.cc
@@ -17,8 +17,6 @@
 namespace content {
 
 scoped_ptr<ProxyMediaKeys> ProxyMediaKeys::Create(
-    const std::string& key_system,
-    const GURL& security_origin,
     RendererCdmManager* manager,
     const media::SessionMessageCB& session_message_cb,
     const media::SessionClosedCB& session_closed_cb,
@@ -29,7 +27,6 @@ scoped_ptr<ProxyMediaKeys> ProxyMediaKeys::Create(
   scoped_ptr<ProxyMediaKeys> proxy_media_keys(new ProxyMediaKeys(
       manager, session_message_cb, session_closed_cb, legacy_session_error_cb,
       session_keys_change_cb, session_expiration_update_cb));
-  proxy_media_keys->InitializeCdm(key_system, security_origin);
   return proxy_media_keys.Pass();
 }
 
@@ -39,6 +36,15 @@ ProxyMediaKeys::~ProxyMediaKeys() {
   cdm_promise_adapter_.Clear();
 }
 
+void ProxyMediaKeys::InitializeCdm(
+    const std::string& key_system,
+    const GURL& security_origin,
+    scoped_ptr<media::SimpleCdmPromise> promise) {
+  // TODO(jrummell): |Pass promise| on. http://crbug.com/407435.
+  manager_->InitializeCdm(cdm_id_, this, key_system, security_origin);
+  promise->resolve();
+}
+
 void ProxyMediaKeys::SetServerCertificate(
     const std::vector<uint8_t>& certificate,
     scoped_ptr<media::SimpleCdmPromise> promise) {
@@ -193,9 +199,4 @@ ProxyMediaKeys::ProxyMediaKeys(
   cdm_id_ = manager->RegisterMediaKeys(this);
 }
 
-void ProxyMediaKeys::InitializeCdm(const std::string& key_system,
-                                   const GURL& security_origin) {
-  manager_->InitializeCdm(cdm_id_, this, key_system, security_origin);
-}
-
 }  // namespace content