Revert of Revert "TestWebServer needs to use a free port."

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/net/test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java b/net/test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java
index 0ef13ca61631fe551f2ee35a1f10ba35db844224..6b5e831017b1e8729498d95c60589093c2f9b55d 100644
--- a/net/test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java
+++ b/net/test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java
@@ -60,10 +60,8 @@ import javax.net.ssl.X509TrustManager;
  *
  * Based heavily on the CTSWebServer in Android.
  */
-public class TestWebServer {
+public final 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";
 
@@ -108,19 +106,21 @@ public class TestWebServer {
     public TestWebServer(boolean ssl) throws Exception {
         mSsl = ssl;
         if (mSsl) {
+            mServerUri = "https:";
             if (sSecureInstance != null) {
                 sSecureInstance.shutdown();
             }
-            mServerUri = "https://localhost:" + SSL_SERVER_PORT;
         } else {
+            mServerUri = "http:";
             if (sInstance != null) {
                 sInstance.shutdown();
             }
-            mServerUri = "http://localhost:" + SERVER_PORT;
         }
+
         setInstance(this, mSsl);
         mServerThread = new ServerThread(this, mSsl);
         mServerThread.start();
+        mServerUri += "//localhost:" + mServerThread.mSocket.getLocalPort();
     }
 
     /**
@@ -548,10 +548,9 @@ public class TestWebServer {
                     if (mIsSsl) {
                         mSslContext = SSLContext.getInstance("TLS");
                         mSslContext.init(getKeyManagers(), null, null);
-                        mSocket = mSslContext.getServerSocketFactory().createServerSocket(
-                                SSL_SERVER_PORT);
+                        mSocket = mSslContext.getServerSocketFactory().createServerSocket(0);
                     } else {
-                        mSocket = new ServerSocket(SERVER_PORT);
+                        mSocket = new ServerSocket(0);
                     }
                     return;
                 } catch (IOException e) {