[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..c6af9a9de132877fb7e1a5786338a72a3438ae8e 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
@@ -22,6 +22,7 @@ import java.util.HashMap;
  */
 public class QuicTest extends CronetTestBase {
     private static final String TAG = "cr.QuicTest";
+    private static final String[] CERTS_USED = {"quic_test.example.com.crt"};
     private CronetTestActivity mActivity;
 
     @Override
@@ -30,12 +31,18 @@ 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());
+
+        // Set up a MockCertVerifier to use in the tests.
+        MockCertVerifier certVerifier = new MockCertVerifier(CERTS_USED);

[mef, 2015/10/19 15:35:21]

If certVerifier is created in test process, then is it really usable in the test
app process?

Should it be created in test app instead?

[xunjieli, 2015/10/19 15:38:05]

It turned out that they are in the same process. The tests all passed.

+
         CronetEngine.Builder builder = new CronetEngine.Builder(mActivity);
         builder.enableQUIC(true);
         builder.addQuicHint(QuicTestServer.getServerHost(), QuicTestServer.getServerPort(),
                 QuicTestServer.getServerPort());
         builder.setExperimentalQuicConnectionOptions("PACE,IW10,FOO,DEADBEEF");
 
+        builder.setMockCertVerifierForTesting(certVerifier.getNativePointer());
+
         String[] commandLineArgs = {CronetTestActivity.CONFIG_KEY, builder.toString(),
                 CronetTestActivity.CACHE_KEY, CronetTestActivity.CACHE_DISK_NO_HTTP};
         mActivity = launchCronetTestAppWithUrlAndCommandLineArgs(null, commandLineArgs);
@@ -50,6 +57,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 +84,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();
 
@@ -117,7 +132,12 @@ public class QuicTest extends CronetTestBase {
         builder.setStoragePath(mActivity.getTestStorage());
         builder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK, 1000 * 1024);
         builder.enableQUIC(true);
+        MockCertVerifier newCertVerifier = new MockCertVerifier(CERTS_USED);
+        builder.setMockCertVerifierForTesting(newCertVerifier.getNativePointer());
         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);