android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java - Issue 12545043: Fix several findbugs issues

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 12545043: Fix several findbugs issues (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 9 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 | « no previous file | android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java » ('j') | content/public/android/javatests/src/org/chromium/content/browser/LongPressDetectorTest.java » ('J')
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 3c11ae6d2c68b56e266cd81d9452c3cb82973e27..03f8d2098eb05a60f52ed08532059d3f4cd9ac8a 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

@@ -8,8 +8,6 @@ import android.app.Instrumentation;

import android.content.Context;

import android.test.ActivityInstrumentationTestCase2;

-import junit.framework.Assert;

import org.chromium.android_webview.AwBrowserContext;

import org.chromium.android_webview.AwBrowserProcess;

import org.chromium.android_webview.AwContents;

@@ -18,28 +16,22 @@ import org.chromium.android_webview.AwSettings;

import org.chromium.android_webview.test.util.JSUtils;

import org.chromium.base.test.util.InMemorySharedPreferences;

import org.chromium.content.browser.ContentSettings;

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

import org.chromium.content.browser.LoadUrlParams;

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.common.ProcessInitException;

-import org.chromium.ui.gfx.ActivityNativeWindow;

-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.atomic.AtomicReference;

/**

* A base class for android_webview tests.

public class AndroidWebViewTestBase

extends ActivityInstrumentationTestCase2<AndroidWebViewTestRunnerActivity> {

- protected static int WAIT_TIMEOUT_SECONDS = 15;

+ protected final static int WAIT_TIMEOUT_SECONDS = 15;

private static final int CHECK_INTERVAL = 100;

public AndroidWebViewTestBase() {