components/cronet/android/test/src/org/chromium/net/NativeTestServer.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: components/cronet/android/test/src/org/chromium/net/NativeTestServer.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') | « components/cronet/android/test/src/org/chromium/net/MockCertVerifier.java ('k') | components/cronet/android/test/src/org/chromium/net/QuicTestServer.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/cronet/android/test/src/org/chromium/net/NativeTestServer.java

diff --git a/components/cronet/android/test/src/org/chromium/net/NativeTestServer.java b/components/cronet/android/test/src/org/chromium/net/NativeTestServer.java

index 0b09dafa3b540f78b530c717fbf2fc19b19649f3..e6f5ef04884cf5e7c919b32f7e23f7c62c477096 100644

--- a/components/cronet/android/test/src/org/chromium/net/NativeTestServer.java

+++ b/components/cronet/android/test/src/org/chromium/net/NativeTestServer.java

@@ -7,6 +7,7 @@ package org.chromium.net;

import android.content.Context;

import org.chromium.base.annotations.JNINamespace;

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

/**

* Wrapper class to start an in-process native test server, and get URLs

@@ -20,7 +21,7 @@ public final class NativeTestServer {

public static boolean startNativeTestServer(Context context) {

TestFilesInstaller.installIfNeeded(context);

return nativeStartNativeTestServer(

- TestFilesInstaller.getInstalledPath(context));

+ TestFilesInstaller.getInstalledPath(context), UrlUtils.getIsolatedTestRoot());

}

public static void shutdownNativeTestServer() {

@@ -82,7 +83,7 @@ public final class NativeTestServer {

return nativeIsDataReductionProxySupported();

}

- private static native boolean nativeStartNativeTestServer(String filePath);

+ private static native boolean nativeStartNativeTestServer(String filePath, String testDataDir);

private static native void nativeShutdownNativeTestServer();

private static native String nativeGetEchoBodyURL();

private static native String nativeGetEchoHeaderURL(String header);