Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(213)

Unified Diff: content/test/webrtc_audio_device_test.h

Issue 10990079: Clean up scoped_com_initializer.h. Remove #ifdefs for non-Windows (this is in base/win, no one sho… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/test/webrtc_audio_device_test.h
===================================================================
--- content/test/webrtc_audio_device_test.h (revision 158860)
+++ content/test/webrtc_audio_device_test.h (working copy)
@@ -23,12 +23,6 @@
class RenderThreadImpl;
class WebRTCMockRenderProcess;
-namespace base {
-namespace win {
-class ScopedCOMInitializer;
-}
-}
-
namespace content {
class ContentRendererClient;
class MockResourceContext;
@@ -52,6 +46,14 @@
class VoENetwork;
}
+#if defined(OS_WIN)
+namespace base {
+namespace win {
+class ScopedCOMInitializer;
+}
+}
+#endif
+
// Scoped class for WebRTC interfaces. Fetches the wrapped interface
// in the constructor via WebRTC's GetInterface mechanism and then releases
// the reference in the destructor.
@@ -179,8 +181,11 @@
scoped_ptr<content::TestBrowserThread> ui_thread_;
// Initialized on our IO thread to satisfy BrowserThread::IO checks.
scoped_ptr<content::TestBrowserThread> io_thread_;
- // COM initialization on the IO thread for Windows.
+
+#if defined(OS_WIN)
+ // COM initialization on the IO thread.
scoped_ptr<base::win::ScopedCOMInitializer> initialize_com_;
+#endif
// These are initialized when we set up our IO thread.
bool has_input_devices_;

Powered by Google App Engine
This is Rietveld 408576698