👔 Reland #2: Move side-loaded test data /sdcard -> /sdcard/gtestdata

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

 // Copyright 2015 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.net.test;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.os.Environment;
 import android.os.IBinder;
 import android.os.RemoteException;
 
 import org.chromium.base.Log;
 
 import java.io.File;
 
 /** A simple file server for java tests.
  *
  * An example use:
@@ skipping 166 matching lines @@
             throw new EmbeddedTestServerFailure("Failed to start server.", e);
         }
     }
 
     /** Create and initialize a server that serves files from the provided directory.
      *
      *  This handles native object initialization, server configuration, and server initialization.
      *  On returning, the server is ready for use.
      *
      *  @param context The context in which the server will run.
-     *  @param directory The directory from which files should be served.
+     *  @param directory The directory from which files should be served. This must be
+     *      Environment.getExternalStorageDirectory().
      *  @return The created server.
      */
     public static EmbeddedTestServer createAndStartFileServer(Context context, File directory)
             throws InterruptedException {
-        EmbeddedTestServer server = new EmbeddedTestServer();
-        server.initializeNative(context);
-        server.serveFilesFromDirectory(directory);
-        if (!server.start()) {
-            throw new EmbeddedTestServerFailure(
-                    "Failed to start serving files from " + directory.getPath());
+        // TODO(jbudorick): Update all callers to use createAndStartDefaultServer() directly.
+        if (!directory.equals(Environment.getExternalStorageDirectory())) {
+            throw new IllegalArgumentException("Expected directory to be ExternalStorageDirectory");
         }
-        return server;
+        return createAndStartDefaultServer(context);
     }
 
     /** Create and initialize a server with the default handlers.
      *
      *  This handles native object initialization, server configuration, and server initialization.
      *  On returning, the server is ready for use.
      *
      *  @param context The context in which the server will run.
      *  @return The created server.
      */
@@ skipping 57 matching lines @@
      *
      *  This handles stopping the server and destroying the native object.
      */
     public void stopAndDestroyServer() {
         if (!shutdownAndWaitUntilComplete()) {
             throw new EmbeddedTestServerFailure("Failed to stop server.");
         }
         destroy();
     }
 }