android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java - Issue 2431753003: Merge EmbeddedTestServer#createAndStartDefaultServer() and createAndStartFileServer()

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/AcceptLanguageTest.java

Issue 2431753003: Merge EmbeddedTestServer#createAndStartDefaultServer() and createAndStartFileServer() (Closed)

Patch Set: Merge branch 'master' into webapk_embedded_test_server 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

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

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

index fa869b816b71280227674cbce27097136c692392..f9f53ce0001a6c482a70abe648e898536abdd2a9 100644

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

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

@@ -31,8 +31,7 @@ public class AcceptLanguageTest extends AwTestBase {

mContentsClient = new TestAwContentsClient();

mAwContents = createAwTestContainerViewOnMainSync(mContentsClient).getAwContents();

- mTestServer = EmbeddedTestServer.createAndStartDefaultServer(

- getInstrumentation().getContext());

+ mTestServer = EmbeddedTestServer.createAndStartServer(getInstrumentation().getContext());

}

@Override

« no previous file with comments | « no previous file | chrome/android/javatests/src/org/chromium/chrome/browser/AudioTest.java » ('j') | no next file with comments »