chrome/android/javatests/src/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.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: chrome/android/javatests/src/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.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 | « chrome/android/javatests/src/org/chromium/chrome/browser/media/remote/CastTestBase.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/media/ui/MediaPermissionsTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java

index 960e5bee0f4202c1cc19584f59979c3fb9853b2f..b6237d9c49ba0455dbd17149c0aa5a86638cbf21 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java

@@ -7,11 +7,12 @@ package org.chromium.chrome.browser.media.router;

import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE;

import android.app.Dialog;

-import android.os.Environment;

import android.os.StrictMode;

import android.test.suitebuilder.annotation.LargeTest;

import android.view.View;

+import org.json.JSONObject;

import org.chromium.base.ThreadUtils;

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

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

@@ -28,8 +29,6 @@ import org.chromium.content.common.ContentSwitches;

import org.chromium.content_public.browser.WebContents;

import org.chromium.net.test.EmbeddedTestServer;

-import org.json.JSONObject;

import java.io.StringWriter;

import java.util.concurrent.TimeoutException;

@@ -85,8 +84,7 @@ public class MediaRouterIntegrationTest extends ChromeActivityTestCaseBase<Chrom

StrictMode.allowThreadDiskWrites();

}

});

- mTestServer = EmbeddedTestServer.createAndStartFileServer(

- getInstrumentation().getContext(), Environment.getExternalStorageDirectory());

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

}

@Override