Pass initial CDM to CreateMediaPlayer()

mojo/services/html_viewer/webmediaplayer_factory.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 "mojo/services/html_viewer/webmediaplayer_factory.h"
 
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/threading/thread.h"
 #include "media/audio/audio_manager.h"
@@ skipping 38 matching lines @@
 #else
 
   media::WebMediaPlayerParams params(
       media::WebMediaPlayerParams::DeferLoadCB(),
       CreateAudioRendererSink(),
       GetAudioHardwareConfig(),
       new media::MediaLog(),
       scoped_refptr<media::GpuVideoAcceleratorFactories>(),
       GetMediaThreadTaskRunner(),
       compositor_task_runner_,
-      base::Bind(&media::NullEncryptedMediaPlayerSupport::Create));
+      base::Bind(&media::NullEncryptedMediaPlayerSupport::Create),
+      NULL);
   base::WeakPtr<media::WebMediaPlayerDelegate> delegate;
 
   return new media::WebMediaPlayerImpl(frame, client, delegate, params);
 #endif
 }
 
 const media::AudioHardwareConfig&
 WebMediaPlayerFactory::GetAudioHardwareConfig() {
   return audio_hardware_config_;
 }
 
 scoped_refptr<media::AudioRendererSink>
 WebMediaPlayerFactory::CreateAudioRendererSink() {
   // TODO(acolwell): Replace this with an AudioRendererSink implementation
   // that actually talks to the audio device or an audio mojo service.
   return new media::NullAudioSink(GetMediaThreadTaskRunner());
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 WebMediaPlayerFactory::GetMediaThreadTaskRunner() {
   if (!media_thread_.IsRunning())
     media_thread_.Start();
 
   return media_thread_.message_loop_proxy();
 }
 
 }  // namespace mojo