Clean up scoped_com_initializer.h. Remove #ifdefs for non-Windows (this is in base/win, no one sho…

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 158860)
+++ content/browser/renderer_host/media/media_stream_manager.cc	(working copy)
@@ -10,7 +10,6 @@
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
-#include "base/win/scoped_com_initializer.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"
@@ -21,6 +20,10 @@
 #include "content/public/browser/media_observer.h"
 #include "googleurl/src/gurl.h"
 
+#if defined(OS_WIN)
+#include "base/win/scoped_com_initializer.h"
+#endif
+
 using content::BrowserThread;
 
 namespace media_stream {
@@ -51,23 +54,22 @@
           options.video_type == stream_type);
 }
 
-DeviceThread::DeviceThread(const char* name)
-    : base::Thread(name) {
+#if defined(OS_WIN)

[cpu_(ooo_6.6-7.5), 2012/10/01 19:47:27]

does block 58-62 need to be ifdef(os_win) ?

[Peter Kasting, 2012/10/01 20:23:17]

Yes, see the header file changes.

+DeviceThread::DeviceThread(const char* name) : base::Thread(name) {
 }
 
 DeviceThread::~DeviceThread() {
-  Stop();

[cpu_(ooo_6.6-7.5), 2012/10/01 19:47:27]

did you mean to remove this stop()?

I don't see an override here so I thinking is ok but just checking.

[Peter Kasting, 2012/10/01 20:23:17]

I did mean to remove it, because the superclass destructor already calls it, so
it's just redundant.

 }
 
 void DeviceThread::Init() {
-  using base::win::ScopedCOMInitializer;
-  // Enter the multi-threaded apartment.
-  com_initializer_.reset(new ScopedCOMInitializer(ScopedCOMInitializer::kMTA));
+  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 {