content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java - Issue 878163004: [Android] Convert ContentShellTest.apk to isolate.

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/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java

Issue 878163004: [Android] Convert ContentShellTest.apk to isolate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix bad rebase Created 5 years, 10 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

« no previous file with comments | « content/public/android/javatests/src/org/chromium/content/browser/EmailAddressDetectionTest.java ('k') | content/test/data/android/content_detection/click_listeners.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java

diff --git a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java

index a4c8b3aba52f7349ec95c3ae0f369a0d5c07e259..92749677461350e3cd8d0a20f1b0032debcdb3ad 100644

--- a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java

+++ b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java

@@ -75,10 +75,11 @@ public class ContentShellTestBase

* @param url Test url to load.

protected void startActivityWithTestUrl(String url) throws Throwable {

- launchContentShellWithUrl(UrlUtils.getTestFileUrl(url));

+ launchContentShellWithUrl(UrlUtils.getIsolatedTestFileUrl(url));

assertNotNull(getActivity());

assertTrue(waitForActiveShellToBeDoneLoading());

- assertEquals(UrlUtils.getTestFileUrl(url), getContentViewCore().getWebContents().getUrl());

+ assertEquals(UrlUtils.getIsolatedTestFileUrl(url),

+ getContentViewCore().getWebContents().getUrl());

}

/**