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

content/browser/renderer_host/media/video_capture_controller.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_controller.h"
 
 #include "base/stl_util.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 #include "media/base/yuv_convert.h"
 
 // The number of TransportDIBs VideoCaptureController allocate.
 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_));
 }
 
 VideoCaptureController::~VideoCaptureController() {
   // Delete all TransportDIBs.
   STLDeleteContainerPairSecondPointers(owned_dibs_.begin(),
                                        owned_dibs_.end());
 }
 
 void VideoCaptureController::StartCapture(
     const media::VideoCaptureParams& params) {
   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) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   bool ready_to_delete;
   {
     base::AutoLock lock(lock_);
     free_dibs_.push_back(buffer_id);
     ready_to_delete = (free_dibs_.size() == owned_dibs_.size());
@@ skipping 87 matching lines @@
     }
     default:
       NOTREACHED();
   }
 
   event_handler_->OnBufferReady(id_, buffer_id, timestamp);
 }
 
 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(
     const media::VideoCaptureDevice::Capability& info) {
   DCHECK(owned_dibs_.empty());
   bool frames_created = true;
   const size_t needed_size = (info.width * info.height * 3) / 2;
   for (size_t i = 1; i <= kNoOfDIBS; ++i) {
     base::SharedMemory* shared_memory = new base::SharedMemory();
     if (!shared_memory->CreateAndMapAnonymous(needed_size)) {
@@ skipping 34 matching lines @@
   }
 
   if (ready_to_delete_now) {
     event_handler_->OnReadyToDelete(id_);
   }
   if (stopped_task) {
     stopped_task->Run();
     delete stopped_task;
   }
 }