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

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

 // Copyright 2012 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.base.test.util;
 
 import junit.framework.Assert;
 
 import org.chromium.base.PathUtils;
 
 /**
  * Collection of URL utilities.
  */
 public class UrlUtils {
     private static final String DATA_DIR = "/chrome/test/data/";
 
     /**
      * Construct the full path of a test data file.
      * @param path Pathname relative to external/chrome/test/data
      */
     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
     // to getTestFilePath. crbug/400499
     /**
      * Construct the full path of a test data file.
      * @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";
+    }
+
+    /**
      * Construct a suitable URL for loading a test data file.
      * @param path Pathname relative to external/chrome/test/data
      */
     public static String getTestFileUrl(String path) {
         return "file://" + getTestFilePath(path);
     }
 
     // TODO(jbudorick): Remove this function once everything has been isolated and switched back
     // to getTestFileUrl. crbug/400499
     /**
@@ skipping 17 matching lines @@
             String encoded =
                     "data:text/html;utf-8," + java.net.URLEncoder.encode(html, "UTF-8");
             encoded = encoded.replace("+", "%20");
             return encoded;
         } catch (java.io.UnsupportedEncodingException e) {
             Assert.fail("Unsupported encoding: " + e.getMessage());
             return null;
         }
     }
 }