Index: ash/test/ash_test_base.cc |
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc |
index 0082da2524c9f9ad55505af75fb7b9a78e4064fa..43b339372fc84738df1d4d5a0ad3a9d70b89e864 100644 |
--- a/ash/test/ash_test_base.cc |
+++ b/ash/test/ash_test_base.cc |
@@ -119,7 +119,9 @@ void AshTestBase::SetUp() { |
shell->cursor_manager()->EnableMouseEvents(); |
#if defined(OS_WIN) |
- if (base::win::GetVersion() >= base::win::VERSION_WIN8) { |
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8 && |
+ !CommandLine::ForCurrentProcess()->HasSwitch( |
+ ash::switches::kForceAshToDesktop)) { |
metro_viewer_host_.reset(new TestMetroViewerProcessHost("viewer")); |
ASSERT_TRUE( |
metro_viewer_host_->LaunchViewerAndWaitForConnection( |
@@ -136,7 +138,9 @@ void AshTestBase::TearDown() { |
RunAllPendingInMessageLoop(); |
#if defined(OS_WIN) |
- if (base::win::GetVersion() >= base::win::VERSION_WIN8) { |
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8 && |
+ !CommandLine::ForCurrentProcess()->HasSwitch( |
+ ash::switches::kForceAshToDesktop)) { |
// Check that our viewer connection is still established. |
ASSERT_FALSE(metro_viewer_host_->closed_unexpectedly()); |
} |