Pass initial CDM to CreateMediaPlayer()

content/renderer/media/crypto/encrypted_media_player_support_impl.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 "content/renderer/media/crypto/encrypted_media_player_support_impl.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 278 matching lines @@
   if (!IsConcreteSupportedKeySystem(key_system))
     return WebMediaPlayer::MediaKeyExceptionKeySystemNotSupported;
 
   if (current_key_system_.empty() || key_system != current_key_system_)
     return WebMediaPlayer::MediaKeyExceptionInvalidPlayerState;
 
   proxy_decryptor_->CancelKeyRequest(session_id);
   return WebMediaPlayer::MediaKeyExceptionNoError;
 }
 
+void EncryptedMediaPlayerSupportImpl::SetInitialContentDecryptionModule(
+    blink::WebContentDecryptionModule* initial_cdm) {
+  // Used when loading media and no pipeline/decoder attached yet.
+  DCHECK(decryptor_ready_cb_.is_null());
+
+  web_cdm_ = ToWebContentDecryptionModuleImpl(initial_cdm);
+}
+
 void EncryptedMediaPlayerSupportImpl::SetContentDecryptionModule(
     blink::WebContentDecryptionModule* cdm) {
   // TODO(xhwang): Support setMediaKeys(0) if necessary: http://crbug.com/330324
   if (!cdm)
     return;
 
   web_cdm_ = ToWebContentDecryptionModuleImpl(cdm);
 
   if (web_cdm_ && !decryptor_ready_cb_.is_null())
     base::ResetAndReturn(&decryptor_ready_cb_)
@@ skipping 19 matching lines @@
         .Run(web_cdm_->GetDecryptor(), BIND_TO_RENDER_LOOP1(
             &EncryptedMediaPlayerSupportImpl::ContentDecryptionModuleAttached,
             result));
   } else {
     // No pipeline/decoder connected, so resolve the promise. When something
     // is connected, setting the CDM will happen in SetDecryptorReadyCB().
     ContentDecryptionModuleAttached(result, true);
   }
 }
 
-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) {
   if (success) {
     result.complete();
     return;
   }
 
   result.completeWithError(
       blink::WebContentDecryptionModuleExceptionNotSupportedError,
@@ skipping 107 matching lines @@
 
   if (web_cdm_) {
     decryptor_ready_cb.Run(web_cdm_->GetDecryptor(), base::Bind(DoNothing));
     return;
   }
 
   decryptor_ready_cb_ = decryptor_ready_cb;
 }
 
 }  // namespace content