[Android] Revised initial commit of the HttpTestServer. (abandoned)

net/test/android/javatests/src/org/chromium/net/test/BaseTcpTestServer.java

Index: net/test/android/javatests/src/org/chromium/net/test/BaseTcpTestServer.java
diff --git a/net/test/android/javatests/src/org/chromium/net/test/BaseTcpTestServer.java b/net/test/android/javatests/src/org/chromium/net/test/BaseTcpTestServer.java
index 3f823595e599a21702bce91ea935966f771b1edf..d835daa217df1eb4ea13659642974faad611d431 100644
--- a/net/test/android/javatests/src/org/chromium/net/test/BaseTcpTestServer.java
+++ b/net/test/android/javatests/src/org/chromium/net/test/BaseTcpTestServer.java
@@ -11,6 +11,8 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
 
+import javax.net.ServerSocketFactory;
+
 /** A base class for simple TCP test servers. */
 public abstract class BaseTcpTestServer extends BaseTestServer {
     private static final String TAG = "BaseTcpTestServer";
@@ -18,17 +20,30 @@ public abstract class BaseTcpTestServer extends BaseTestServer {
     private ServerSocket mServerSocket;
 
     /**
-     * Creates a TCP test server on the given port.
+     * Creates a TCP test server on the given port from the given server factory.
      *
+     * @param serverFactory The factory to use to create the server socket.
      * @param serverPort The port to listen on for incoming TCP connections.
      * @param acceptTimeoutMs The timeout for calls to ServerSocket.accept(), in milliseconds.
      * @throws IOException If the server port can't be bound.
      */
-    public BaseTcpTestServer(int serverPort, int acceptTimeoutMs) throws IOException {
-        mServerSocket = new ServerSocket(serverPort);
+    protected BaseTcpTestServer(ServerSocketFactory serverFactory, int serverPort,
+            int acceptTimeoutMs) throws IOException {
+        mServerSocket = serverFactory.createServerSocket(serverPort);
         mServerSocket.setSoTimeout(acceptTimeoutMs);
     }
 
+    /**
+     * Creates a default TCP test server on the given port.
+     *
+     * @param serverPort The port to listen on for incoming TCP connections.
+     * @param acceptTimeoutMs The timeout for calls to ServerSocket.accept(), in milliseconds.
+     * @throws IOException If the server port can't be bound.
+     */
+    protected BaseTcpTestServer(int serverPort, int acceptTimeoutMs) throws IOException {
+        this(ServerSocketFactory.getDefault(), serverPort, acceptTimeoutMs);
+    }
+
     /** Returns the port on which this server is listening for connections. */
     @Override
     public int getServerPort() {