Removing singelton property of MediaStreamManager.

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..0c760cbacc0d99b5692596cb9a7c020b0f7321f4 100644
--- a/content/browser/renderer_host/media/video_capture_controller.h
+++ b/content/browser/renderer_host/media/video_capture_controller.h
@@ -27,13 +27,19 @@
 #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
@@ -87,6 +93,8 @@ class VideoCaptureController
   VideoCaptureControllerID id_;
   media::VideoCaptureDevice::Capability frame_info_;
 
+  media_stream::VideoCaptureManager* video_capture_manager_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureController);
 };