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

content/browser/renderer_host/media/media_stream_dispatcher_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/media_stream_dispatcher_host.h"
 
-#include "content/public/browser/resource_context.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/common/media/media_stream_options.h"
 
 using content::BrowserMessageFilter;
 using content::BrowserThread;
 
 namespace media_stream {
 
 struct MediaStreamDispatcherHost::StreamRequest {
   StreamRequest() : render_view_id(0), page_request_id(0) {}
   StreamRequest(int render_view_id, int page_request_id)
       : render_view_id(render_view_id),
         page_request_id(page_request_id ) {
   }
   int render_view_id;
   // Id of the request generated by MediaStreamDispatcher.
   int page_request_id;
 };
 
 MediaStreamDispatcherHost::MediaStreamDispatcherHost(
-    content::ResourceContext* resource_context, int render_process_id)
+    content::ResourceContext* resource_context,
+    int render_process_id,
+    AudioManager* audio_manager)
     : resource_context_(resource_context),
-      render_process_id_(render_process_id) {
+      render_process_id_(render_process_id),
+      audio_manager_(audio_manager) {
 }
 
 MediaStreamDispatcherHost::~MediaStreamDispatcherHost() {
 }
 
 MediaStreamManager* MediaStreamDispatcherHost::manager() {
-  return resource_context_->GetMediaStreamManager();
+  return MediaStreamManager::GetForResourceContext(
+      resource_context_, audio_manager_);
 }
 
 bool MediaStreamDispatcherHost::OnMessageReceived(
     const IPC::Message& message, bool* message_was_ok) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(MediaStreamDispatcherHost, message, *message_was_ok)
     IPC_MESSAGE_HANDLER(MediaStreamHostMsg_GenerateStream, OnGenerateStream)
     IPC_MESSAGE_HANDLER(MediaStreamHostMsg_StopGeneratedStream,
                         OnStopGeneratedStream)
     IPC_MESSAGE_HANDLER(MediaStreamHostMsg_EnumerateDevices,
@@ skipping 211 matching lines @@
   StreamMap::iterator it = streams_.find(label);
   DCHECK(it != streams_.end());
   StreamRequest request = it->second;
   streams_.erase(it);
 
   Send(new MediaStreamMsg_DeviceOpenFailed(request.render_view_id,
                                            request.page_request_id));
 }
 
 }  // namespace media_stream