Initialize the CDM asynchronously

content/renderer/media/crypto/proxy_media_keys.h

Index: content/renderer/media/crypto/proxy_media_keys.h
diff --git a/content/renderer/media/crypto/proxy_media_keys.h b/content/renderer/media/crypto/proxy_media_keys.h
index 979de0a94ea4200944b6b34b6d7a847570bdf584..fd73720f7c19b4dcf15c36cd2a3c48799d3391d6 100644
--- a/content/renderer/media/crypto/proxy_media_keys.h
+++ b/content/renderer/media/crypto/proxy_media_keys.h
@@ -27,8 +27,6 @@ class RendererCdmManager;
 class ProxyMediaKeys : public media::MediaKeys, public media::CdmContext {
  public:
   static scoped_ptr<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,
@@ -38,6 +36,10 @@ class ProxyMediaKeys : public media::MediaKeys, public media::CdmContext {
 
   ~ProxyMediaKeys() override;
 
+  void InitializeCdm(const std::string& key_system,
+                     const GURL& security_origin,
+                     scoped_ptr<media::SimpleCdmPromise> promise);
+
   // MediaKeys implementation.
   void SetServerCertificate(
       const std::vector<uint8_t>& certificate,
@@ -96,9 +98,6 @@ class ProxyMediaKeys : public media::MediaKeys, public media::CdmContext {
       const media::SessionKeysChangeCB& session_keys_change_cb,
       const media::SessionExpirationUpdateCB& session_expiration_update_cb);
 
-  void InitializeCdm(const std::string& key_system,
-                     const GURL& security_origin);
-
   RendererCdmManager* manager_;
   int cdm_id_;