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

content/browser/renderer_host/media/video_capture_host.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.
 //
 // VideoCaptureHost serves video capture related messages from
 // VideCaptureMessageFilter which lives inside the render process.
 //
 // This class is owned by BrowserRenderProcessHost, and instantiated on UI
 // thread, but all other operations and method calls happen on IO thread.
 //
@@ skipping 25 matching lines @@
 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_HOST_H_
 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_HOST_H_
 
 #include <map>
 
 #include "base/memory/ref_counted.h"
 #include "content/browser/browser_message_filter.h"
 #include "content/browser/renderer_host/media/video_capture_controller.h"
 #include "ipc/ipc_message.h"
 
+namespace content {
+class ResourceContext;
+}  // namespace content
+
 class VideoCaptureHost
     : public BrowserMessageFilter,
       public VideoCaptureControllerEventHandler {
  public:
-  VideoCaptureHost();
+  VideoCaptureHost(const content::ResourceContext* resource_context);
 
   // BrowserMessageFilter implementation.
   virtual void OnChannelClosing();
   virtual void OnDestruct() const;
   virtual bool OnMessageReceived(const IPC::Message& message,
                                  bool* message_was_ok);
 
   // VideoCaptureControllerEventHandler implementation.
   virtual void OnError(const VideoCaptureControllerID& id);
   virtual void OnBufferCreated(const VideoCaptureControllerID& id,
@@ skipping 59 matching lines @@
   // Handle error coming from VideoCaptureDevice.
   void DoHandleError(int device_id);
 
   typedef std::map<VideoCaptureControllerID,
                    scoped_refptr<VideoCaptureController> >EntryMap;
 
   // A map of VideoCaptureControllerID to VideoCaptureController
   // objects that is currently active.
   EntryMap entries_;
 
+  // Used to get a pointer to VideoCaptureManager to start/stop capture devices.
+  const content::ResourceContext* resource_context_;
+
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureHost);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_HOST_H_