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

content/shell/browser/layout_test/layout_test_android.h

Index: content/shell/browser/layout_test/layout_test_android.h
diff --git a/content/shell/browser/layout_test/layout_test_android.h b/content/shell/browser/layout_test/layout_test_android.h
index dbcc38aa24e52644c5abed418e525a247849795f..08ee9c73f49ff6708b1e412d3670879d1f40b897 100644
--- a/content/shell/browser/layout_test/layout_test_android.h
+++ b/content/shell/browser/layout_test/layout_test_android.h
@@ -6,9 +6,34 @@
 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_ANDROID_H_
 
 #include <string>

[Peter Beverloo, 2016/12/06 19:24:06]

micro nit:
  #include <memory>

[jbudorick, 2016/12/08 02:04:13]

Done.

+#include <vector>
+
+namespace net {
+class SocketPosix;
+}
 
 namespace content {
 
+class ScopedAndroidConfiguration {
+ public:
+  ScopedAndroidConfiguration();
+  ~ScopedAndroidConfiguration();
+
+  // Initializes the android test paths and the ui message pump.
+  void Initialize();
+
+  // Redirects stdin, stdout, and stderr to the ports specified on the command
+  // line.
+  void RedirectStreams();
+
+ private:
+  // Adds |socket| to |sockets_|.
+  void AddSocket(std::unique_ptr<net::SocketPosix> socket);
+
+  // The sockets to which the IO streams are being redirected.
+  std::vector<std::unique_ptr<net::SocketPosix>> sockets_;
+};
+
 // Initialize the nested message loop and FIFOs for Android, and verify that
 // all has been set up using a few appropriate CHECK()s.
 void EnsureInitializeForAndroidLayoutTests();

[Peter Beverloo, 2016/12/06 19:24:06]

This function is now unused -- can we delete it?

If we can, you might want to rename the file to
c/s/b/l_t/scoped_android_configuration.h or similar, since that's it's sole
occupant at that point.

[jbudorick, 2016/12/08 02:04:13]

Done.
Done in the second patchset.