| Index: components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java
|
| diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java
|
| index 000d7cd8093d982391e77775b816e3cd9eb0427c..c1f3aaae69f0480544fdda9ac02a2a021711c4b1 100644
|
| --- a/components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java
|
| +++ b/components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java
|
| @@ -31,6 +31,7 @@ public class QuicTest extends CronetTestBase {
|
| System.loadLibrary("cronet_tests");
|
| QuicTestServer.startQuicTestServer(getInstrumentation().getTargetContext());
|
| CronetEngine.Builder builder = new CronetEngine.Builder(mActivity);
|
| + builder.setMockCertsForTesting("quic_test.example.com.crt");
|
| builder.enableQUIC(true);
|
| builder.addQuicHint(QuicTestServer.getServerHost(), QuicTestServer.getServerPort(),
|
| QuicTestServer.getServerPort());
|
| @@ -50,6 +51,10 @@ public class QuicTest extends CronetTestBase {
|
| @SmallTest
|
| @Feature({"Cronet"})
|
| public void testQuicLoadUrl_LegacyAPI() throws Exception {
|
| + long urlRequestContextAdapter = ((ChromiumUrlRequestFactory) mActivity.mRequestFactory)
|
| + .getRequestContext()
|
| + .getUrlRequestContextAdapter();
|
| + NativeTestServer.registerHostResolverProc(urlRequestContextAdapter, true);
|
| String quicURL = QuicTestServer.getServerURL() + "/simple.txt";
|
|
|
| HashMap<String, String> headers = new HashMap<String, String>();
|
| @@ -73,6 +78,10 @@ public class QuicTest extends CronetTestBase {
|
| @LargeTest
|
| @Feature({"Cronet"})
|
| public void testQuicLoadUrl() throws Exception {
|
| + long urlRequestContextAdapter =
|
| + ((CronetUrlRequestContext) mActivity.mCronetEngine).getUrlRequestContextAdapter();
|
| + NativeTestServer.registerHostResolverProc(urlRequestContextAdapter, false);
|
| +
|
| String quicURL = QuicTestServer.getServerURL() + "/simple.txt";
|
| TestUrlRequestListener listener = new TestUrlRequestListener();
|
|
|
| @@ -116,8 +125,12 @@ public class QuicTest extends CronetTestBase {
|
| new CronetEngine.Builder(getInstrumentation().getTargetContext());
|
| builder.setStoragePath(mActivity.getTestStorage());
|
| builder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK, 1000 * 1024);
|
| + builder.setMockCertsForTesting("quic_test.example.com.crt");
|
| builder.enableQUIC(true);
|
| CronetEngine newEngine = new CronetUrlRequestContext(builder);
|
| + long newUrlRequestContextAdapter =
|
| + ((CronetUrlRequestContext) newEngine).getUrlRequestContextAdapter();
|
| + NativeTestServer.registerHostResolverProc(newUrlRequestContextAdapter, false);
|
| TestUrlRequestListener listener2 = new TestUrlRequestListener();
|
| requestBuilder =
|
| new UrlRequest.Builder(quicURL, listener2, listener2.getExecutor(), newEngine);
|
|
|