chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.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/contextualsearch/ContextualSearchManagerTest.java

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

Patch Set: 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/contextmenu/ContextMenuTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java » ('j') | net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java

index 275c701e5ee43a19131782654fab9060223803fd..ffcc9707fb11626eef99f465237d1061a5f2d5df 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java

@@ -14,7 +14,6 @@ import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.graphics.Point;

-import android.os.Environment;

import android.os.SystemClock;

import android.test.suitebuilder.annotation.SmallTest;

import android.text.TextUtils;

@@ -114,8 +113,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro

@Override

protected void setUp() throws Exception {

// We have to set up the test server before starting the activity.

- mTestServer = EmbeddedTestServer.createAndStartFileServer(

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

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

super.setUp();