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

content/browser/renderer_host/media/media_stream_manager.h

Index: content/browser/renderer_host/media/media_stream_manager.h
diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h
index f5792ce80d3a216199074f1831c5f03ce0665c72..e208659c9a19cf24e315242646801bbf66e1fc16 100644
--- a/content/browser/renderer_host/media/media_stream_manager.h
+++ b/content/browser/renderer_host/media/media_stream_manager.h
@@ -23,7 +23,8 @@
 #include <string>
 #include <vector>
 
-#include "base/lazy_instance.h"
+#include "base/basictypes.h"
+#include "base/memory/ref_counted.h"
 #include "content/browser/renderer_host/media/media_stream_provider.h"
 #include "content/browser/renderer_host/media/media_stream_settings_requester.h"
 #include "content/common/media/media_stream_options.h"
@@ -39,14 +40,15 @@ class VideoCaptureManager;
 // The classes requesting new media streams are answered using
 // MediaStreamManager::Listener.
 class MediaStreamManager
-    : public MediaStreamProviderListener,
+    : public base::RefCounted<media_stream::MediaStreamManager>,

[willchan no longer on Chromium, 2011/08/17 19:55:19]

Why is this refcounted? Who owns this object? It's in the ProfileIOData which
suggests that ProfileIOData owns it. If so, please remove the refcounting. If it
truly has shared ownership, please document the ownership here.

Note that if you're using refcounting due to NewRunnableMethod() needing it to
be refcounted, then you should either use ScopedRunnableMethodFactory,
base::WeakPtrFactory, or base::Bind()+base::Unretained() to eliminate the need
for the refcounting.

My inkling is that the ownership of this object is well-defined. It should die
when the ProfileIOData dies (which is right after the Profile dies). And nothing
should be posting to it afterwards, and if anything is doing so, it's a bug. If
this is correct, then please don't use refcounting. Use the solutions I
recommended.

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

Done, removed ref counted and replaced scoped_refptr with scoped_ptr in
ProfileIOData.

+      public MediaStreamProviderListener,
       public SettingsRequester {
  public:
   typedef MediaStreamManager* (AccessorMethod)();

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

is this still in use?

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

Removed, done.

-  static MediaStreamManager* Get();
-  virtual ~MediaStreamManager();
 
-  // Used to access VideoCaptuerManager.
+  MediaStreamManager();
+
+  // Used to access VideoCaptureManager.
   VideoCaptureManager* video_capture_manager();
 
   // GenerateStream opens new media devices according to |components|. The
@@ -83,6 +85,9 @@ class MediaStreamManager
   void UseFakeDevice();
 
  private:
+  friend class base::RefCounted<MediaStreamManager>;
+  virtual ~MediaStreamManager();
+
   // Contains all data needed to keep track of requests.
   struct DeviceRequest {
     DeviceRequest();
@@ -106,12 +111,7 @@ class MediaStreamManager
 
   // Helpers.
   bool RequestDone(const MediaStreamManager::DeviceRequest& request) const;
-  MediaStreamProvider* GetDeviceManager(MediaStreamType stream_type) const;
-
-  // Private constructor to enforce singleton.
-  friend struct base::DefaultLazyInstanceTraits<MediaStreamManager>;
-  MediaStreamManager();
-
+  MediaStreamProvider* GetDeviceManager(MediaStreamType stream_type);
   VideoCaptureManager* video_capture_manager_;
   // TODO(mflodman) Add AudioInputManager.