Pass initial CDM to CreateMediaPlayer()

media/blink/webmediaplayer_params.cc

Index: media/blink/webmediaplayer_params.cc
diff --git a/media/blink/webmediaplayer_params.cc b/media/blink/webmediaplayer_params.cc
index c157e3483b03c0750c8d4d7581a472a328f54edd..1fd2b8af80f9c3e4ca18fbe8df35bfc1f178d4ea 100644
--- a/media/blink/webmediaplayer_params.cc
+++ b/media/blink/webmediaplayer_params.cc
@@ -17,12 +17,11 @@ WebMediaPlayerParams::WebMediaPlayerParams(
     const AudioHardwareConfig& audio_hardware_config,
     const scoped_refptr<MediaLog>& media_log,
     const scoped_refptr<GpuVideoAcceleratorFactories>& gpu_factories,
-    const scoped_refptr<base::SingleThreadTaskRunner>&
-        media_task_runner,
-    const scoped_refptr<base::SingleThreadTaskRunner>&
-        compositor_task_runner,
-      const EncryptedMediaPlayerSupportCreateCB&
-          encrypted_media_player_support_cb)
+    const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
+    const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
+    const EncryptedMediaPlayerSupportCreateCB&
+        encrypted_media_player_support_cb,
+    blink::WebContentDecryptionModule* initial_cdm)
     : defer_load_cb_(defer_load_cb),
       audio_renderer_sink_(audio_renderer_sink),
       audio_hardware_config_(audio_hardware_config),
@@ -30,7 +29,8 @@ WebMediaPlayerParams::WebMediaPlayerParams(
       gpu_factories_(gpu_factories),
       media_task_runner_(media_task_runner),
       compositor_task_runner_(compositor_task_runner),
-      encrypted_media_player_support_cb_(encrypted_media_player_support_cb) {
+      encrypted_media_player_support_cb_(encrypted_media_player_support_cb),
+      initial_cdm_(initial_cdm) {
 }
 
 WebMediaPlayerParams::~WebMediaPlayerParams() {}
@@ -38,7 +38,11 @@ WebMediaPlayerParams::~WebMediaPlayerParams() {}
 scoped_ptr<EncryptedMediaPlayerSupport>
 WebMediaPlayerParams::CreateEncryptedMediaPlayerSupport(
     blink::WebMediaPlayerClient* client) const {
-  return encrypted_media_player_support_cb_.Run(client);
+  scoped_ptr<EncryptedMediaPlayerSupport> encrypted_media_support =
+      encrypted_media_player_support_cb_.Run(client);
+  if (encrypted_media_support)
+    encrypted_media_support->SetInitialContentDecryptionModule(initial_cdm_);
+  return encrypted_media_support.Pass();
 }
 
 }  // namespace media