Move Android WebView Test WebServer to net

net/test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java

Index: net/test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/util/TestWebServer.java b/net/test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java
similarity index 98%
rename from android_webview/javatests/src/org/chromium/android_webview/test/util/TestWebServer.java
rename to net/test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java
index a416c09171859c9f8ae22548fbea9fc4cf2357c8..5ce3726ac7259f0e96f28146dbe45fd08c0233b7 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/util/TestWebServer.java
+++ b/net/test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java
@@ -2,7 +2,7 @@
 // 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;
+package org.chromium.net.test.util;
 
 import android.util.Base64;
 import android.util.Log;
@@ -54,6 +54,10 @@ import javax.net.ssl.X509TrustManager;
 /**
  * Simple http test server for testing.
  *
+ * This server runs in a thread in the current process, so it is convenient
+ * for loopback testing without the need to setup tcp forwarding to the
+ * host computer.
+ *
  * Based heavily on the CTSWebServer in Android.
  */
 public class TestWebServer {
@@ -142,7 +146,7 @@ public class TestWebServer {
             throw new IllegalStateException(e);
         }
 
-        sInstance = null;
+        TestWebServer.sInstance = null;
     }
 
     private final static int RESPONSE_STATUS_NORMAL = 0;