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

android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java

 // Copyright 2015 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.webview_shell.test;
 
-import android.os.Environment;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import junit.framework.ComparisonFailure;
 
 import org.chromium.base.Log;
 import org.chromium.base.test.util.DisabledTest;
+import org.chromium.base.test.util.UrlUtils;
 import org.chromium.webview_shell.WebViewLayoutTestActivity;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 /**
  * Tests running end-to-end layout tests.
  */
 public class WebViewLayoutTest
         extends ActivityInstrumentationTestCase2<WebViewLayoutTestActivity> {
 
     private static final String TAG = "WebViewLayoutTest";
 
-    private static final String EXTERNAL_PREFIX =
-            Environment.getExternalStorageDirectory().getAbsolutePath() + "/";
+    private static final String EXTERNAL_PREFIX = UrlUtils.getIsolatedTestRoot() + "/";
     private static final String BASE_WEBVIEW_TEST_PATH =
             "android_webview/tools/system_webview_shell/test/data/";
     private static final String BASE_BLINK_TEST_PATH = "third_party/WebKit/LayoutTests/";
     private static final String BASE_BLINK_STABLE_TEST_PATH =
             BASE_BLINK_TEST_PATH + "virtual/stable/";
     private static final String PATH_WEBVIEW_PREFIX = EXTERNAL_PREFIX + BASE_WEBVIEW_TEST_PATH;
     private static final String PATH_BLINK_PREFIX = EXTERNAL_PREFIX + BASE_BLINK_TEST_PATH;
     private static final String PATH_BLINK_STABLE_PREFIX =
             EXTERNAL_PREFIX + BASE_BLINK_STABLE_TEST_PATH;
 
@@ skipping 342 matching lines @@
     private boolean isInterfaceOrGlobalObject(String s) {
         return s.startsWith("interface") || s.startsWith("[GLOBAL OBJECT]");
     }
 
     private boolean isInterfaceProperty(String s) {
         return s.startsWith("getter") || s.startsWith("setter")
                 || s.startsWith("method") || s.startsWith("attribute");
     }
 
 }