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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/test/content_test_suite.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

« content/browser/renderer_host/media/media_stream_manager.cc ('K') | « content/renderer/render_thread_impl.cc ('k') | content/test/webrtc_audio_device_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/test/content_test_suite.h

===================================================================

--- content/test/content_test_suite.h (revision 158860)

+++ content/test/content_test_suite.h (working copy)

@@ -6,9 +6,12 @@

#define CONTENT_TEST_CONTENT_TEST_SUITE_H_

#include "base/compiler_specific.h"

-#include "base/win/scoped_com_initializer.h"

#include "content/public/test/content_test_suite_base.h"

+#if defined(OS_WIN)

+#include "base/win/scoped_com_initializer.h"

+#endif

#if defined(USE_AURA)

namespace aura {

namespace test {

@@ -30,7 +33,9 @@

virtual ContentClient* CreateClientForInitialization() OVERRIDE;

private:

+#if defined(OS_WIN)

base::win::ScopedCOMInitializer com_initializer_;

+#endif

#if defined(USE_AURA)

scoped_ptr<aura::test::TestAuraInitializer> aura_initializer_;