chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableIncognitoModeIntegrationTest.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/partnercustomizations/PartnerDisableIncognitoModeIntegrationTest.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/omnibox/OmniboxTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerHomepageIntegrationTest.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/partnercustomizations/PartnerDisableIncognitoModeIntegrationTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableIncognitoModeIntegrationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableIncognitoModeIntegrationTest.java

index 274cfd79fb351d4c6909a05fd0e86d0584e2c4b3..06654ddb21931bd9275605dbf14ec09a0eb48057 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableIncognitoModeIntegrationTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableIncognitoModeIntegrationTest.java

@@ -7,7 +7,6 @@ package org.chromium.chrome.browser.partnercustomizations;

import android.content.Context;

import android.net.Uri;

import android.os.Bundle;

-import android.os.Environment;

import android.test.suitebuilder.annotation.MediumTest;

import android.view.Menu;

import android.view.MenuItem;

@@ -141,8 +140,8 @@ public class PartnerDisableIncognitoModeIntegrationTest extends

@MediumTest

@Feature({"DisableIncognitoMode"})

public void testEnabledParentalControlsClosesIncognitoTabs() throws InterruptedException {

- EmbeddedTestServer testServer = EmbeddedTestServer.createAndStartFileServer(

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

+ EmbeddedTestServer testServer = EmbeddedTestServer.createAndStartServer(

+ getInstrumentation().getContext());

try {

String[] testUrls = {