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

 // 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.
 
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 
 #include <list>
 
 #include "base/bind.h"
 #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"
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 #include "content/common/media/media_stream_options.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #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 {
 
 // Creates a random label used to identify requests.
 static std::string RandomLabel() {
   // An earlier PeerConnection spec,
   // http://dev.w3.org/2011/webrtc/editor/webrtc.html, specified the
   // MediaStream::label alphabet as containing 36 characters from
   // range: U+0021, U+0023 to U+0027, U+002A to U+002B, U+002D to U+002E,
@@ skipping 10 matching lines @@
   return label;
 }
 
 // Helper to verify if a media stream type is part of options or not.
 static bool Requested(const StreamOptions& options,
                       MediaStreamType stream_type) {
   return (options.audio_type == stream_type ||
           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 {
   enum RequestState {
     STATE_NOT_REQUESTED = 0,
     STATE_REQUESTED,
     STATE_PENDING_APPROVAL,
     STATE_OPENING,
     STATE_DONE,
     STATE_ERROR
@@ skipping 821 matching lines @@
        it != requests_.end(); ++it) {
     if (it->second.type == DeviceRequest::ENUMERATE_DEVICES &&
         Requested(it->second.options, stream_type)) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace media_stream