diff options
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/services/html_viewer/webmediaplayer_factory.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mojo/services/html_viewer/webmediaplayer_factory.cc b/mojo/services/html_viewer/webmediaplayer_factory.cc index fbb8e9d..6c4653a 100644 --- a/mojo/services/html_viewer/webmediaplayer_factory.cc +++ b/mojo/services/html_viewer/webmediaplayer_factory.cc @@ -15,7 +15,6 @@ #include "media/base/media.h" #include "media/base/media_log.h" #include "media/base/renderer.h" -#include "media/blink/null_encrypted_media_player_support.h" #include "media/blink/webmediaplayer_impl.h" #include "media/blink/webmediaplayer_params.h" #include "media/filters/gpu_video_accelerator_factories.h" @@ -72,12 +71,12 @@ blink::WebMediaPlayer* WebMediaPlayerFactory::CreateMediaPlayer( scoped_refptr<media::GpuVideoAcceleratorFactories>(), GetMediaThreadTaskRunner(), compositor_task_runner_, - base::Bind(&media::NullEncryptedMediaPlayerSupport::Create), NULL); base::WeakPtr<media::WebMediaPlayerDelegate> delegate; - return new media::WebMediaPlayerImpl( - frame, client, delegate, renderer.Pass(), params); + // TODO(xhwang): Provide a media based CdmFactory implementation. + return new media::WebMediaPlayerImpl(frame, client, delegate, renderer.Pass(), + nullptr, params); #endif } |