[Android] Redirect std{in,out,err} to sockets for layout tests.

content/shell/browser/layout_test/layout_test_browser_main.cc

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..4a498ed3dcf27d9b3e5123c4bf098a3dd6e062c9 100644
--- a/content/shell/browser/layout_test/layout_test_browser_main.cc
+++ b/content/shell/browser/layout_test/layout_test_browser_main.cc
@@ -32,7 +32,7 @@
 
 #if defined(OS_ANDROID)
 #include "base/run_loop.h"
-#include "content/shell/browser/layout_test/layout_test_android.h"
+#include "content/shell/browser/layout_test/scoped_android_configuration.h"
 #endif
 
 namespace {
@@ -123,7 +123,7 @@ int LayoutTestBrowserMain(
       browser_context_path_for_layout_tests.GetPath().MaybeAsASCII());
 
 #if defined(OS_ANDROID)
-  content::EnsureInitializeForAndroidLayoutTests();
+  content::ScopedAndroidConfiguration android_configuration;
 #endif
 
   int exit_code = main_runner->Initialize(parameters);
@@ -133,6 +133,10 @@ int LayoutTestBrowserMain(
   if (exit_code >= 0)
     return exit_code;
 
+#if defined(OS_ANDROID)
+  android_configuration.RedirectStreams();
+#endif
+
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kCheckLayoutTestSysDeps)) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(