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

base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java

Index: base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java
diff --git a/base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java b/base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java
index 797585f4593ab1ace985dd2e840f502fafd39f55..81e1f275b9dc558113e57ac9a7e4d16a3486027b 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java
@@ -20,7 +20,7 @@ public class UrlUtils {
      */
     public static String getTestFilePath(String path) {
         // TODO(jbudorick): Remove DATA_DIR once everything has been isolated. crbug/400499
-        return PathUtils.getExternalStorageDirectory() + DATA_DIR + path;
+        return getIsolatedTestFilePath(DATA_DIR + path);
     }
 
     // TODO(jbudorick): Remove this function once everything has been isolated and switched back
@@ -30,7 +30,14 @@ public class UrlUtils {
      * @param path Pathname relative to external/
      */
     public static String getIsolatedTestFilePath(String path) {
-        return PathUtils.getExternalStorageDirectory() + "/" + path;
+        return getIsolatedTestRoot() + "/" + path;
+    }
+
+    /**
+     * Returns the root of the test data directory.
+     */
+    public static String getIsolatedTestRoot() {
+        return PathUtils.getExternalStorageDirectory() + "/gtestdata";

[jbudorick, 2016/04/27 19:59:01]

If we keep the "gtestdata" part, I'd prefer this use the PathService if
possible.

[agrieve, 2016/04/27 20:26:31]

PathService has methods for overriding paths, but I don't see a java-side
querying method. Might not be worth having one since then you'd also need to
generate enums from the .h files.

[jbudorick, 2016/04/27 20:41:36]

I strongly dislike hardcoding this in multiple places; I guess that's what I'd
like to avoid if at all possible.

[agrieve, 2016/04/29 15:56:35]

Moved it to be passed in when calling nativeRunTests()

     }
 
     /**