Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2519)

Unified Diff: components/cronet/android/test/src/org/chromium/net/QuicTestServer.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
Index: components/cronet/android/test/src/org/chromium/net/QuicTestServer.java
diff --git a/components/cronet/android/test/src/org/chromium/net/QuicTestServer.java b/components/cronet/android/test/src/org/chromium/net/QuicTestServer.java
index 614275f04c5f98b013c69eaa96d234a0e77440c6..4b582490050502ca709c6198ec1412343d1b6fc0 100644
--- a/components/cronet/android/test/src/org/chromium/net/QuicTestServer.java
+++ b/components/cronet/android/test/src/org/chromium/net/QuicTestServer.java
@@ -10,6 +10,7 @@ import android.os.ConditionVariable;
import org.chromium.base.Log;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.test.util.UrlUtils;
/**
* Wrapper class to start a Quic test server.
@@ -33,7 +34,8 @@ public final class QuicTestServer {
throw new IllegalStateException("Quic server is already running");
}
TestFilesInstaller.installIfNeeded(context);
- nativeStartQuicTestServer(TestFilesInstaller.getInstalledPath(context));
+ nativeStartQuicTestServer(
+ TestFilesInstaller.getInstalledPath(context), UrlUtils.getIsolatedTestRoot());
sBlock.block();
sBlock.close();
sServerRunning = true;
@@ -80,7 +82,7 @@ public final class QuicTestServer {
sBlock.open();
}
- private static native void nativeStartQuicTestServer(String filePath);
+ private static native void nativeStartQuicTestServer(String filePath, String testDataDir);
private static native void nativeShutdownQuicTestServer();
private static native String nativeGetServerHost();
private static native int nativeGetServerPort();

Powered by Google App Engine
This is Rietveld 408576698