android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java - Issue 10979009: Move content test utils to content/public/test

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: android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java

Issue 10979009: Move content test utils to content/public/test (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased on new branch Created 8 years, 3 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 | « android_webview/android_webview.gyp ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java

index 62deff9be72e90a1ade27776dec5800f342ad4a5..176db98845be1699501951293c6dcd84ddd384e0 100644

--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java

+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java

@@ -7,31 +7,25 @@ package org.chromium.android_webview.test;

import android.app.Instrumentation;

import android.content.Context;

import android.test.ActivityInstrumentationTestCase2;

-import android.view.View;

import junit.framework.Assert;

-import org.chromium.android_webview.AndroidWebViewUtil;

import org.chromium.android_webview.AwContents;

import org.chromium.android_webview.AwContentsClient;

import org.chromium.content.browser.ContentSettings;

import org.chromium.content.browser.ContentView;

-import org.chromium.content.browser.ContentViewClient;

import org.chromium.content.browser.ContentViewCore;

import org.chromium.content.browser.LoadUrlParams;

-import org.chromium.content.browser.util.CallbackHelper;

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

+import org.chromium.content.browser.test.util.CallbackHelper;

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

import org.chromium.ui.gfx.ActivityNativeWindow;

-import java.util.HashMap;

-import java.util.Map;

import java.util.concurrent.atomic.AtomicInteger;

import java.util.concurrent.atomic.AtomicReference;

import java.util.concurrent.Callable;

import java.util.concurrent.ExecutionException;

import java.util.concurrent.FutureTask;

import java.util.concurrent.TimeUnit;

-import java.util.concurrent.TimeoutException;

/**

* A base class for android_webview tests.