[Cronet] Clear mock cert verifier reference in CronetEngine.Builder

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.net;
 
 import android.content.Context;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.PathUtils;
 import org.chromium.base.test.util.Feature;
 
 import java.io.File;
 import java.util.HashMap;
 
 /**
  * Test for deprecated {@link HttpUrlRequest} API.
  */
 @SuppressWarnings("deprecation")
 public class CronetUrlTest extends CronetTestBase {
     // URL used for base tests.
     private static final String URL = "http://127.0.0.1:8000";
 
     @SmallTest
     @Feature({"Cronet"})
     public void testLoadUrl() throws Exception {
-        CronetTestFramework testFramework = startCronetTestFrameworkWithUrl(URL);
+        String[] commandLineArgs = {
+                CronetTestFramework.LIBRARY_INIT_KEY, CronetTestFramework.LibraryInitType.LEGACY};
+        CronetTestFramework testFramework =
+                startCronetTestFrameworkWithUrlAndCommandLineArgs(URL, commandLineArgs);
 
         // Make sure that the URL is set as expected.
         assertEquals(URL, testFramework.getUrl());
         assertEquals(200, testFramework.getHttpStatusCode());
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testInvalidUrl() throws Exception {
         CronetTestFramework testFramework = startCronetTestFrameworkWithUrl("127.0.0.1:8000");
 
         // The load should fail.
         assertEquals(0, testFramework.getHttpStatusCode());
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testPostData() throws Exception {
-        String[] commandLineArgs = {CronetTestFramework.POST_DATA_KEY, "test"};
+        String[] commandLineArgs = {CronetTestFramework.POST_DATA_KEY, "test",
+                CronetTestFramework.LIBRARY_INIT_KEY, CronetTestFramework.LibraryInitType.LEGACY};
         CronetTestFramework testFramework =
                 startCronetTestFrameworkWithUrlAndCommandLineArgs(URL, commandLineArgs);
 
         // Make sure that the URL is set as expected.
         assertEquals(URL, testFramework.getUrl());
         assertEquals(200, testFramework.getHttpStatusCode());
     }
 
     @SmallTest
     @Feature({"Cronet"})
@@ skipping 30 matching lines @@
 
         @Override
         public void onResponseStarted(HttpUrlRequest request) {
             throw new NullPointerException(THROW_TAG);
         }
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testCalledByNativeException() throws Exception {
-        CronetTestFramework testFramework = startCronetTestFrameworkWithUrl(URL);
+        String[] commandLineArgs = {
+                CronetTestFramework.LIBRARY_INIT_KEY, CronetTestFramework.LibraryInitType.LEGACY};
+        CronetTestFramework testFramework =
+                startCronetTestFrameworkWithUrlAndCommandLineArgs(URL, commandLineArgs);
 
         HashMap<String, String> headers = new HashMap<String, String>();
         BadHttpUrlRequestListener listener = new BadHttpUrlRequestListener();
 
         // Create request with bad listener to trigger an exception.
         HttpUrlRequest request = testFramework.mRequestFactory.createRequest(
                 URL, HttpUrlRequest.REQUEST_PRIORITY_MEDIUM, headers, listener);
         request.start();
         listener.blockForComplete();
         assertTrue(request.isCanceled());
         assertNotNull(request.getException());
         assertEquals(BadHttpUrlRequestListener.THROW_TAG,
                      request.getException().getCause().getMessage());
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testSetUploadDataWithNullContentType() throws Exception {
-        CronetTestFramework testFramework = startCronetTestFrameworkWithUrl(URL);
+        String[] commandLineArgs = {
+                CronetTestFramework.LIBRARY_INIT_KEY, CronetTestFramework.LibraryInitType.LEGACY};
+        CronetTestFramework testFramework =

[mef, 2015/11/24 20:38:33]

Can this construct be extracted into a method like
startCronetTestFrameworkForLegacyApiWithUrl(URL)?

[xunjieli, 2015/11/24 21:28:06]

Done.

+                startCronetTestFrameworkWithUrlAndCommandLineArgs(URL, commandLineArgs);
 
         HashMap<String, String> headers = new HashMap<String, String>();
         BadHttpUrlRequestListener listener = new BadHttpUrlRequestListener();
 
         // Create request.
         HttpUrlRequest request = testFramework.mRequestFactory.createRequest(
                 URL, HttpUrlRequest.REQUEST_PRIORITY_MEDIUM, headers, listener);
         byte[] uploadData = new byte[] {1, 2, 3};
         try {
             request.setUploadData(null, uploadData);
             fail("setUploadData should throw on null content type");
         } catch (NullPointerException e) {
             // Nothing to do here.
         }
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testLegacyLoadUrl() throws Exception {
         CronetEngine.Builder builder = new CronetEngine.Builder(getContext());
         builder.enableLegacyMode(true);
-        // TODO(mef) fix tests so that library isn't loaded for legacy stack
 
+        String[] commandLineArgs = {
+                CronetTestFramework.LIBRARY_INIT_KEY, CronetTestFramework.LibraryInitType.LEGACY};
         CronetTestFramework testFramework =
-                startCronetTestFrameworkWithUrlAndCronetEngineBuilder(URL, builder);
+                new CronetTestFramework(URL, commandLineArgs, getContext(), builder);
 
         // Make sure that the URL is set as expected.
         assertEquals(URL, testFramework.getUrl());
         assertEquals(200, testFramework.getHttpStatusCode());
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testRequestHead() throws Exception {
-        CronetTestFramework testFramework = startCronetTestFrameworkWithUrl(URL);
+        String[] commandLineArgs = {
+                CronetTestFramework.LIBRARY_INIT_KEY, CronetTestFramework.LibraryInitType.LEGACY};
+        CronetTestFramework testFramework =
+                startCronetTestFrameworkWithUrlAndCommandLineArgs(URL, commandLineArgs);
 
         HashMap<String, String> headers = new HashMap<String, String>();
         TestHttpUrlRequestListener listener = new TestHttpUrlRequestListener();
 
         // Create request.
         HttpUrlRequest request = testFramework.mRequestFactory.createRequest(
                 URL, HttpUrlRequest.REQUEST_PRIORITY_MEDIUM, headers, listener);
         request.setHttpMethod("HEAD");
         request.start();
         listener.blockForComplete();
         assertEquals(200, listener.mHttpStatusCode);
         // HEAD requests do not get any response data and Content-Length must be
         // ignored.
         assertEquals(0, listener.mResponseAsBytes.length);
     }
 }