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

content/browser/renderer_host/media/video_capture_host.cc

 // Copyright (c) 2011 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/video_capture_host.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 #include "content/common/media/video_capture_messages.h"
-#include "content/public/browser/resource_context.h"
 
 using content::BrowserMessageFilter;
 using content::BrowserThread;
 
 struct VideoCaptureHost::Entry {
   Entry() : state(video_capture::kStopped) {}
 
   Entry(VideoCaptureController* controller, video_capture::State state)
       : controller(controller),
         state(state) {
   }
 
   ~Entry() {}
 
   scoped_refptr<VideoCaptureController> controller;
 
   // Record state of each VideoCaptureControllerID.
   // There are 5 states:
   // kStarting: host has requested a controller, but has not got it yet.
   // kStarted: host got a controller and has called StartCapture.
   // kStopping: renderer process requests StopCapture before host gets
   //            a controller.
   // kStopped: host has called StopCapture.
   // kError: an error occurred and capture is stopped consequently.
   video_capture::State state;
 };
 
-VideoCaptureHost::VideoCaptureHost(content::ResourceContext* resource_context)
-    : resource_context_(resource_context) {
+VideoCaptureHost::VideoCaptureHost(content::ResourceContext* resource_context,
+                                   AudioManager* audio_manager)
+    : resource_context_(resource_context),
+      audio_manager_(audio_manager) {
 }
 
 VideoCaptureHost::~VideoCaptureHost() {}
 
 void VideoCaptureHost::OnChannelClosing() {
   BrowserMessageFilter::OnChannelClosing();
 
   // Since the IPC channel is gone, close all requested VideCaptureDevices.
   for (EntryMap::iterator it = entries_.begin(); it != entries_.end(); it++) {
     VideoCaptureController* controller = it->second->controller;
@@ skipping 225 matching lines @@
     if (it->second->controller) {
       GetVideoCaptureManager()->RemoveController(it->second->controller, this);
     }
     delete it->second;
     entries_.erase(id);
   }
 }
 
 media_stream::VideoCaptureManager* VideoCaptureHost::GetVideoCaptureManager() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  return resource_context_->GetMediaStreamManager()->video_capture_manager();
+  return media_stream::MediaStreamManager::GetForResourceContext(
+      resource_context_, audio_manager_)->video_capture_manager();
 }