summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui/ui_test.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-03 15:29:59 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-03 15:29:59 +0000
commit6747cf5635b01f01581ab9a3733ebab8b6673511 (patch)
treebd2e79cee6124dd06151e8a4e18bd6f26053ab3d /chrome/test/ui/ui_test.cc
parentebef579d545535bcb60210a73fff6a6b8ebc3039 (diff)
downloadchromium_src-6747cf5635b01f01581ab9a3733ebab8b6673511.zip
chromium_src-6747cf5635b01f01581ab9a3733ebab8b6673511.tar.gz
chromium_src-6747cf5635b01f01581ab9a3733ebab8b6673511.tar.bz2
Revert 180308
> Temporarily makes use_aura the default on windows so we can get perf > numbers. Will revert as soon as perf bots cycle. > > BUG=none > TEST=none > R=jbates@chromium.org,piman@chromium.org,ben@chromium.org > > Review URL: https://codereview.chromium.org/12093083 TBR=sky@chromium.org Review URL: https://codereview.chromium.org/12178009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test.cc')
-rw-r--r--chrome/test/ui/ui_test.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 4a42ecb..938f9c8 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -205,8 +205,7 @@ void UITestBase::SetLaunchSwitches() {
}
if (!test_name_.empty())
launch_arguments_.AppendSwitchASCII(switches::kTestName, test_name_);
- // TODO: !OS_WIN is temporary, will remove shortly.
-#if defined(USE_AURA) && !defined(OS_WIN)
+#if defined(USE_AURA)
if (!CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableTestCompositor)) {
launch_arguments_.AppendSwitch(switches::kTestCompositor);