content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java - Issue 143803017: FindBugs: Rename org.chromium.base.test.util.ScalableTimeout.ScaleTimeout to scaleTimeout.

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 143803017: FindBugs: Rename org.chromium.base.test.util.ScalableTimeout.ScaleTimeout to scaleTimeout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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/test/android/javatests/src/org/chromium/content/browser/test/util/UiUtils.java ('k') | sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.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_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 0124c79a2cba3f34858d958f550da6a43ebfa7c9..0d3196cc96c1280ec5caa48bd125a62b2b7ac1b9 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

@@ -10,7 +10,7 @@ import android.net.Uri;

import android.test.ActivityInstrumentationTestCase2;

import android.text.TextUtils;

-import static org.chromium.base.test.util.ScalableTimeout.ScaleTimeout;

+import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;

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

import org.chromium.content.browser.ContentView;

@@ -31,9 +31,9 @@ import java.util.concurrent.atomic.AtomicBoolean;

public class ContentShellTestBase extends ActivityInstrumentationTestCase2<ContentShellActivity> {

/** The maximum time the waitForActiveShellToBeDoneLoading method will wait. */

- private static final long WAIT_FOR_ACTIVE_SHELL_LOADING_TIMEOUT = ScaleTimeout(10000);

+ private static final long WAIT_FOR_ACTIVE_SHELL_LOADING_TIMEOUT = scaleTimeout(10000);

- protected static final long WAIT_PAGE_LOADING_TIMEOUT_SECONDS = ScaleTimeout(15);

+ protected static final long WAIT_PAGE_LOADING_TIMEOUT_SECONDS = scaleTimeout(15);

public ContentShellTestBase() {

super(ContentShellActivity.class);