Merge EmbeddedTestServer#createAndStartDefaultServer() and createAndStartFileServer()

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

Index: net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java
diff --git a/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java b/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java
index 1f43533525856b4444d750a7c0046aa8b4264ab1..5e3476fbfaeb85d122e6e94e264f6727579e78e6 100644
--- a/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java
+++ b/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java
@@ -201,11 +201,11 @@ public class EmbeddedTestServer {
      */
     public static EmbeddedTestServer createAndStartFileServer(Context context, File directory)
             throws InterruptedException {
-        // TODO(jbudorick): Update all callers to use createAndStartDefaultServer() directly.
+        // TODO(jbudorick): Update all callers to use createAndStartServer() directly.
         if (!directory.equals(Environment.getExternalStorageDirectory())) {
             throw new IllegalArgumentException("Expected directory to be ExternalStorageDirectory");
         }
-        return createAndStartDefaultServer(context);
+        return createAndStartServer(context);
     }
 
     /** Create and initialize a server with the default handlers.
@@ -218,6 +218,11 @@ public class EmbeddedTestServer {
      */
     public static EmbeddedTestServer createAndStartDefaultServer(Context context)
             throws InterruptedException {
+        // TODO(pkotwicz): Update all callers to use createAndStartServer() directly.
+        return createAndStartServer(context);
+    }
+    public static EmbeddedTestServer createAndStartServer(Context context)

[jbudorick, 2016/10/19 15:32:49]

Please add a javadoc for this function and a blank line after
createAndStartDefaultServer.

+            throws InterruptedException {
         EmbeddedTestServer server = new EmbeddedTestServer();
         server.initializeNative(context);
         server.addDefaultHandlers("");