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

content/browser/renderer_host/media/audio_input_renderer_host.cc

Index: content/browser/renderer_host/media/audio_input_renderer_host.cc
===================================================================
--- content/browser/renderer_host/media/audio_input_renderer_host.cc	(revision 123165)
+++ content/browser/renderer_host/media/audio_input_renderer_host.cc	(working copy)
@@ -13,7 +13,6 @@
 #include "content/browser/renderer_host/media/audio_input_sync_writer.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/common/media/audio_messages.h"
-#include "content/public/browser/resource_context.h"
 
 using content::BrowserMessageFilter;
 using content::BrowserThread;
@@ -26,8 +25,10 @@
 AudioInputRendererHost::AudioEntry::~AudioEntry() {}
 
 AudioInputRendererHost::AudioInputRendererHost(
-    content::ResourceContext* resource_context)
-    : resource_context_(resource_context) {
+    content::ResourceContext* resource_context,
+    AudioManager* audio_manager)
+    : resource_context_(resource_context),
+      audio_manager_(audio_manager) {
 }
 
 AudioInputRendererHost::~AudioInputRendererHost() {
@@ -187,7 +188,8 @@
 
   // Get access to the AudioInputDeviceManager to start the device.
   media_stream::AudioInputDeviceManager* audio_input_man =
-      resource_context_->GetMediaStreamManager()->audio_input_device_manager();
+      media_stream::MediaStreamManager::GetForResourceContext(
+          resource_context_, audio_manager_)->audio_input_device_manager();
 
   // Add the session entry to the map.
   session_entries_[session_id] = stream_id;
@@ -239,7 +241,7 @@
   // latency path. See crbug.com/112472 for details.
   entry->writer.reset(writer.release());
   entry->controller = media::AudioInputController::CreateLowLatency(
-      resource_context_->GetAudioManager(),
+      audio_manager_,
       this,
       audio_params,
       device_id,
@@ -364,7 +366,8 @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   media_stream::AudioInputDeviceManager* audio_input_man =
-      resource_context_->GetMediaStreamManager()->audio_input_device_manager();
+      media_stream::MediaStreamManager::GetForResourceContext(
+          resource_context_, audio_manager_)->audio_input_device_manager();
   audio_input_man->Stop(session_id);
 
   // Delete the session entry.