content/browser/renderer_host/render_process_host_impl.cc - Issue 9433006: Remove GetAudioManager and GetMediaStreamManager from ResourceContext. The reason is the content mo…

Unified Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 9433006: Remove GetAudioManager and GetMediaStreamManager from ResourceContext. The reason is the content mo… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: sync to head Created 8 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/renderer_host/media/video_capture_host_unittest.cc ('K') | « content/browser/renderer_host/media/video_capture_host_unittest.cc ('k') | content/browser/speech/speech_input_browsertest.cc » ('j') | content/browser/speech/speech_input_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_process_host_impl.cc

===================================================================

--- content/browser/renderer_host/render_process_host_impl.cc (revision 123165)

+++ content/browser/renderer_host/render_process_host_impl.cc (working copy)

@@ -41,6 +41,7 @@

#include "content/browser/appcache/appcache_dispatcher_host.h"

#include "content/browser/appcache/chrome_appcache_service.h"

#include "content/browser/browser_main.h"

+#include "content/browser/browser_main_loop.h"

#include "content/browser/child_process_security_policy_impl.h"

#include "content/browser/chrome_blob_storage_context.h"

#include "content/browser/device_orientation/message_filter.h"

@@ -462,9 +463,13 @@

new RendererURLRequestContextSelector(browser_context, GetID()));

channel_->AddFilter(resource_message_filter);

- channel_->AddFilter(new AudioInputRendererHost(resource_context));

- channel_->AddFilter(new AudioRendererHost(resource_context));

- channel_->AddFilter(new VideoCaptureHost(resource_context));

+ channel_->AddFilter(new AudioInputRendererHost(

+ resource_context,

+ content::BrowserMainLoop::GetAudioManager()));

tommi (sloooow) - chröme 2012/02/23 07:50:59 nit: cache this in a local variable on the stack i

jam 2012/02/23 08:05:09 Done.

+ channel_->AddFilter(new AudioRendererHost(

+ resource_context, content::BrowserMainLoop::GetAudioManager()));

+ channel_->AddFilter(new VideoCaptureHost(

+ resource_context, content::BrowserMainLoop::GetAudioManager()));

channel_->AddFilter(new AppCacheDispatcherHost(

static_cast<ChromeAppCacheService*>(

BrowserContext::GetAppCacheService(browser_context)),

@@ -478,14 +483,16 @@

GetID(), browser_context->GetGeolocationPermissionContext()));

channel_->AddFilter(new GpuMessageFilter(GetID(), widget_helper_.get()));

channel_->AddFilter(new media_stream::MediaStreamDispatcherHost(

- resource_context, GetID()));

+ resource_context, GetID(),

+ content::BrowserMainLoop::GetAudioManager()));

channel_->AddFilter(new PepperFileMessageFilter(GetID(), browser_context));

channel_->AddFilter(new PepperMessageFilter(PepperMessageFilter::RENDERER,

GetID(), resource_context));

#if defined(ENABLE_INPUT_SPEECH)

channel_->AddFilter(new speech_input::SpeechInputDispatcherHost(

GetID(), browser_context->GetRequestContext(),

- browser_context->GetSpeechInputPreferences(), resource_context));

+ browser_context->GetSpeechInputPreferences(),

+ content::BrowserMainLoop::GetAudioManager()));

#endif

channel_->AddFilter(new FileSystemDispatcherHost(

browser_context->GetRequestContext(),