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

content/renderer/render_thread_impl.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.
 
 #ifndef CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
 #define CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 30 matching lines @@
 class WebGraphicsContext3DCommandBufferImpl;
 
 namespace WebKit {
 class WebMediaStreamCenter;
 class WebMediaStreamCenterClient;
 }
 
 namespace base {
 class MessageLoopProxy;
 class Thread;
+
+#if defined(OS_WIN)
 namespace win {
 class ScopedCOMInitializer;
 }
+#endif
 }
 
 namespace IPC {
 class ForwardingMessageFilter;
 }
 
 namespace content {
 class AudioRendererMixerManager;
 class MediaStreamCenter;
 class P2PSocketDispatcher;
@@ skipping 269 matching lines @@
 
   // Dispatches all P2P sockets.
   scoped_refptr<content::P2PSocketDispatcher> p2p_socket_dispatcher_;
 
   // Used on multiple threads.
   scoped_refptr<VideoCaptureImplManager> vc_manager_;
 
   // Used on multiple script execution context threads.
   scoped_ptr<WebDatabaseObserverImpl> web_database_observer_impl_;
 
-  // Initialize COM when using plugins outside the sandbox (Windows only).
+#if defined(OS_WIN)
+  // Initialize COM when using plugins outside the sandbox.
   scoped_ptr<base::win::ScopedCOMInitializer> initialize_com_;
+#endif
 
   // The count of RenderWidgets running through this thread.
   int widget_count_;
 
   // The count of hidden RenderWidgets running through this thread.
   int hidden_widget_count_;
 
   // The current value of the idle notification timer delay.
   int64 idle_notification_delay_in_ms_;
 
@@ skipping 25 matching lines @@
   scoped_ptr<WebGraphicsContext3DCommandBufferImpl> gpu_vda_context3d_;
 
   scoped_ptr<content::AudioRendererMixerManager> audio_renderer_mixer_manager_;
 
   HistogramCustomizer histogram_customizer_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl);
 };
 
 #endif  // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_