android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java - Issue 2428163002: Refactor CallbackHelper to base/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/AwSettingsTest.java

Issue 2428163002: Refactor CallbackHelper to base/test (Closed)

Patch Set: Change ui test gn Created 4 years, 2 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/javatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.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/AwSettingsTest.java

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

index c4adf3f9c3bf348dc21da53b3ed0cb6e0c4a64c5..67d7836cd666af972b8e591589fe17d4c0d21bbb 100644

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

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

@@ -4,6 +4,8 @@

package org.chromium.android_webview.test;

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

import android.content.Context;

import android.graphics.Point;

import android.net.http.SslError;

@@ -18,8 +20,6 @@ import android.webkit.ValueCallback;

import android.webkit.WebSettings;

import android.webkit.WebSettings.LayoutAlgorithm;

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

import org.apache.http.Header;

import org.apache.http.HttpRequest;

@@ -31,12 +31,12 @@ import org.chromium.android_webview.test.util.ImagePageGenerator;

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

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

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

+import org.chromium.base.test.util.CallbackHelper;

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

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

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

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

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

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

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

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

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