Move Android WebView Test WebServer to net.

Move Android WebView Test WebServer to net so that other test code can
make use of it.

BUG=159601


Review URL: https://chromiumcodereview.appspot.com/11366108

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166493 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 13 insertions, 541 deletions

diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi
index b4b4a80..d61d668 100644
--- a/android_webview/android_webview_tests.gypi
+++ b/android_webview/android_webview_tests.gypi
@@ -9,7 +9,8 @@
       'dependencies': [
         '../base/base.gyp:base_java_test_support',
         '../content/content.gyp:content_java_test_support',
-        'android_webview_java',
+        '../net/net.gyp:net_java_test_support',
+       'android_webview_java',
         'libwebviewchromium',
       ],
       'variables': {
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java
index 9dbdf7b..ea41e80 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java
@@ -13,7 +13,7 @@ import org.chromium.android_webview.AwContents;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.LoadUrlParams;
 import org.chromium.content.browser.test.util.CallbackHelper;
-import org.chromium.android_webview.test.util.TestWebServer;
+import org.chromium.net.test.util.TestWebServer;
 
 import java.util.concurrent.TimeUnit;
 import java.util.HashMap;
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java
index 3876739..78c2e4a 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java
@@ -10,10 +10,10 @@ import android.test.suitebuilder.annotation.SmallTest;
 
 import org.apache.http.util.EncodingUtils;
 import org.chromium.android_webview.AwContents;
-import org.chromium.android_webview.test.util.TestWebServer;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
+import org.chromium.net.test.util.TestWebServer;
 
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.TimeUnit;
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldIgnoreNavigationTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldIgnoreNavigationTest.java
index 8c457a9..90cdb17 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldIgnoreNavigationTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldIgnoreNavigationTest.java
@@ -14,7 +14,6 @@ import android.util.Log;
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.test.util.CommonResources;
 import org.chromium.android_webview.test.util.JSUtils;
-import org.chromium.android_webview.test.util.TestWebServer;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.NavigationHistory;
@@ -24,6 +23,7 @@ import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageFinishedHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageStartedHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnReceivedErrorHelper;
+import org.chromium.net.test.util.TestWebServer;
 
 import java.net.URLEncoder;
 import java.util.ArrayList;
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
index 1334eae..fa536c2 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
@@ -12,11 +12,11 @@ import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.InterceptedRequestData;
 import org.chromium.android_webview.test.util.CommonResources;
 import org.chromium.android_webview.test.util.JSUtils;
-import org.chromium.android_webview.test.util.TestWebServer;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageFinishedHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageStartedHelper;
+import org.chromium.net.test.util.TestWebServer;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
index 2bce18a..8831442 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
@@ -15,13 +15,13 @@ import android.util.Pair;
 
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.test.util.CommonResources;
-import org.chromium.android_webview.test.util.TestWebServer;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
+import org.chromium.net.test.util.TestWebServer;
 
 import java.io.InputStream;
 import java.net.URL;
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
index 0bd7c6f5..75dfb5c 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
@@ -15,7 +15,6 @@ import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwSettings;
 import org.chromium.android_webview.test.util.CommonResources;
 import org.chromium.android_webview.test.util.ImagePageGenerator;
-import org.chromium.android_webview.test.util.TestWebServer;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.TestFileUtil;
@@ -26,6 +25,7 @@ import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.HistoryUtils;
+import org.chromium.net.test.util.TestWebServer;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
index 61b4961..6def21e 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java
@@ -8,9 +8,9 @@ import android.test.FlakyTest;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.android_webview.AwContents;
-import org.chromium.android_webview.test.util.TestWebServer;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
+import org.chromium.net.test.util.TestWebServer;
 
 /**
  * Tests for the ContentViewClient.onPageFinished() method.
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java
index 7b7c8bb..42d3628 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java
@@ -11,11 +11,11 @@ import android.util.Pair;
 
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.CookieManager;
-import org.chromium.android_webview.test.util.TestWebServer;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper;
+import org.chromium.net.test.util.TestWebServer;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java
index 9b82a77..d62fa63 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java
@@ -8,9 +8,9 @@ import android.test.suitebuilder.annotation.SmallTest;
 import android.test.suitebuilder.annotation.Smoke;
 
 import org.chromium.android_webview.AwContents;
-import org.chromium.android_webview.test.util.TestWebServer;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.DisabledTest;
+import org.chromium.net.test.util.TestWebServer;
 
 /**
  * A test suite for ContentView.getTitle().
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
index 5e60f96..06a45ee 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
@@ -10,7 +10,6 @@ import android.test.suitebuilder.annotation.SmallTest;
 import org.chromium.android_webview.AndroidProtocolHandler;
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.test.util.CommonResources;
-import org.chromium.android_webview.test.util.TestWebServer;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.content.browser.test.util.Criteria;
@@ -20,6 +19,7 @@ import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.LoadUrlParams;
 import org.chromium.content.browser.test.util.HistoryUtils;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
+import org.chromium.net.test.util.TestWebServer;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
index 6670773..3a5caf6 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
@@ -9,13 +9,13 @@ import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.test.util.CommonResources;
-import org.chromium.android_webview.test.util.TestWebServer;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.content.browser.NavigationEntry;
 import org.chromium.content.browser.NavigationHistory;
 import org.chromium.content.browser.test.util.HistoryUtils;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
+import org.chromium.net.test.util.TestWebServer;
 
 import java.util.concurrent.Callable;
 
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/util/TestWebServer.java b/android_webview/javatests/src/org/chromium/android_webview/test/util/TestWebServer.java
deleted file mode 100644
index a416c09..0000000
--- a/android_webview/javatests/src/org/chromium/android_webview/test/util/TestWebServer.java
+++ /dev/null
@@ -1,529 +0,0 @@
-// Copyright (c) 2012 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.
-
-package org.chromium.android_webview.test.util;
-
-import android.util.Base64;
-import android.util.Log;
-import android.util.Pair;
-
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.HttpVersion;
-import org.apache.http.RequestLine;
-import org.apache.http.StatusLine;
-import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.impl.DefaultHttpServerConnection;
-import org.apache.http.impl.cookie.DateUtils;
-import org.apache.http.message.BasicHttpResponse;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.CoreProtocolPNames;
-import org.apache.http.params.HttpParams;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLConnection;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.X509TrustManager;
-
-/**
- * Simple http test server for testing.
- *
- * Based heavily on the CTSWebServer in Android.
- */
-public class TestWebServer {
-    private static final String TAG = "TestWebServer";
-    private static final int SERVER_PORT = 4444;
-    private static final int SSL_SERVER_PORT = 4445;
-
-    public static final String SHUTDOWN_PREFIX = "/shutdown";
-
-    private static TestWebServer sInstance;
-    private static Hashtable<Integer, String> sReasons;
-
-    private ServerThread mServerThread;
-    private String mServerUri;
-    private boolean mSsl;
-
-    private static class Response {
-        final byte[] mResponseData;
-        final List<Pair<String, String>> mResponseHeaders;
-        final boolean mIsRedirect;
-
-        Response(byte[] resposneData, List<Pair<String, String>> responseHeaders,
-                boolean isRedirect) {
-            mIsRedirect = isRedirect;
-            mResponseData = resposneData;
-            mResponseHeaders = responseHeaders == null ?
-                    new ArrayList<Pair<String, String>>() : responseHeaders;
-        }
-    }
-
-    private Map<String, Response> mResponseMap = new HashMap<String, Response>();
-    private Map<String, Integer> mResponseCountMap = new HashMap<String, Integer>();
-    private Map<String, HttpRequest> mLastRequestMap = new HashMap<String, HttpRequest>();
-
-    /**
-     * Create and start a local HTTP server instance.
-     * @param ssl True if the server should be using secure sockets.
-     * @throws Exception
-     */
-    public TestWebServer(boolean ssl) throws Exception {
-        if (sInstance != null) {
-            // attempt to start a new instance while one is still running
-            // shut down the old instance first
-            sInstance.shutdown();
-        }
-        sInstance = this;
-        mSsl = ssl;
-        if (mSsl) {
-            mServerUri = "https://localhost:" + SSL_SERVER_PORT;
-        } else {
-            mServerUri = "http://localhost:" + SERVER_PORT;
-        }
-        mServerThread = new ServerThread(this, mSsl);
-        mServerThread.start();
-    }
-
-    /**
-     * Terminate the http server.
-     */
-    public void shutdown() {
-        try {
-            // Avoid a deadlock between two threads where one is trying to call
-            // close() and the other one is calling accept() by sending a GET
-            // request for shutdown and having the server's one thread
-            // sequentially call accept() and close().
-            URL url = new URL(mServerUri + SHUTDOWN_PREFIX);
-            URLConnection connection = openConnection(url);
-            connection.connect();
-
-            // Read the input from the stream to send the request.
-            InputStream is = connection.getInputStream();
-            is.close();
-
-            // Block until the server thread is done shutting down.
-            mServerThread.join();
-
-        } catch (MalformedURLException e) {
-            throw new IllegalStateException(e);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        } catch (NoSuchAlgorithmException e) {
-            throw new IllegalStateException(e);
-        } catch (KeyManagementException e) {
-            throw new IllegalStateException(e);
-        }
-
-        sInstance = null;
-    }
-
-    private final static int RESPONSE_STATUS_NORMAL = 0;
-    private final static int RESPONSE_STATUS_MOVED_TEMPORARILY = 1;
-
-    private String setResponseInternal(
-            String requestPath, byte[] responseData,
-            List<Pair<String, String>> responseHeaders,
-            int status) {
-        final boolean isRedirect = (status == RESPONSE_STATUS_MOVED_TEMPORARILY);
-        mResponseMap.put(requestPath, new Response(responseData, responseHeaders, isRedirect));
-        mResponseCountMap.put(requestPath, Integer.valueOf(0));
-        mLastRequestMap.put(requestPath, null);
-        return getResponseUrl(requestPath);
-    }
-
-    /**
-     * Gets the URL on the server under which a particular request path will be accessible.
-     *
-     * This only gets the URL, you still need to set the response if you intend to access it.
-     *
-     * @param requestPath The path to respond to.
-     * @return The full URL including the requestPath.
-     */
-    public String getResponseUrl(String requestPath) {
-        return mServerUri + requestPath;
-    }
-
-    /**
-     * Sets a response to be returned when a particular request path is passed
-     * in (with the option to specify additional headers).
-     *
-     * @param requestPath The path to respond to.
-     * @param responseString The response body that will be returned.
-     * @param responseHeaders Any additional headers that should be returned along with the
-     *                        response (null is acceptable).
-     * @return The full URL including the path that should be requested to get the expected
-     *         response.
-     */
-    public String setResponse(
-            String requestPath, String responseString,
-            List<Pair<String, String>> responseHeaders) {
-        return setResponseInternal(requestPath, responseString.getBytes(), responseHeaders,
-                RESPONSE_STATUS_NORMAL);
-    }
-
-    /**
-     * Sets a redirect.
-     *
-     * @param requestPath The path to respond to.
-     * @param targetPath The path to redirect to.
-     * @return The full URL including the path that should be requested to get the expected
-     *         response.
-     */
-    public String setRedirect(
-            String requestPath, String targetPath) {
-        List<Pair<String, String>> responseHeaders = new ArrayList<Pair<String, String>>();
-        responseHeaders.add(Pair.create("Location", targetPath));
-
-        return setResponseInternal(requestPath, targetPath.getBytes(), responseHeaders,
-                RESPONSE_STATUS_MOVED_TEMPORARILY);
-    }
-
-    /**
-     * Sets a base64 encoded response to be returned when a particular request path is passed
-     * in (with the option to specify additional headers).
-     *
-     * @param requestPath The path to respond to.
-     * @param base64EncodedResponse The response body that is base64 encoded. The actual server
-     *                              response will the decoded binary form.
-     * @param responseHeaders Any additional headers that should be returned along with the
-     *                        response (null is acceptable).
-     * @return The full URL including the path that should be requested to get the expected
-     *         response.
-     */
-    public String setResponseBase64(
-            String requestPath, String base64EncodedResponse,
-            List<Pair<String, String>> responseHeaders) {
-        return setResponseInternal(requestPath,
-                                   Base64.decode(base64EncodedResponse, Base64.DEFAULT),
-                                   responseHeaders,
-                                   RESPONSE_STATUS_NORMAL);
-    }
-
-    /**
-     * Get the number of requests was made at this path since it was last set.
-     */
-    public int getRequestCount(String requestPath) {
-        Integer count = mResponseCountMap.get(requestPath);
-        if (count == null) throw new IllegalArgumentException("Path not set: " + requestPath);
-        return count.intValue();
-    }
-
-    /**
-     * Returns the last HttpRequest at this path. Can return null if it is never requested.
-     */
-    public HttpRequest getLastRequest(String requestPath) {
-        if (!mLastRequestMap.containsKey(requestPath))
-            throw new IllegalArgumentException("Path not set: " + requestPath);
-        return mLastRequestMap.get(requestPath);
-    }
-
-    public String getBaseUrl() {
-        return mServerUri + "/";
-    }
-
-    private URLConnection openConnection(URL url)
-            throws IOException, NoSuchAlgorithmException, KeyManagementException {
-        if (mSsl) {
-            // Install hostname verifiers and trust managers that don't do
-            // anything in order to get around the client not trusting
-            // the test server due to a lack of certificates.
-
-            HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
-            connection.setHostnameVerifier(new TestHostnameVerifier());
-
-            SSLContext context = SSLContext.getInstance("TLS");
-            TestTrustManager trustManager = new TestTrustManager();
-            context.init(null, new TestTrustManager[] {trustManager}, null);
-            connection.setSSLSocketFactory(context.getSocketFactory());
-
-            return connection;
-        } else {
-            return url.openConnection();
-        }
-    }
-
-    /**
-     * {@link X509TrustManager} that trusts everybody. This is used so that
-     * the client calling {@link TestWebServer#shutdown()} can issue a request
-     * for shutdown by blindly trusting the {@link TestWebServer}'s
-     * credentials.
-     */
-    private static class TestTrustManager implements X509TrustManager {
-        @Override
-        public void checkClientTrusted(X509Certificate[] chain, String authType) {
-            // Trust the TestWebServer...
-        }
-
-        @Override
-        public void checkServerTrusted(X509Certificate[] chain, String authType) {
-            // Trust the TestWebServer...
-        }
-
-        @Override
-        public X509Certificate[] getAcceptedIssuers() {
-            return null;
-        }
-    }
-
-    /**
-     * {@link HostnameVerifier} that verifies everybody. This permits
-     * the client to trust the web server and call
-     * {@link TestWebServer#shutdown()}.
-     */
-    private static class TestHostnameVerifier implements HostnameVerifier {
-        @Override
-        public boolean verify(String hostname, SSLSession session) {
-            return true;
-        }
-    }
-
-    private void servedResponseFor(String path, HttpRequest request) {
-        mResponseCountMap.put(path, Integer.valueOf(
-                mResponseCountMap.get(path).intValue() + 1));
-        mLastRequestMap.put(path, request);
-    }
-
-    /**
-     * Generate a response to the given request.
-     * @throws InterruptedException
-     */
-    private HttpResponse getResponse(HttpRequest request) throws InterruptedException {
-        RequestLine requestLine = request.getRequestLine();
-        HttpResponse httpResponse = null;
-        Log.i(TAG, requestLine.getMethod() + ": " + requestLine.getUri());
-        String uriString = requestLine.getUri();
-        URI uri = URI.create(uriString);
-        String path = uri.getPath();
-
-        Response response = mResponseMap.get(path);
-        if (path.equals(SHUTDOWN_PREFIX)) {
-            httpResponse = createResponse(HttpStatus.SC_OK);
-        } else if (response == null) {
-            httpResponse = createResponse(HttpStatus.SC_NOT_FOUND);
-        } else if (response.mIsRedirect) {
-            httpResponse = createResponse(HttpStatus.SC_MOVED_TEMPORARILY);
-            for (Pair<String, String> header : response.mResponseHeaders) {
-                httpResponse.addHeader(header.first, header.second);
-            }
-            servedResponseFor(path, request);
-        } else {
-            httpResponse = createResponse(HttpStatus.SC_OK);
-            httpResponse.setEntity(createEntity(response.mResponseData));
-            for (Pair<String, String> header : response.mResponseHeaders) {
-                httpResponse.addHeader(header.first, header.second);
-            }
-            servedResponseFor(path, request);
-        }
-        StatusLine sl = httpResponse.getStatusLine();
-        Log.i(TAG, sl.getStatusCode() + "(" + sl.getReasonPhrase() + ")");
-        setDateHeaders(httpResponse);
-        return httpResponse;
-    }
-
-    private void setDateHeaders(HttpResponse response) {
-        long time = System.currentTimeMillis();
-        response.addHeader("Date", DateUtils.formatDate(new Date(), DateUtils.PATTERN_RFC1123));
-    }
-
-    /**
-     * Create an empty response with the given status.
-     */
-    private HttpResponse createResponse(int status) {
-        HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_0, status, null);
-
-        if (sReasons == null) {
-            sReasons = new Hashtable<Integer, String>();
-            sReasons.put(HttpStatus.SC_UNAUTHORIZED, "Unauthorized");
-            sReasons.put(HttpStatus.SC_NOT_FOUND, "Not Found");
-            sReasons.put(HttpStatus.SC_FORBIDDEN, "Forbidden");
-            sReasons.put(HttpStatus.SC_MOVED_TEMPORARILY, "Moved Temporarily");
-        }
-        // Fill in error reason. Avoid use of the ReasonPhraseCatalog, which is Locale-dependent.
-        String reason = sReasons.get(status);
-
-        if (reason != null) {
-            StringBuffer buf = new StringBuffer("<html><head><title>");
-            buf.append(reason);
-            buf.append("</title></head><body>");
-            buf.append(reason);
-            buf.append("</body></html>");
-            response.setEntity(createEntity(buf.toString().getBytes()));
-        }
-        return response;
-    }
-
-    /**
-     * Create a string entity for the given content.
-     */
-    private ByteArrayEntity createEntity(byte[] data) {
-        ByteArrayEntity entity = new ByteArrayEntity(data);
-        entity.setContentType("text/html");
-        return entity;
-    }
-
-    private static class ServerThread extends Thread {
-        private TestWebServer mServer;
-        private ServerSocket mSocket;
-        private boolean mIsSsl;
-        private boolean mIsCancelled;
-        private SSLContext mSslContext;
-
-        /**
-         * Defines the keystore contents for the server, BKS version. Holds just a
-         * single self-generated key. The subject name is "Test Server".
-         */
-        private static final String SERVER_KEYS_BKS =
-            "AAAAAQAAABQDkebzoP1XwqyWKRCJEpn/t8dqIQAABDkEAAVteWtleQAAARpYl20nAAAAAQAFWC41" +
-            "MDkAAAJNMIICSTCCAbKgAwIBAgIESEfU1jANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzET" +
-            "MBEGA1UECBMKQ2FsaWZvcm5pYTEMMAoGA1UEBxMDTVRWMQ8wDQYDVQQKEwZHb29nbGUxEDAOBgNV" +
-            "BAsTB0FuZHJvaWQxFDASBgNVBAMTC1Rlc3QgU2VydmVyMB4XDTA4MDYwNTExNTgxNFoXDTA4MDkw" +
-            "MzExNTgxNFowaTELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExDDAKBgNVBAcTA01U" +
-            "VjEPMA0GA1UEChMGR29vZ2xlMRAwDgYDVQQLEwdBbmRyb2lkMRQwEgYDVQQDEwtUZXN0IFNlcnZl" +
-            "cjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0LIdKaIr9/vsTq8BZlA3R+NFWRaH4lGsTAQy" +
-            "DPMF9ZqEDOaL6DJuu0colSBBBQ85hQTPa9m9nyJoN3pEi1hgamqOvQIWcXBk+SOpUGRZZFXwniJV" +
-            "zDKU5nE9MYgn2B9AoiH3CSuMz6HRqgVaqtppIe1jhukMc/kHVJvlKRNy9XMCAwEAATANBgkqhkiG" +
-            "9w0BAQUFAAOBgQC7yBmJ9O/eWDGtSH9BH0R3dh2NdST3W9hNZ8hIa8U8klhNHbUCSSktZmZkvbPU" +
-            "hse5LI3dh6RyNDuqDrbYwcqzKbFJaq/jX9kCoeb3vgbQElMRX8D2ID1vRjxwlALFISrtaN4VpWzV" +
-            "yeoHPW4xldeZmoVtjn8zXNzQhLuBqX2MmAAAAqwAAAAUvkUScfw9yCSmALruURNmtBai7kQAAAZx" +
-            "4Jmijxs/l8EBaleaUru6EOPioWkUAEVWCxjM/TxbGHOi2VMsQWqRr/DZ3wsDmtQgw3QTrUK666sR" +
-            "MBnbqdnyCyvM1J2V1xxLXPUeRBmR2CXorYGF9Dye7NkgVdfA+9g9L/0Au6Ugn+2Cj5leoIgkgApN" +
-            "vuEcZegFlNOUPVEs3SlBgUF1BY6OBM0UBHTPwGGxFBBcetcuMRbUnu65vyDG0pslT59qpaR0TMVs" +
-            "P+tcheEzhyjbfM32/vwhnL9dBEgM8qMt0sqF6itNOQU/F4WGkK2Cm2v4CYEyKYw325fEhzTXosck" +
-            "MhbqmcyLab8EPceWF3dweoUT76+jEZx8lV2dapR+CmczQI43tV9btsd1xiBbBHAKvymm9Ep9bPzM" +
-            "J0MQi+OtURL9Lxke/70/MRueqbPeUlOaGvANTmXQD2OnW7PISwJ9lpeLfTG0LcqkoqkbtLKQLYHI" +
-            "rQfV5j0j+wmvmpMxzjN3uvNajLa4zQ8l0Eok9SFaRr2RL0gN8Q2JegfOL4pUiHPsh64WWya2NB7f" +
-            "V+1s65eA5ospXYsShRjo046QhGTmymwXXzdzuxu8IlnTEont6P4+J+GsWk6cldGbl20hctuUKzyx" +
-            "OptjEPOKejV60iDCYGmHbCWAzQ8h5MILV82IclzNViZmzAapeeCnexhpXhWTs+xDEYSKEiG/camt" +
-            "bhmZc3BcyVJrW23PktSfpBQ6D8ZxoMfF0L7V2GQMaUg+3r7ucrx82kpqotjv0xHghNIm95aBr1Qw" +
-            "1gaEjsC/0wGmmBDg1dTDH+F1p9TInzr3EFuYD0YiQ7YlAHq3cPuyGoLXJ5dXYuSBfhDXJSeddUkl" +
-            "k1ufZyOOcskeInQge7jzaRfmKg3U94r+spMEvb0AzDQVOKvjjo1ivxMSgFRZaDb/4qw=";
-
-        private String PASSWORD = "android";
-
-        /**
-         * Loads a keystore from a base64-encoded String. Returns the KeyManager[]
-         * for the result.
-         */
-        private KeyManager[] getKeyManagers() throws Exception {
-            byte[] bytes = Base64.decode(SERVER_KEYS_BKS, Base64.DEFAULT);
-            InputStream inputStream = new ByteArrayInputStream(bytes);
-
-            KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-            keyStore.load(inputStream, PASSWORD.toCharArray());
-            inputStream.close();
-
-            String algorithm = KeyManagerFactory.getDefaultAlgorithm();
-            KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(algorithm);
-            keyManagerFactory.init(keyStore, PASSWORD.toCharArray());
-
-            return keyManagerFactory.getKeyManagers();
-        }
-
-
-        public ServerThread(TestWebServer server, boolean ssl) throws Exception {
-            super("ServerThread");
-            mServer = server;
-            mIsSsl = ssl;
-            int retry = 3;
-            while (true) {
-                try {
-                    if (mIsSsl) {
-                        mSslContext = SSLContext.getInstance("TLS");
-                        mSslContext.init(getKeyManagers(), null, null);
-                        mSocket = mSslContext.getServerSocketFactory().createServerSocket(
-                                SSL_SERVER_PORT);
-                    } else {
-                        mSocket = new ServerSocket(SERVER_PORT);
-                    }
-                    return;
-                } catch (IOException e) {
-                    Log.w(TAG, e);
-                    if (--retry == 0) {
-                        throw e;
-                    }
-                    // sleep in case server socket is still being closed
-                    Thread.sleep(1000);
-                }
-            }
-        }
-
-        @Override
-        public void run() {
-            HttpParams params = new BasicHttpParams();
-            params.setParameter(CoreProtocolPNames.PROTOCOL_VERSION, HttpVersion.HTTP_1_0);
-            while (!mIsCancelled) {
-                try {
-                    Socket socket = mSocket.accept();
-                    DefaultHttpServerConnection conn = new DefaultHttpServerConnection();
-                    conn.bind(socket, params);
-
-                    // Determine whether we need to shutdown early before
-                    // parsing the response since conn.close() will crash
-                    // for SSL requests due to UnsupportedOperationException.
-                    HttpRequest request = conn.receiveRequestHeader();
-                    if (isShutdownRequest(request)) {
-                        mIsCancelled = true;
-                    }
-
-                    HttpResponse response = mServer.getResponse(request);
-                    conn.sendResponseHeader(response);
-                    conn.sendResponseEntity(response);
-                    conn.close();
-
-                } catch (IOException e) {
-                    // normal during shutdown, ignore
-                    Log.w(TAG, e);
-                } catch (HttpException e) {
-                    Log.w(TAG, e);
-                } catch (InterruptedException e) {
-                    Log.w(TAG, e);
-                } catch (UnsupportedOperationException e) {
-                    // DefaultHttpServerConnection's close() throws an
-                    // UnsupportedOperationException.
-                    Log.w(TAG, e);
-                }
-            }
-            try {
-                mSocket.close();
-            } catch (IOException ignored) {
-                // safe to ignore
-            }
-        }
-
-        private boolean isShutdownRequest(HttpRequest request) {
-            RequestLine requestLine = request.getRequestLine();
-            String uriString = requestLine.getUri();
-            URI uri = URI.create(uriString);
-            String path = uri.getPath();
-            return path.equals(SHUTDOWN_PREFIX);
-        }
-    }
-}