[Cronet] Use Https for Quic Test Server

components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java

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..86316b1520e64a76617f1ebcd552a3deda4a5696 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
@@ -23,6 +23,7 @@ import java.util.HashMap;
 public class QuicTest extends CronetTestBase {
     private static final String TAG = "cr.QuicTest";
     private CronetTestActivity mActivity;
+    private MockCertVerifier mCertVerifier;
 
     @Override
     protected void setUp() throws Exception {
@@ -30,6 +31,13 @@ public class QuicTest extends CronetTestBase {
         // Load library first, since we need the Quic test server's URL.
         System.loadLibrary("cronet_tests");
         QuicTestServer.startQuicTestServer(getInstrumentation().getTargetContext());
+
+        // Sets a MockCertVerifier to use in the tests.
+        String[] certs = {"quic_test.example.com.crt"};
+        mCertVerifier = new MockCertVerifier(certs);
+        CronetUrlRequestContext.setMockCertVerifierForTesting(mCertVerifier.getNativePointer());

[mef, 2015/10/12 18:35:03]

Hrm, how would it work? I imagine that this code will execute in the
instrumentation test process, not in the test app. Am I missing something?

[xunjieli, 2015/10/13 01:58:02]

It sets a static variable in CronetUrlRequestContext before the
mUrlRequestContext is constructed, so mUrlRequestContext will actually use the
cert verifier. But after changing to your approach, this is no longer applicable
:)

+        ChromiumUrlRequestContext.setMockCertVerifierForTesting(mCertVerifier.getNativePointer());
+
         CronetEngine.Builder builder = new CronetEngine.Builder(mActivity);
         builder.enableQUIC(true);
         builder.addQuicHint(QuicTestServer.getServerHost(), QuicTestServer.getServerPort(),
@@ -43,6 +51,7 @@ public class QuicTest extends CronetTestBase {
 
     @Override
     protected void tearDown() throws Exception {
+        mCertVerifier.destroyNativePointer();
         QuicTestServer.shutdownQuicTestServer();
         super.tearDown();
     }
@@ -50,6 +59,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 +86,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();
 
@@ -118,6 +135,9 @@ public class QuicTest extends CronetTestBase {
         builder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK, 1000 * 1024);
         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);