content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java - Issue 2043803003: 👔 Reland #2: Move side-loaded test data /sdcard -> /sdcard/gtestdata

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

Issue 2043803003: 👔 Reland #2: Move side-loaded test data /sdcard -> /sdcard/gtestdata (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase atop https://codereview.chromium.org/2041723006 Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« base/test/test_support_android.cc ('K') | « components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsActivity.java ('k') | content/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

diff --git a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

index 049110b36816e0ea917e1b6a551a3a53c8cb49a5..1f78f82ef6fc499d3855c87217221e4649a80f83 100644

--- a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

+++ b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

@@ -6,7 +6,7 @@ package org.chromium.content_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;

@@ -26,7 +26,9 @@ public class ContentBrowserTestsActivity extends ContentShellBrowserTestActivity

@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(),

ContentBrowserTestsApplication.PRIVATE_DATA_DIRECTORY_SUFFIX);

}