Wire up GetUserMedia in Chrome Frame.

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 3082ac0f76fd6ec5434b6a81657bcb4ba6849261..69d22b70171c434d107aa34b4a8b5225652e8b4c 100644
--- a/content/browser/renderer_host/media/media_stream_manager.h
+++ b/content/browser/renderer_host/media/media_stream_manager.h
@@ -30,15 +30,12 @@
 #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 media_stream {
 
 class AudioInputDeviceManager;
@@ -49,12 +46,14 @@ 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);
+
+ protected:
+  virtual void Init() OVERRIDE;
+  virtual void CleanUp() OVERRIDE;
 
  private:
-  ScopedCOMInitializer com_init_;
+  bool com_initialized_;

[tommi (sloooow) - chröme, 2012/07/06 22:17:09]

yikes, I see what you mean... should have been caught in a review.
hmm... /me wonders... to kinda force ourselves to use ScopedCOMInitializer as we
do in most other places, should we use scoped_ptr<ScopedCOMInitializer>?  I
realize it's a scoped scopy thing, but it gets rid of the #ifdefs.

[grt (UTC plus 2), 2012/07/06 23:07:25]

awesome idea.  done.

   DISALLOW_COPY_AND_ASSIGN(DeviceThread);
 };