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

content/browser/renderer_host/media/video_capture_controller.h

 // 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.
 
 // VideoCaptureController is the glue between VideoCaptureHost,
 // VideoCaptureManager and VideoCaptureDevice.
 // It provides functions for VideoCaptureHost to start a VideoCaptureDevice and
 // is responsible for keeping track of TransportDIBs and filling them with I420
 // video frames for IPC communication between VideoCaptureHost and
 // VideoCaptureMessageFilter.
 // It implements media::VideoCaptureDevice::EventHandler to get video frames
 // from a VideoCaptureDevice object and do color conversion straight into the
 // TransportDIBs to avoid a memory copy.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_CONTROLLER_H_
 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_CONTROLLER_H_
 
 #include <list>
 #include <map>
 
 #include "base/memory/ref_counted.h"
 #include "base/process.h"
 #include "base/synchronization/lock.h"
 #include "base/task.h"
 #include "content/browser/renderer_host/media/video_capture_controller_event_handler.h"
 #include "media/video/capture/video_capture_device.h"
 #include "media/video/capture/video_capture_types.h"
 #include "ui/gfx/surface/transport_dib.h"
 
+namespace media_stream {
+class VideoCaptureManager;
+}  // namespace media_stream
+
 class VideoCaptureController
     : public base::RefCountedThreadSafe<VideoCaptureController>,
       public media::VideoCaptureDevice::EventHandler {
  public:
-  VideoCaptureController(const VideoCaptureControllerID& id,
-                         base::ProcessHandle render_process,
-                         VideoCaptureControllerEventHandler* event_handler);
+  VideoCaptureController(
+      const VideoCaptureControllerID& id,
+      base::ProcessHandle render_process,
+      VideoCaptureControllerEventHandler* event_handler,
+      media_stream::VideoCaptureManager* video_capture_manager);
   virtual ~VideoCaptureController();
 
   // Starts video capturing and tries to use the resolution specified in
   // params.
   // When capturing has started VideoCaptureControllerEventHandler::OnFrameInfo
   // is called with resolution that best matches the requested that the video
   // capture device support.
   void StartCapture(const media::VideoCaptureParams& params);
 
   // Stop video capture.
@@ skipping 33 matching lines @@
   DIBMap owned_dibs_;
   VideoCaptureControllerEventHandler* event_handler_;
 
   // The parameter that was requested when starting the capture device.
   media::VideoCaptureParams params_;
 
   // ID used for identifying this object.
   VideoCaptureControllerID id_;
   media::VideoCaptureDevice::Capability frame_info_;
 
+  media_stream::VideoCaptureManager* video_capture_manager_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureController);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_CONTROLLER_H_