Chromium Code Reviews| Index: content/shell/browser/layout_test/layout_test_browser_main.cc |
| diff --git a/content/shell/browser/layout_test/layout_test_browser_main.cc b/content/shell/browser/layout_test/layout_test_browser_main.cc |
| index 7ed7ea72289e3353db2870be2f6bcc0f83178bd8..adb28077ab2943dcd654208f1b2a37520b99fd5d 100644 |
| --- a/content/shell/browser/layout_test/layout_test_browser_main.cc |
| +++ b/content/shell/browser/layout_test/layout_test_browser_main.cc |
| @@ -123,7 +123,8 @@ int LayoutTestBrowserMain( |
| browser_context_path_for_layout_tests.GetPath().MaybeAsASCII()); |
| #if defined(OS_ANDROID) |
| - content::EnsureInitializeForAndroidLayoutTests(); |
| + content::ScopedAndroidConfiguration android_configuration; |
| + android_configuration.Initialize(); |
| #endif |
| int exit_code = main_runner->Initialize(parameters); |
| @@ -133,6 +134,10 @@ int LayoutTestBrowserMain( |
| if (exit_code >= 0) |
| return exit_code; |
| +#if defined(OS_ANDROID) |
| + android_configuration.RedirectStreams(); |
|
Peter Beverloo
2016/12/06 19:24:06
What's the reason that you're splitting up the con
jbudorick
2016/12/08 02:04:13
- Initialize has to run before main_runner->Initia
|
| +#endif |
| + |
| if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| switches::kCheckLayoutTestSysDeps)) { |
| base::ThreadTaskRunnerHandle::Get()->PostTask( |