Fix COM initialization on media thread.

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 MediaStreamDeviceSettings for permission to
 //    use devices and for which device to use.
@@ skipping 12 matching lines @@
 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread.h"
-#include "base/win/scoped_com_initializer.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"
 
-using base::win::ScopedCOMInitializer;
+namespace base {
+namespace win {
+class ScopedCOMInitializer;
+}
+}
 
 namespace media_stream {
 
 class AudioInputDeviceManager;
 class MediaStreamDeviceSettings;
 class MediaStreamRequester;
 class VideoCaptureManager;
 
 // Thread that enters MTA on windows, and is base::Thread on linux and mac.
 class DeviceThread : public base::Thread {
  public:
-  explicit DeviceThread(const char* name)
-      : base::Thread(name),
-        com_init_(ScopedCOMInitializer::kMTA) {}
+  explicit DeviceThread(const char* name);
+  virtual ~DeviceThread();
+
+ protected:
+  virtual void Init() OVERRIDE;
+  virtual void CleanUp() OVERRIDE;
 
  private:
-  ScopedCOMInitializer com_init_;
+  scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_;
   DISALLOW_COPY_AND_ASSIGN(DeviceThread);
 };
 
 // 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 SettingsRequester {
@@ skipping 106 matching lines @@
   // All non-closed request.
   typedef std::map<std::string, DeviceRequest> DeviceRequests;
   DeviceRequests requests_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamManager);
 };
 
 }  // namespace media_stream
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_MANAGER_H_