👔 Reland of 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..7433d8e0481076edab908f2e3ed3af4f9f3d9508 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() + "/chromium_tests_root";
     }
 
     /**