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

content/shell/browser/layout_test/layout_test_browser_main.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/browser/layout_test/layout_test_browser_main.h"
 
 #include <iostream>
 #include <memory>
 
 #include "base/command_line.h"
@@ skipping 14 matching lines @@
 #include "content/shell/browser/layout_test/blink_test_controller.h"
 #include "content/shell/browser/layout_test/test_info_extractor.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/common/layout_test/layout_test_switches.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/renderer/layout_test/blink_test_helpers.h"
 #include "net/base/filename_util.h"
 
 #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 {
 
 bool RunOneTest(
     const content::TestInfo& test_info,
     bool* ran_at_least_once,
     const std::unique_ptr<content::BrowserMainRunner>& main_runner) {
   if (!content::BlinkTestController::Get()->PrepareForLayoutTest(
           test_info.url, test_info.current_working_directory,
@@ skipping 70 matching lines @@
   base::ScopedTempDir browser_context_path_for_layout_tests;
 
   CHECK(browser_context_path_for_layout_tests.CreateUniqueTempDir());
   CHECK(
       !browser_context_path_for_layout_tests.GetPath().MaybeAsASCII().empty());
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kContentShellDataPath,
       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);
   DCHECK_LT(exit_code, 0)
       << "BrowserMainRunner::Initialize failed in 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(
         FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
     main_runner->Run();
     content::Shell::CloseAllWindows();
     main_runner->Shutdown();
     return 0;
   }
 
   exit_code = RunTests(main_runner);
   base::RunLoop().RunUntilIdle();
 
   content::Shell::CloseAllWindows();
 #if !defined(OS_ANDROID)
   main_runner->Shutdown();
 #endif
 
   return exit_code;
 }