Remove GetAudioManager and GetMediaStreamManager from ResourceContext. The reason is the content mo…

content/browser/renderer_host/render_process_host_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "content/browser/renderer_host/render_process_host_impl.h"
 
 #if defined(OS_WIN)
@@ skipping 23 matching lines @@
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/tracked_objects.h"
 #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"
 #include "content/browser/download/mhtml_generation_manager.h"
 #include "content/browser/file_system/file_system_dispatcher_host.h"
 #include "content/browser/geolocation/geolocation_dispatcher_host.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/in_process_webkit/dom_storage_message_filter.h"
 #include "content/browser/in_process_webkit/indexed_db_dispatcher_host.h"
@@ skipping 401 matching lines @@
   channel_->AddFilter(render_message_filter);
   content::BrowserContext* browser_context = GetBrowserContext();
   content::ResourceContext* resource_context =
       browser_context->GetResourceContext();
 
   ResourceMessageFilter* resource_message_filter = new ResourceMessageFilter(
       GetID(), content::PROCESS_TYPE_RENDERER, resource_context,
       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 instead of multiple call sites.

[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)),
       GetID()));
   channel_->AddFilter(new ClipboardMessageFilter());
   channel_->AddFilter(new DOMStorageMessageFilter(GetID(),
       BrowserContext::GetWebKitContext(browser_context)));
   channel_->AddFilter(new IndexedDBDispatcherHost(GetID(),
       BrowserContext::GetWebKitContext(browser_context)));
   channel_->AddFilter(GeolocationDispatcherHost::New(
       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(),
       BrowserContext::GetFileSystemContext(browser_context)));
   channel_->AddFilter(new device_orientation::MessageFilter());
   channel_->AddFilter(new BlobMessageFilter(GetID(),
       ChromeBlobStorageContext::GetFor(browser_context)));
   channel_->AddFilter(new FileUtilitiesMessageFilter(GetID()));
   channel_->AddFilter(new MimeRegistryMessageFilter());
   channel_->AddFilter(new DatabaseMessageFilter(
@@ skipping 811 matching lines @@
   // Only honor the request if appropriate persmissions are granted.
   if (ChildProcessSecurityPolicyImpl::GetInstance()->CanReadFile(GetID(),
                                                                  path))
     content::GetContentClient()->browser()->OpenItem(path);
 }
 
 void RenderProcessHostImpl::OnSavedPageAsMHTML(int job_id, int64 data_size) {
   content::GetContentClient()->browser()->GetMHTMLGenerationManager()->
       MHTMLGenerated(job_id, data_size);
 }