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

Unified Diff: ash/test/ash_test_base.cc

Issue 12588008: Add switch to run ash tests on desktop in windows 8. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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: 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());
}

Powered by Google App Engine
This is Rietveld 408576698