content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.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/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.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/shell/android/javatests/AndroidManifest.xml ('k') | content/shell/android/javatests/src/org/chromium/content_shell/ContentShellUrlTest.java » ('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/ContentShellTestBase.java

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

index 23637df82ec4ea8a81769d91417cb25a4039bd09..f4d7a2f3ca16740eedd5042e875ba94a86a60846 100644

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

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

@@ -18,6 +18,7 @@ import org.chromium.content.browser.test.util.CallbackHelper;

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

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

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

+import org.chromium.content_shell_apk.ContentShellActivity;

import java.util.concurrent.TimeUnit;

import java.util.concurrent.atomic.AtomicBoolean;