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

Unified Diff: chrome/test/base/in_process_browser_test.cc

Issue 136643006: Clean up some ifdefs around Win Aura. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 11 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
« no previous file with comments | « chrome/test/base/in_process_browser_test.h ('k') | chrome/test/base/test_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/in_process_browser_test.cc
===================================================================
--- chrome/test/base/in_process_browser_test.cc (revision 248569)
+++ chrome/test/base/in_process_browser_test.cc (working copy)
@@ -55,7 +55,7 @@
#include "base/mac/scoped_nsautorelease_pool.h"
#endif
-#if defined(OS_WIN) && defined(USE_AURA)
+#if defined(OS_WIN)
#include "base/win/scoped_com_initializer.h"
#include "base/win/windows_version.h"
#include "ui/base/win/atl_module.h"
@@ -197,7 +197,7 @@
google_util::SetMockLinkDoctorBaseURLForTesting();
-#if defined(OS_WIN) && defined(USE_AURA)
+#if defined(OS_WIN)
if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) {
com_initializer_.reset(new base::win::ScopedCOMInitializer());
@@ -216,7 +216,7 @@
// This is a Browser test.
command_line->AppendSwitchASCII(switches::kTestType, kBrowserTestType);
-#if defined(OS_WIN) && defined(USE_AURA)
+#if defined(OS_WIN)
if (command_line->HasSwitch(switches::kAshBrowserTests)) {
command_line->AppendSwitchNative(switches::kViewerLaunchViaAppId,
win8::test::kDefaultTestAppUserModelId);
@@ -270,7 +270,7 @@
void InProcessBrowserTest::TearDown() {
DCHECK(!g_browser_process);
-#if defined(OS_WIN) && defined(USE_AURA)
+#if defined(OS_WIN)
com_initializer_.reset();
#endif
BrowserTestBase::TearDown();
« no previous file with comments | « chrome/test/base/in_process_browser_test.h ('k') | chrome/test/base/test_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698