Removing singleton property of MediaStreamManager and creating thread first when needed.

content/browser/renderer_host/media/video_capture_controller.cc

Index: content/browser/renderer_host/media/video_capture_controller.cc
diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc
index e1d5d28014181cebe5d9a0f60cc1e3b3ecc30865..83e766288f04c12f897ed918d4e2c6221ed85aa6 100644
--- a/content/browser/renderer_host/media/video_capture_controller.cc
+++ b/content/browser/renderer_host/media/video_capture_controller.cc
@@ -16,11 +16,13 @@ static const size_t kNoOfDIBS = 3;
 VideoCaptureController::VideoCaptureController(
     const VideoCaptureControllerID& id,
     base::ProcessHandle render_process,
-    VideoCaptureControllerEventHandler* event_handler)
+    VideoCaptureControllerEventHandler* event_handler,
+    media_stream::VideoCaptureManager* video_capture_manager)
     : render_handle_(render_process),
       report_ready_to_delete_(false),
       event_handler_(event_handler),
-      id_(id) {
+      id_(id),
+      video_capture_manager_(video_capture_manager) {
   memset(&params_, 0, sizeof(params_));
 }
 
@@ -35,21 +37,18 @@ void VideoCaptureController::StartCapture(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   params_ = params;
-    media_stream::VideoCaptureManager* manager =
-        media_stream::MediaStreamManager::Get()->video_capture_manager();
   // Order the manager to start the actual capture.
-  manager->Start(params, this);
+  video_capture_manager_->Start(params, this);
 }
 
 void VideoCaptureController::StopCapture(Task* stopped_task) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  media_stream::VideoCaptureManager* manager =
-      media_stream::MediaStreamManager::Get()->video_capture_manager();
-  manager->Stop(params_.session_id,
-                NewRunnableMethod(this,
-                                  &VideoCaptureController::OnDeviceStopped,
-                                  stopped_task));
+  video_capture_manager_->Stop(
+      params_.session_id,
+      NewRunnableMethod(this,
+                        &VideoCaptureController::OnDeviceStopped,
+                        stopped_task));
 }
 
 void VideoCaptureController::ReturnBuffer(int buffer_id) {
@@ -157,8 +156,7 @@ void VideoCaptureController::OnIncomingCapturedFrame(const uint8* data,
 
 void VideoCaptureController::OnError() {
   event_handler_->OnError(id_);
-  media_stream::MediaStreamManager::Get()->video_capture_manager()->
-      Error(params_.session_id);
+  video_capture_manager_->Error(params_.session_id);
 }
 
 void VideoCaptureController::OnFrameInfo(