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

components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsActivity.java

Index: components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsActivity.java
diff --git a/components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsActivity.java b/components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsActivity.java
index 77264b3de60594e30ea2caaae8ea94bcfe9450d9..f71d0cd47b897c036780f0efae07f6256d2de769 100644
--- a/components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsActivity.java
+++ b/components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsActivity.java
@@ -6,7 +6,7 @@ package org.chromium.components_browsertests_apk;
 
 import android.os.Bundle;
 
-import org.chromium.base.PathUtils;
+import org.chromium.base.test.util.UrlUtils;
 import org.chromium.content_shell.browsertests.ContentShellBrowserTestActivity;
 
 import java.io.File;
@@ -24,7 +24,9 @@ public class ComponentsBrowserTestsActivity extends ContentShellBrowserTestActiv
 
     @Override
     protected File getPrivateDataDirectory() {
-        return new File(PathUtils.getExternalStorageDirectory(),
+        // TODO(agrieve): We should not be touching the side-loaded test data directory.
+        //     https://crbug.com/617734
+        return new File(UrlUtils.getIsolatedTestRoot(),
                 ComponentsBrowserTestsApplication.PRIVATE_DATA_DIRECTORY_SUFFIX);
     }