net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java - Issue 2043803003: 👔 Reland #2: Move side-loaded test data /sdcard -> /sdcard/gtestdata

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: net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java

Issue 2043803003: 👔 Reland #2: Move side-loaded test data /sdcard -> /sdcard/gtestdata (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase atop https://codereview.chromium.org/2041723006 Created 4 years, 6 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

« base/test/test_support_android.cc ('K') | « net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java ('k') | net/test/android/javatests/src/org/chromium/net/test/util/CertTestUtil.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java

diff --git a/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java b/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java

index b2e180bf378979fafb1b3502cd3205f1a15b9e96..45fca4b635ef7f71c89f44f1570e8757b96ba6e5 100644

--- a/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java

+++ b/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java

@@ -15,6 +15,7 @@ import org.chromium.base.annotations.JNINamespace;

import org.chromium.base.library_loader.LibraryLoader;

import org.chromium.base.library_loader.LibraryProcessType;

import org.chromium.base.library_loader.ProcessInitException;

+import org.chromium.base.test.util.UrlUtils;

import java.util.concurrent.Callable;

import java.util.concurrent.ExecutionException;

@@ -76,7 +77,7 @@ public class EmbeddedTestServerImpl extends IEmbeddedTestServerImpl.Stub {

runOnHandlerThread(new Callable<Void>() {

@Override

public Void call() {

- if (mNativeEmbeddedTestServer == 0) nativeInit();

+ if (mNativeEmbeddedTestServer == 0) nativeInit(UrlUtils.getIsolatedTestRoot());

assert mNativeEmbeddedTestServer != 0;

return null;

}

@@ -205,7 +206,7 @@ public class EmbeddedTestServerImpl extends IEmbeddedTestServerImpl.Stub {

mNativeEmbeddedTestServer = 0;

}

- private native void nativeInit();

+ private native void nativeInit(String testDataDir);

private native void nativeDestroy(long nativeEmbeddedTestServerAndroid);

private native boolean nativeStart(long nativeEmbeddedTestServerAndroid);

private native boolean nativeShutdownAndWaitUntilComplete(long nativeEmbeddedTestServerAndroid);