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

content/browser/renderer_host/media/video_capture_controller.h

Index: content/browser/renderer_host/media/video_capture_controller.h
diff --git a/content/browser/renderer_host/media/video_capture_controller.h b/content/browser/renderer_host/media/video_capture_controller.h
index 432ac4a4470a69abfefe0aa7f04e0d8f8d7fdf9c..6c40b00a26f2cac77a9859a1fa7b4b900d77654d 100644
--- a/content/browser/renderer_host/media/video_capture_controller.h
+++ b/content/browser/renderer_host/media/video_capture_controller.h
@@ -27,13 +27,18 @@
 #include "media/video/capture/video_capture_types.h"
 #include "ui/gfx/surface/transport_dib.h"
 
+namespace content {
+class ResourceContext;
+}  // namespace content
+
 class VideoCaptureController
     : public base::RefCountedThreadSafe<VideoCaptureController>,
       public media::VideoCaptureDevice::EventHandler {
  public:
   VideoCaptureController(const VideoCaptureControllerID& id,
                          base::ProcessHandle render_process,
-                         VideoCaptureControllerEventHandler* event_handler);
+                         VideoCaptureControllerEventHandler* event_handler,
+                         const content::ResourceContext* resource_context);

[wjia(left Chromium), 2011/08/17 21:13:54]

media_stream::MediaStreamManager is good enough here.

[mflodman_chromium_OOO, 2011/08/19 11:07:09]

Done.

   virtual ~VideoCaptureController();
 
   // Starts video capturing and tries to use the resolution specified in
@@ -87,6 +92,9 @@ class VideoCaptureController
   VideoCaptureControllerID id_;
   media::VideoCaptureDevice::Capability frame_info_;
 
+  // Used to get a pointer to VideoCaptureManager.
+  const content::ResourceContext* resource_context_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureController);
 };