Chromium Code Reviews| 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); |