| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 5dc54433f82ffb69665feb16dc69d19390c9e20e..f700bbe661572aba419c3dfd3ccb19a7012f9f81 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -1927,14 +1927,13 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
|
| new media::MojoRendererFactory(make_scoped_ptr(
|
| new MediaRendererServiceProvider(GetServiceRegistry()))));
|
| #else
|
| + scoped_ptr<media::DefaultRendererFactory> default_factory;
|
| + default_factory.reset(new media::DefaultRendererFactory(
|
| + media_log, render_thread->GetGpuFactories(),
|
| + *render_thread->GetAudioHardwareConfig()));
|
| scoped_ptr<media::RendererFactory> media_renderer_factory =
|
| - GetContentClient()->renderer()->CreateMediaRendererFactory(this);
|
| -
|
| - if (!media_renderer_factory.get()) {
|
| - media_renderer_factory.reset(new media::DefaultRendererFactory(
|
| - media_log, render_thread->GetGpuFactories(),
|
| - *render_thread->GetAudioHardwareConfig()));
|
| - }
|
| + GetContentClient()->renderer()->CreateMediaRendererFactory(
|
| + this, default_factory.Pass());
|
| #endif // defined(ENABLE_MEDIA_MOJO_RENDERER)
|
|
|
| return new media::WebMediaPlayerImpl(
|
|
|