| 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();
|
|
|