Chromium Code Reviews| Index: content/browser/renderer_host/render_view_host_impl.cc |
| diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc |
| index 6e15855686c45078081e15fff66def1533d51b48..7ffada984c85afa28db1984f531271a649b12630 100644 |
| --- a/content/browser/renderer_host/render_view_host_impl.cc |
| +++ b/content/browser/renderer_host/render_view_host_impl.cc |
| @@ -166,7 +166,8 @@ RenderViewHostImpl::RenderViewHostImpl( |
| int routing_id, |
| int main_frame_routing_id, |
| bool swapped_out, |
| - bool hidden) |
| + bool hidden, |
| + bool setup_for_testing) |
| : RenderWidgetHostImpl(widget_delegate, |
| instance->GetProcess(), |
| routing_id, |
| @@ -195,13 +196,22 @@ RenderViewHostImpl::RenderViewHostImpl( |
| GetProcess()->EnableSendQueue(); |
| if (ResourceDispatcherHostImpl::Get()) { |
| + scoped_refptr<AudioRendererHost> audio_host = |
|
DaleCurtis
2014/09/30 17:15:15
It's a bit convoluted to create an empty refptr si
|
| + setup_for_testing ? scoped_refptr<AudioRendererHost>(NULL) |
| + : static_cast<RenderProcessHostImpl*>(GetProcess()) |
| + ->audio_renderer_host(); |
| BrowserThread::PostTask( |
| - BrowserThread::IO, FROM_HERE, |
| + BrowserThread::IO, |
| + FROM_HERE, |
| base::Bind(&ResourceDispatcherHostImpl::OnRenderViewHostCreated, |
| base::Unretained(ResourceDispatcherHostImpl::Get()), |
| - GetProcess()->GetID(), GetRoutingID(), !is_hidden())); |
| + GetProcess()->GetID(), |
| + GetRoutingID(), |
| + !is_hidden(), |
| + audio_host.get() |
| + ? audio_host->RenderViewHasActiveAudio(GetRoutingID()) |
| + : false)); |
| } |
| - |
| #if defined(ENABLE_BROWSER_CDMS) |
| media_web_contents_observer_.reset(new MediaWebContentsObserver(this)); |
| #endif |