Pass initial CDM to CreateMediaPlayer()

content/renderer/media/crypto/encrypted_media_player_support_impl.cc

Index: content/renderer/media/crypto/encrypted_media_player_support_impl.cc
diff --git a/content/renderer/media/crypto/encrypted_media_player_support_impl.cc b/content/renderer/media/crypto/encrypted_media_player_support_impl.cc
index c884cd6ac227e474860f42ee7685b7da6fafa21a..2ebde238e9024fb90d6774e6ab3b4201d1ca42ad 100644
--- a/content/renderer/media/crypto/encrypted_media_player_support_impl.cc
+++ b/content/renderer/media/crypto/encrypted_media_player_support_impl.cc
@@ -296,6 +296,14 @@ EncryptedMediaPlayerSupportImpl::CancelKeyRequestInternal(
   return WebMediaPlayer::MediaKeyExceptionNoError;
 }
 
+void EncryptedMediaPlayerSupportImpl::SetInitialContentDecryptionModule(
+    blink::WebContentDecryptionModule* cdm) {
+  // Used when loading media and no pipeline/decoder attached yet.
+  DCHECK(decryptor_ready_cb_.is_null());

[ddorwin, 2014/09/23 18:03:23]

DCHECK(cdm) too.

[jrummell, 2014/09/23 20:01:38]

|cdm| can be null if not set when player created.

[ddorwin, 2014/09/23 20:08:41]

Ah, yes. I was thinking we had already checked that, but that was in WMPA for
something else.

+
+  web_cdm_ = ToWebContentDecryptionModuleImpl(cdm);
+}
+
 void EncryptedMediaPlayerSupportImpl::SetContentDecryptionModule(
     blink::WebContentDecryptionModule* cdm) {
   // TODO(xhwang): Support setMediaKeys(0) if necessary: http://crbug.com/330324
@@ -335,14 +343,6 @@ void EncryptedMediaPlayerSupportImpl::SetContentDecryptionModule(
   }
 }
 
-void EncryptedMediaPlayerSupportImpl::SetContentDecryptionModuleSync(
-    blink::WebContentDecryptionModule* cdm) {
-  // Used when loading media and no pipeline/decoder attached yet.
-  DCHECK(decryptor_ready_cb_.is_null());
-
-  web_cdm_ = ToWebContentDecryptionModuleImpl(cdm);
-}
-
 void EncryptedMediaPlayerSupportImpl::ContentDecryptionModuleAttached(
     blink::WebContentDecryptionModuleResult result,
     bool success) {