components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.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: components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.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

« no previous file with comments | « components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java ('k') | components/cronet/android/test/javatests/src/org/chromium/net/RequestFinishedInfoTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java

diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java

index 584d519cac91e7399db1957ca60e46756e2f0222..c59b35bc40389e282daffe93172c9bdab7b7d062 100644

--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java

+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java

@@ -58,7 +58,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {

@Override

protected void setUp() throws Exception {

super.setUp();

- mTestServer = EmbeddedTestServer.createAndStartDefaultServer(getContext());

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

mUrl = mTestServer.getURL("/echo?status=200");

mUrl404 = mTestServer.getURL("/echo?status=404");

mUrl500 = mTestServer.getURL("/echo?status=500");