Pass initial CDM to CreateMediaPlayer()

media/blink/null_encrypted_media_player_support.cc

Index: media/blink/null_encrypted_media_player_support.cc
diff --git a/media/blink/null_encrypted_media_player_support.cc b/media/blink/null_encrypted_media_player_support.cc
index 035785bc9054984db4aa4722b61fd060f1d0b01c..71e1fb8c95a87f25914061095b2992173cad3d37 100644
--- a/media/blink/null_encrypted_media_player_support.cc
+++ b/media/blink/null_encrypted_media_player_support.cc
@@ -48,6 +48,10 @@ NullEncryptedMediaPlayerSupport::CancelKeyRequest(
   return blink::WebMediaPlayer::MediaKeyExceptionKeySystemNotSupported;
 }
 
+void NullEncryptedMediaPlayerSupport::SetInitialContentDecryptionModule(
+    blink::WebContentDecryptionModule* cdm) {
+}

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

DCHECK?

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

Can be null.

+
 void NullEncryptedMediaPlayerSupport::SetContentDecryptionModule(
     blink::WebContentDecryptionModule* cdm) {
 }
@@ -61,10 +65,6 @@ void NullEncryptedMediaPlayerSupport::SetContentDecryptionModule(
       "Null MediaKeys object is not supported.");
 }
 
-void NullEncryptedMediaPlayerSupport::SetContentDecryptionModuleSync(
-    blink::WebContentDecryptionModule* cdm) {
-}
-
 Demuxer::NeedKeyCB NullEncryptedMediaPlayerSupport::CreateNeedKeyCB() {
   return Demuxer::NeedKeyCB();
 }