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

content/browser/renderer_host/media/audio_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_renderer_host.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
+#include "content/browser/browser_main_loop.h"
 #include "content/browser/renderer_host/media/audio_common.h"
 #include "content/browser/renderer_host/media/audio_sync_reader.h"
 #include "content/browser/renderer_host/media/media_observer.h"
 #include "content/common/media/audio_messages.h"
 #include "content/public/browser/resource_context.h"
 #include "media/audio/audio_util.h"
 
 using content::BrowserMessageFilter;
 using content::BrowserThread;
 
 AudioRendererHost::AudioEntry::AudioEntry()
     : stream_id(0),
       pending_close(false) {
 }
 
 AudioRendererHost::AudioEntry::~AudioEntry() {}
 
 ///////////////////////////////////////////////////////////////////////////////
 // AudioRendererHost implementations.
 AudioRendererHost::AudioRendererHost(
-    content::ResourceContext* resource_context)
+    content::ResourceContext* resource_context,
+    AudioManager* audio_manager)
     : resource_context_(resource_context),
+      audio_manager_(audio_manager),
       media_observer_(NULL) {
 }
 
 AudioRendererHost::~AudioRendererHost() {
   DCHECK(audio_entries_.empty());
 }
 
 void AudioRendererHost::OnChannelClosing() {
   BrowserMessageFilter::OnChannelClosing();
 
@@ skipping 178 matching lines @@
 
   if (!reader->Init()) {
     SendErrorMessage(stream_id);
     return;
   }
 
   // If we have successfully created the SyncReader then assign it to the
   // entry and construct an AudioOutputController.
   entry->reader.reset(reader.release());
   entry->controller = media::AudioOutputController::Create(
-      resource_context_->GetAudioManager(), this, audio_params,
-      entry->reader.get());
+      audio_manager_, this, audio_params, entry->reader.get());
 
   if (!entry->controller) {
     SendErrorMessage(stream_id);
     return;
   }
 
   // If we have created the controller successfully, create an entry and add it
   // to the map.
   entry->stream_id = stream_id;
   audio_entries_.insert(std::make_pair(stream_id, entry.release()));
@@ skipping 143 matching lines @@
   }
   return NULL;
 }
 
 MediaObserver* AudioRendererHost::media_observer() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!media_observer_)
     media_observer_ = resource_context_->GetMediaObserver();
   return media_observer_;
 }