chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.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/customtabs/CustomTabActivityTest.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/contextualsearch/ContextualSearchManagerTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabExternalNavigationTest.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/customtabs/CustomTabActivityTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

index d505a107a7b3e875cda64dc1b4192906cd4ddf0d..0bd3f527f194a3d7e58a3c9b15b99016b7270500 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

@@ -24,7 +24,6 @@ import android.graphics.drawable.ColorDrawable;

import android.net.Uri;

import android.os.Build;

import android.os.Bundle;

-import android.os.Environment;

import android.support.customtabs.CustomTabsCallback;

import android.support.customtabs.CustomTabsClient;

import android.support.customtabs.CustomTabsIntent;

@@ -114,8 +113,7 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase {

protected void setUp() throws Exception {

super.setUp();

Context appContext = getInstrumentation().getTargetContext().getApplicationContext();

- mTestServer = EmbeddedTestServer.createAndStartFileServer(

- appContext, Environment.getExternalStorageDirectory());

+ mTestServer = EmbeddedTestServer.createAndStartServer(appContext);

mTestPage = mTestServer.getURL(TEST_PAGE);

mTestPage2 = mTestServer.getURL(TEST_PAGE_2);

PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX);