diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 04:52:29 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 04:52:29 +0000 |
| commit | 5f6b4966300d65037e78996cb857cff464d10bbd (patch) | |
| tree | 4561219615beeb0d4f87cd6059eace3f8676c5b9 /chrome/test | |
| parent | ccff3d72f103a9902c9b6c2c2be8d8e0c26f2a8b (diff) | |
| download | chromium_src-5f6b4966300d65037e78996cb857cff464d10bbd.zip chromium_src-5f6b4966300d65037e78996cb857cff464d10bbd.tar.gz chromium_src-5f6b4966300d65037e78996cb857cff464d10bbd.tar.bz2 | |
Turn on aura again to get performance numbers. Will revert once perf release
bots cycle.
R=ben@chromium.org
TBR=ben@chromium.org
BUG=none
TEST=none
Review URL: https://codereview.chromium.org/12225037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180901 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 938f9c8..4a42ecb 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( switches::kDisableTestCompositor)) { launch_arguments_.AppendSwitch(switches::kTestCompositor); |