Chromium Code Reviews| Index: chrome/test/base/interactive_ui_tests_main.cc |
| diff --git a/chrome/test/base/interactive_ui_tests_main.cc b/chrome/test/base/interactive_ui_tests_main.cc |
| index b9af4fe9399e06af3f9cdd5432797e695d386c95..cc0a20d3eb8b4107b4223a84e3deda7fffa99c83 100644 |
| --- a/chrome/test/base/interactive_ui_tests_main.cc |
| +++ b/chrome/test/base/interactive_ui_tests_main.cc |
| @@ -6,6 +6,8 @@ |
| #include "build/build_config.h" |
| #include "chrome/test/base/chrome_test_suite.h" |
| +#include "chrome/test/base/in_process_browser_test.h" |
| +#include "chrome/test/base/interactive_test_utils.h" |
| #include "ui/base/test/ui_controls.h" |
| #if defined(USE_AURA) |
| @@ -79,6 +81,18 @@ int main(int argc, char** argv) { |
| #if defined(OS_WIN) |
| KillAlwaysOnTopWindows(RunType::BEFORE_TEST); |
| #endif |
| + // TODO(sky): this causes a crash in an autofill test on macosx, figure out |
| + // why. |
|
msw
2016/08/29 01:12:29
nit: file a bug?
sky
2016/08/29 15:51:20
Done.
|
| +#if !defined(OS_MACOSX) |
| + // Without this it's possible for the first browser to start up in the |
| + // background, generally because the last test did something that causes the |
| + // test to run in the background. Most interactive ui tests assume they are in |
| + // the foreground and fail in weird ways if they aren't (for example, clicks |
| + // go to the wrong place). This ensures the first browser is always in the |
| + // foreground. |
| + InProcessBrowserTest::set_global_browser_set_up_function( |
| + &ui_test_utils::BringBrowserWindowToFront); |
|
msw
2016/08/29 01:12:29
It seems odd that new browser windows would ever b
sky
2016/08/29 15:51:20
Interactive tests some times test behavior when cl
|
| +#endif |
| // Run interactive_ui_tests serially, they do not support running in parallel. |
| int default_jobs = 1; |
| InteractiveUITestSuiteRunner runner; |