| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/test/base/chrome_test_launcher.h" | 5 #include "chrome/test/base/chrome_test_launcher.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" |
| 7 #include "chrome/test/base/chrome_test_suite.h" | 8 #include "chrome/test/base/chrome_test_suite.h" |
| 8 #include "ui/base/test/ui_controls.h" | 9 #include "ui/base/test/ui_controls.h" |
| 9 | 10 |
| 10 #if defined(USE_AURA) | 11 #if defined(USE_AURA) |
| 11 #include "ui/aura/test/ui_controls_factory_aura.h" | 12 #include "ui/aura/test/ui_controls_factory_aura.h" |
| 12 #include "ui/base/test/ui_controls_aura.h" | 13 #include "ui/base/test/ui_controls_aura.h" |
| 13 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 14 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| 14 #include "ui/views/test/ui_controls_factory_desktop_aurax11.h" | 15 #include "ui/views/test/ui_controls_factory_desktop_aurax11.h" |
| 15 #endif | 16 #endif |
| 16 #endif | 17 #endif |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 #endif | 81 #endif |
| 81 // Run interactive_ui_tests serially, they do not support running in parallel. | 82 // Run interactive_ui_tests serially, they do not support running in parallel. |
| 82 int default_jobs = 1; | 83 int default_jobs = 1; |
| 83 InteractiveUITestSuiteRunner runner; | 84 InteractiveUITestSuiteRunner runner; |
| 84 const int result = LaunchChromeTests(default_jobs, &runner, argc, argv); | 85 const int result = LaunchChromeTests(default_jobs, &runner, argc, argv); |
| 85 #if defined(OS_WIN) | 86 #if defined(OS_WIN) |
| 86 KillAlwaysOnTopWindows(RunType::AFTER_TEST); | 87 KillAlwaysOnTopWindows(RunType::AFTER_TEST); |
| 87 #endif | 88 #endif |
| 88 return result; | 89 return result; |
| 89 } | 90 } |
| OLD | NEW |