Pass initial CDM to CreateMediaPlayer()

media/blink/null_encrypted_media_player_support.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/blink/null_encrypted_media_player_support.h"
 
 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"
 
 namespace media {
@@ skipping 30 matching lines @@
   return blink::WebMediaPlayer::MediaKeyExceptionKeySystemNotSupported;
 }
 
 blink::WebMediaPlayer::MediaKeyException
 NullEncryptedMediaPlayerSupport::CancelKeyRequest(
     const blink::WebString& key_system,
     const blink::WebString& session_id) {
   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) {
 }
 
 void NullEncryptedMediaPlayerSupport::SetContentDecryptionModule(
     blink::WebContentDecryptionModule* cdm,
     blink::WebContentDecryptionModuleResult result) {
   result.completeWithError(
       blink::WebContentDecryptionModuleExceptionNotSupportedError,
       0,
       "Null MediaKeys object is not supported.");
 }
 
-void NullEncryptedMediaPlayerSupport::SetContentDecryptionModuleSync(
-    blink::WebContentDecryptionModule* cdm) {
-}
-
 Demuxer::NeedKeyCB NullEncryptedMediaPlayerSupport::CreateNeedKeyCB() {
   return Demuxer::NeedKeyCB();
 }
 
 SetDecryptorReadyCB
 NullEncryptedMediaPlayerSupport::CreateSetDecryptorReadyCB() {
   return SetDecryptorReadyCB();
 }
 
 void NullEncryptedMediaPlayerSupport::OnPipelineDecryptError() {
 }
 
 }  // namespace media