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

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

Index: net/test/android/javatests/src/org/chromium/net/test/TestServerBuilder.java
diff --git a/net/test/android/javatests/src/org/chromium/net/test/TestServerBuilder.java b/net/test/android/javatests/src/org/chromium/net/test/TestServerBuilder.java
index 3b52ab14d06e314570a674e4e5d44ab878dea59c..e8f4cddf5e5a1d5e0459ab08b642cd0035589b38 100644
--- a/net/test/android/javatests/src/org/chromium/net/test/TestServerBuilder.java
+++ b/net/test/android/javatests/src/org/chromium/net/test/TestServerBuilder.java
@@ -10,6 +10,7 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -18,6 +19,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
 
+import javax.net.ServerSocketFactory;
+
 /** Creates instances of BaseTestServer.
  *
  * This will eventually create instances of:
@@ -34,6 +37,8 @@ class TestServerBuilder {
     private static final Pattern SWITCH_PREFIX_RE = Pattern.compile("--");
     private static final Pattern SWITCH_VALUE_SEPARATOR_RE = Pattern.compile("=");
 
+    private static final int TEST_SERVER_ACCEPT_TIMEOUT = 20;
+
     private static final Set<String> OCSP_RESPONSES;
     private static final Set<String> SSL_BULK_CIPHERS;
     private static final Set<String> SSL_CLIENT_CERT_TYPES;
@@ -171,12 +176,23 @@ class TestServerBuilder {
      *
      * @return An instance of BaseTestServer.
      */
-    public BaseTestServer build() {
+    public BaseTestServer build() throws IOException {
         Log.i(TAG, "building with: " + toString());
 
-        // TODO(jbudorick): Implement this in a subsequent CL.
-        throw new UnsupportedOperationException(
-                "TestServerBuilder.build() hasn't been implemented yet.");
+        switch (mServerType) {
+            case HTTP:
+                if (!mHttps) {
+                    return new HttpTestServer(ServerSocketFactory.getDefault(), mPort,
+                            TEST_SERVER_ACCEPT_TIMEOUT, mDataDir);
+                } else {
+                    throw new UnsupportedOperationException(
+                            "HTTPS support hasn't been implemented yet.");
+                }
+            default:
+                // TODO(jbudorick): Implement these as needed.
+                throw new UnsupportedOperationException(
+                        "Specified server type hasn't been implemented yet.");
+        }
     }
 
     private void parse(JSONObject json) throws JSONException {