| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index f4db0f2535b4a2f9056ae5f105d068dfc0eb1868..89bbc6dafb6366d74efb5058a36f89c8627dc949 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -2419,18 +2419,12 @@ blink::WebMediaPlayer* RenderViewImpl::CreateMediaPlayer(
|
| #if defined(OS_ANDROID)
|
| return CreateAndroidWebMediaPlayer(frame, url, client);
|
| #else
|
| - scoped_refptr<media::AudioRendererSink> sink;
|
| - if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableAudio)) {
|
| - sink = RenderThreadImpl::current()->GetAudioRendererMixerManager()->
|
| - CreateInput(routing_id_, render_frame->GetRoutingID());
|
| - DVLOG(1) << "Using AudioRendererMixerManager-provided sink: " << sink.get();
|
| - }
|
| -
|
| WebMediaPlayerParams params(
|
| base::Bind(&ContentRendererClient::DeferMediaLoad,
|
| base::Unretained(GetContentClient()->renderer()),
|
| static_cast<RenderFrame*>(render_frame)),
|
| - sink);
|
| + RenderThreadImpl::current()->GetAudioRendererMixerManager()->CreateInput(
|
| + routing_id_, render_frame->GetRoutingID()));
|
| return new WebMediaPlayerImpl(frame, client, AsWeakPtr(), params);
|
| #endif // defined(OS_ANDROID)
|
| }
|
|
|