Allow Thread to initialize COM for Windows consumers who need it

content/browser/renderer_host/media/media_stream_manager.cc

Index: content/browser/renderer_host/media/media_stream_manager.cc
===================================================================
--- content/browser/renderer_host/media/media_stream_manager.cc	(revision 159813)
+++ content/browser/renderer_host/media/media_stream_manager.cc	(working copy)
@@ -10,6 +10,7 @@
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
+#include "base/threading/com_thread.h"
 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
 #include "content/browser/renderer_host/media/media_stream_device_settings.h"
 #include "content/browser/renderer_host/media/media_stream_requester.h"
@@ -54,24 +55,6 @@
           options.video_type == stream_type);
 }
 
-#if defined(OS_WIN)
-DeviceThread::DeviceThread(const char* name) : base::Thread(name) {
-}
-
-DeviceThread::~DeviceThread() {
-  Stop();
-}
-
-void DeviceThread::Init() {
-  com_initializer_.reset(new base::win::ScopedCOMInitializer(
-      base::win::ScopedCOMInitializer::kMTA));
-}
-
-void DeviceThread::CleanUp() {
-  com_initializer_.reset();
-}
-#endif
-
 // TODO(xians): Merge DeviceRequest with MediaStreamRequest.
 struct MediaStreamManager::DeviceRequest {
   enum RequestState {
@@ -456,7 +439,7 @@
   if (device_thread_.get())
     return;
 
-  device_thread_.reset(new DeviceThread("MediaStreamDeviceThread"));
+  device_thread_.reset(new base::ComThread("MediaStreamDeviceThread", true));
   CHECK(device_thread_->Start());
 
   audio_input_device_manager_ =