content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java - Issue 12091033: Relanding "Add apk for running content_browsertests"

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/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java

Issue 12091033: Relanding "Add apk for running content_browsertests" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 11 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/ContentViewTestBase.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java

diff --git a/content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java b/content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java

index 177fa6e4c5c813ac6938c64cf9e864b720b9230e..7ad916242d974a054254a28ebf0b4b64a32ef49e 100644

--- a/content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java

+++ b/content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java

@@ -12,8 +12,8 @@ import org.chromium.content.browser.test.util.Criteria;

import org.chromium.content.browser.test.util.CriteriaHelper;

import org.chromium.content.browser.test.util.TouchCommon;

import org.chromium.content.browser.test.util.UiUtils;

-import org.chromium.content_shell.ContentShellActivity;

import org.chromium.content_shell.ContentShellTestBase;

+import org.chromium.content_shell_apk.ContentShellActivity;

import java.util.concurrent.Callable;

import java.util.concurrent.ExecutionException;