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

content/browser/renderer_host/media/audio_input_renderer_host.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.
 
 #include "content/browser/renderer_host/media/audio_input_renderer_host.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
 #include "content/browser/renderer_host/media/audio_common.h"
 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
 #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;
 
 AudioInputRendererHost::AudioEntry::AudioEntry()
     : stream_id(0),
       pending_close(false) {
 }
 
 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() {
   DCHECK(audio_entries_.empty());
 }
 
 void AudioInputRendererHost::OnChannelClosing() {
   BrowserMessageFilter::OnChannelClosing();
 
   // Since the IPC channel is gone, close all requested audio streams.
@@ skipping 139 matching lines @@
   IPC_END_MESSAGE_MAP_EX()
 
   return handled;
 }
 void AudioInputRendererHost::OnStartDevice(int stream_id, int session_id) {
   VLOG(1) << "AudioInputRendererHost::OnStartDevice(stream_id="
           << stream_id << ", session_id = " << session_id << ")";
 
   // 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;
 
   // Start the device with the session_id. If the device is started
   // successfully, OnDeviceStarted() callback will be triggered.
   audio_input_man->Start(session_id, this);
 }
 
 void AudioInputRendererHost::OnCreateStream(int stream_id,
@@ skipping 31 matching lines @@
     return;
   }
 
   // If we have successfully created the SyncWriter then assign it to the
   // entry and construct an AudioInputController.
   // TODO(henrika): replace CreateLowLatency() with Create() as soon
   // as satish has ensured that Speech Input also uses the default low-
   // 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,
       entry->writer.get());
 
   if (!entry->controller) {
     SendErrorMessage(stream_id);
     return;
   }
 
@@ skipping 104 matching lines @@
   }
 
   // Delete the session entry.
   session_entries_.erase(it);
 }
 
 void AudioInputRendererHost::StopAndDeleteDevice(int session_id) {
   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.
   session_entries_.erase(session_id);
 }
 
 void AudioInputRendererHost::CloseAndDeleteStream(AudioEntry* entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (!entry->pending_close) {
@@ skipping 60 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   for (SessionEntryMap::iterator it = session_entries_.begin();
        it != session_entries_.end(); ++it) {
     if (stream_id == it->second) {
       return it->first;
     }
   }
   return 0;
 }