Make HTMLMediaElement.setMediaKeys() asynchronous.

Source/web/WebMediaPlayerClientImpl.cpp

Index: Source/web/WebMediaPlayerClientImpl.cpp
diff --git a/Source/web/WebMediaPlayerClientImpl.cpp b/Source/web/WebMediaPlayerClientImpl.cpp
index 96112c34378b35bf8f15e864a853eb14f9ebf967..e326a2e30c029c7236e0957bc7e2f353dcb365f8 100644
--- a/Source/web/WebMediaPlayerClientImpl.cpp
+++ b/Source/web/WebMediaPlayerClientImpl.cpp
@@ -50,13 +50,13 @@
 
 namespace blink {
 
-static PassOwnPtr<WebMediaPlayer> createWebMediaPlayer(WebMediaPlayerClient* client, const WebURL& url, LocalFrame* frame)
+static PassOwnPtr<WebMediaPlayer> createWebMediaPlayer(WebMediaPlayerClient* client, const WebURL& url, LocalFrame* frame, WebContentDecryptionModule* initialCdm)
 {
     WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(frame);
 
     if (!webFrame || !webFrame->client())
         return nullptr;
-    return adoptPtr(webFrame->client()->createMediaPlayer(webFrame, url, client));
+    return adoptPtr(webFrame->client()->createMediaPlayer(webFrame, url, client, initialCdm));
 }
 
 WebMediaPlayer* WebMediaPlayerClientImpl::webMediaPlayer() const
@@ -206,7 +206,7 @@ void WebMediaPlayerClientImpl::load(WebMediaPlayer::LoadType loadType, const WTF
     WebURL poster = m_client->mediaPlayerPosterURL();
 
     KURL kurl(ParsedURLString, url);
-    m_webMediaPlayer = createWebMediaPlayer(this, kurl, frame);
+    m_webMediaPlayer = createWebMediaPlayer(this, kurl, frame, HTMLMediaElementEncryptedMedia::contentDecryptionModule(mediaElement()));
     if (!m_webMediaPlayer)
         return;
 
@@ -219,8 +219,6 @@ void WebMediaPlayerClientImpl::load(WebMediaPlayer::LoadType loadType, const WTF
 
     m_webMediaPlayer->setPoster(poster);
 
-    // Tell WebMediaPlayer about any connected CDM (may be null).
-    m_webMediaPlayer->setContentDecryptionModule(HTMLMediaElementEncryptedMedia::contentDecryptionModule(mediaElement()));
     m_webMediaPlayer->load(loadType, kurl, corsMode);
 }