android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java - Issue 11366108: Move Android WebView Test WebServer to net

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 11366108: Move Android WebView Test WebServer to net (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Introduce net_test_java_support target Created 8 years, 1 month 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/AwContentsTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.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 0bd7c6f5b8d6d17b8c75f8ee1023f68106f1107b..75dfb5c4097d273dbdefbd521d1de9c29e01f25b 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

@@ -15,7 +15,6 @@ import org.chromium.android_webview.AwContents;

import org.chromium.android_webview.AwSettings;

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

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

-import org.chromium.android_webview.test.util.TestWebServer;

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

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

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

@@ -26,6 +25,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.HistoryUtils;

+import org.chromium.net.test.util.TestWebServer;

import java.util.regex.Matcher;

import java.util.regex.Pattern;