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

Unified Diff: chrome/test/ui/ui_test.cc

Issue 12093083: Temporarily makes use_aura the default on windows so we can get perf (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 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
Index: chrome/test/ui/ui_test.cc
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 938f9c8e984cbebce2f7ccd3cf13a0b3c0a7e5ef..4a42ecbc161331f512075fc88d4b67422f054788 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -205,7 +205,8 @@ void UITestBase::SetLaunchSwitches() {
}
if (!test_name_.empty())
launch_arguments_.AppendSwitchASCII(switches::kTestName, test_name_);
-#if defined(USE_AURA)
+ // TODO: !OS_WIN is temporary, will remove shortly.
+#if defined(USE_AURA) && !defined(OS_WIN)
if (!CommandLine::ForCurrentProcess()->HasSwitch(
sky 2013/01/31 05:05:37 All the perf tests we care about are UI tests, so
switches::kDisableTestCompositor)) {
launch_arguments_.AppendSwitch(switches::kTestCompositor);

Powered by Google App Engine
This is Rietveld 408576698