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

components/cronet/android/test/src/org/chromium/net/NativeTestServer.java

 // Copyright 2014 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;
 
 import android.content.Context;
 
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.test.util.UrlUtils;
 
 /**
  * Wrapper class to start an in-process native test server, and get URLs
  * needed to talk to it.
  */
 @JNINamespace("cronet")
 public final class NativeTestServer {
     // This variable contains the response body of a request to getSuccessURL().
     public static final String SUCCESS_BODY = "this is a text file\n";
 
     public static boolean startNativeTestServer(Context context) {
         TestFilesInstaller.installIfNeeded(context);
         return nativeStartNativeTestServer(
-                TestFilesInstaller.getInstalledPath(context));
+                TestFilesInstaller.getInstalledPath(context), UrlUtils.getIsolatedTestRoot());
     }
 
     public static void shutdownNativeTestServer() {
         nativeShutdownNativeTestServer();
     }
 
     public static String getEchoBodyURL() {
         return nativeGetEchoBodyURL();
     }
 
@@ skipping 41 matching lines @@
     }
 
     public static String getHostPort() {
         return nativeGetHostPort();
     }
 
     public static boolean isDataReductionProxySupported() {
         return nativeIsDataReductionProxySupported();
     }
 
-    private static native boolean nativeStartNativeTestServer(String filePath);
+    private static native boolean nativeStartNativeTestServer(String filePath, String testDataDir);
     private static native void nativeShutdownNativeTestServer();
     private static native String nativeGetEchoBodyURL();
     private static native String nativeGetEchoHeaderURL(String header);
     private static native String nativeGetEchoAllHeadersURL();
     private static native String nativeGetEchoMethodURL();
     private static native String nativeGetRedirectToEchoBody();
     private static native String nativeGetFileURL(String filePath);
     private static native String nativeGetSdchURL();
     private static native String nativeGetHostPort();
     private static native boolean nativeIsDataReductionProxySupported();
 }