Allow Thread to initialize COM for Windows consumers who need it

content/browser/renderer_host/media/media_stream_manager.h

Index: content/browser/renderer_host/media/media_stream_manager.h
===================================================================
--- content/browser/renderer_host/media/media_stream_manager.h	(revision 159813)
+++ content/browser/renderer_host/media/media_stream_manager.h	(working copy)
@@ -30,20 +30,15 @@
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/system_monitor/system_monitor.h"
-#include "base/threading/thread.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"
 #include "content/common/content_export.h"
 #include "content/public/browser/browser_thread.h"
 
-#if defined(OS_WIN)
 namespace base {
-namespace win {
-class ScopedCOMInitializer;
+class ComThread;
 }
-}
-#endif
 
 namespace media {
 class AudioManager;
@@ -56,26 +51,6 @@
 class MediaStreamRequester;
 class VideoCaptureManager;
 
-// Thread that enters MTA on Windows.
-#if defined(OS_WIN)
-class DeviceThread : public base::Thread {
- public:
-  explicit DeviceThread(const char* name);
-  virtual ~DeviceThread();
-
- protected:
-  virtual void Init() OVERRIDE;
-  virtual void CleanUp() OVERRIDE;
-
- private:
-  scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_;
-
-  DISALLOW_COPY_AND_ASSIGN(DeviceThread);
-};
-#else
-typedef base::Thread DeviceThread;
-#endif
-
 // MediaStreamManager is used to generate and close new media devices, not to
 // start the media flow.
 // The classes requesting new media streams are answered using
@@ -222,7 +197,7 @@
   void StopMonitoring();
 
   // Device thread shared by VideoCaptureManager and AudioInputDeviceManager.
-  scoped_ptr<DeviceThread> device_thread_;
+  scoped_ptr<base::ComThread> device_thread_;
 
   scoped_ptr<MediaStreamDeviceSettings> device_settings_;