👔 Reland of Move side-loaded test data /sdcard -> /sdcard/gtestdata

net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.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.Context;
 import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
 
 import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.library_loader.ProcessInitException;
+import org.chromium.base.test.util.UrlUtils;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Java bindings for running a net::test_server::EmbeddedTestServer.
  *
  * This should not be used directly. Use {@link EmbeddedTestServer} instead.
@@ skipping 41 matching lines @@
             return false;
         }
 
         mHandlerThread = new HandlerThread("EmbeddedTestServer" + sCount.getAndIncrement());
         mHandlerThread.start();
         mHandler = new Handler(mHandlerThread.getLooper());
 
         runOnHandlerThread(new Callable<Void>() {
             @Override
             public Void call() {
-                if (mNativeEmbeddedTestServer == 0) nativeInit();
+                if (mNativeEmbeddedTestServer == 0) nativeInit(UrlUtils.getIsolatedTestRoot());
                 assert mNativeEmbeddedTestServer != 0;
                 return null;
             }
         });
         return true;
     }
 
     /** Starts the server.
      *
      *  Note that this should be called after handlers are set up, including any relevant calls
@@ skipping 108 matching lines @@
         assert mNativeEmbeddedTestServer == 0;
         mNativeEmbeddedTestServer = nativePtr;
     }
 
     @CalledByNative
     private void clearNativePtr() {
         assert mNativeEmbeddedTestServer != 0;
         mNativeEmbeddedTestServer = 0;
     }
 
-    private native void nativeInit();
+    private native void nativeInit(String testDataDir);
     private native void nativeDestroy(long nativeEmbeddedTestServerAndroid);
     private native boolean nativeStart(long nativeEmbeddedTestServerAndroid);
     private native boolean nativeShutdownAndWaitUntilComplete(long nativeEmbeddedTestServerAndroid);
     private native String nativeGetURL(long nativeEmbeddedTestServerAndroid, String relativeUrl);
     private native void nativeAddDefaultHandlers(
             long nativeEmbeddedTestServerAndroid, String directoryPath);
     private native void nativeServeFilesFromDirectory(
             long nativeEmbeddedTestServerAndroid, String directoryPath);
 }