Allow Thread to initialize COM for Windows consumers who need it

content/browser/renderer_host/media/media_stream_manager.h

 // Copyright (c) 2012 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.
 
 // MediaStreamManager is used to open/enumerate media capture devices (video
 // supported now). Call flow:
 // 1. GenerateStream is called when a render process wants to use a capture
 //    device.
 // 2. MediaStreamManager will ask MediaStreamUIController for permission to
 //    use devices and for which device to use.
@@ skipping 13 matching lines @@
 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_MANAGER_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #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 Thread;
 }
-}
-#endif
 
 namespace content {
 class MediaStreamUIController;
 }
 
 namespace media {
 class AudioManager;
 }
 
 namespace media_stream {
 
 class AudioInputDeviceManager;
 class MediaStreamDeviceSettings;
 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
 // MediaStreamManager::Listener.
 class CONTENT_EXPORT MediaStreamManager
     : public MediaStreamProviderListener,
       public MessageLoop::DestructionObserver,
       public SettingsRequester,
       public base::SystemMonitor::DevicesChangedObserver {
  public:
@@ skipping 152 matching lines @@
   void SendCachedDeviceList(EnumerationCache* cache, const std::string& label);
 
   // Stop the request of enumerating devices indentified by |label|.
   void StopEnumerateDevices(const std::string& label);
 
   // Helpers to start and stop monitoring devices.
   void StartMonitoring();
   void StopMonitoring();
 
   // Device thread shared by VideoCaptureManager and AudioInputDeviceManager.
-  scoped_ptr<DeviceThread> device_thread_;
+  scoped_ptr<base::Thread> device_thread_;
 
   scoped_ptr<content::MediaStreamUIController> ui_controller_;
 
   media::AudioManager* const audio_manager_;  // not owned
   scoped_refptr<AudioInputDeviceManager> audio_input_device_manager_;
   scoped_refptr<VideoCaptureManager> video_capture_manager_;
 
   // Indicator of device monitoring state.
   bool monitoring_started_;
 
@@ skipping 16 matching lines @@
 
   // Static members.
   static bool always_use_fake_devices_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamManager);
 };
 
 }  // namespace media_stream
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_MANAGER_H_