Minor cleanup to remove the static thread-safe methods on BrowserMainLoop. Initially I thought this…

content/browser/renderer_host/media/video_capture_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/video_capture_host.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "content/browser/browser_main_loop.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"
 
 namespace content {
 
 struct VideoCaptureHost::Entry {
   Entry(VideoCaptureController* controller)
       : controller(controller) {}
 
   ~Entry() {}
 
   scoped_refptr<VideoCaptureController> controller;
 };
 
-VideoCaptureHost::VideoCaptureHost() {}
+VideoCaptureHost::VideoCaptureHost(MediaStreamManager* media_stream_manager)
+    : media_stream_manager_(media_stream_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.get();
     if (controller) {
       VideoCaptureControllerID controller_id(it->first);
       controller->StopCapture(controller_id, this);
-      GetVideoCaptureManager()->RemoveController(controller, this);
+      media_stream_manager_->video_capture_manager()->RemoveController(
+          controller, this);
     }
   }
   STLDeleteValues(&entries_);
 }
 
 void VideoCaptureHost::OnDestruct() const {
   BrowserThread::DeleteOnIOThread::Destruct(this);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 135 matching lines @@
   DVLOG(1) << "VideoCaptureHost::OnStartCapture, device_id " << device_id
            << ", (" << params.width
            << ", " << params.height
            << ", " << params.frame_per_second
            << ", " << params.session_id
            << ")";
   VideoCaptureControllerID controller_id(device_id);
   DCHECK(entries_.find(controller_id) == entries_.end());
 
   entries_[controller_id] = new Entry(NULL);
-  GetVideoCaptureManager()->AddController(
+  media_stream_manager_->video_capture_manager()->AddController(
       params, this, base::Bind(&VideoCaptureHost::OnControllerAdded, this,
                                device_id, params));
 }
 
 void VideoCaptureHost::OnControllerAdded(
     int device_id, const media::VideoCaptureParams& params,
     VideoCaptureController* controller) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&VideoCaptureHost::DoControllerAddedOnIOThread,
                  this, device_id, params, make_scoped_refptr(controller)));
 }
 
 void VideoCaptureHost::DoControllerAddedOnIOThread(
     int device_id, const media::VideoCaptureParams params,
     VideoCaptureController* controller) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   VideoCaptureControllerID controller_id(device_id);
   EntryMap::iterator it = entries_.find(controller_id);
   if (it == entries_.end()) {
-    if (controller)
-      GetVideoCaptureManager()->RemoveController(controller, this);
+    if (controller) {
+      media_stream_manager_->video_capture_manager()->RemoveController(
+          controller, this);
+    }
     return;
   }
 
   if (controller == NULL) {
     Send(new VideoCaptureMsg_StateChanged(device_id,
                                           VIDEO_CAPTURE_STATE_ERROR));
     delete it->second;
     entries_.erase(controller_id);
     return;
   }
@@ skipping 36 matching lines @@
     const VideoCaptureControllerID& controller_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   EntryMap::iterator it = entries_.find(controller_id);
   if (it == entries_.end())
     return;
 
   VideoCaptureController* controller = it->second->controller.get();
   if (controller) {
     controller->StopCapture(controller_id, this);
-    GetVideoCaptureManager()->RemoveController(controller, this);
+    media_stream_manager_->video_capture_manager()->RemoveController(
+        controller, this);
   }
   delete it->second;
   entries_.erase(controller_id);
 }
 
-VideoCaptureManager* VideoCaptureHost::GetVideoCaptureManager() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  return BrowserMainLoop::GetMediaStreamManager()->video_capture_manager();
-}
-
 }  // namespace content