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

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: rebase 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
« no previous file with comments | « ash/host/root_window_host_factory_win.cc ('k') | ash/test/test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_base.cc
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index ce7dad2dc7df920173d79ce68b1cd1efd414ff39..942f54953935688bd8a4cd558b84771bcc5d33d1 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -123,7 +123,9 @@ void AshTestBase::SetUp() {
ShellTestApi(shell).DisableOutputConfiguratorAnimation();
#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(
@@ -140,7 +142,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());
}
« no previous file with comments | « ash/host/root_window_host_factory_win.cc ('k') | ash/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698