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

components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.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.test.AndroidTestCase;
 
 import org.chromium.base.PathUtils;
 
@@ skipping 46 matching lines @@
     /**
      * Starts the CronetTest framework appending the provided command line
      * arguments and loads the given URL. The URL can be null.
      */
     protected CronetTestFramework startCronetTestFrameworkWithUrlAndCommandLineArgs(
             String url, String[] commandLineArgs) {
         mCronetTestFramework = new CronetTestFramework(url, commandLineArgs, getContext(), null);
         return mCronetTestFramework;
     }
 
-    // Helper method to tell the framework to skip factory init during construction.
-    protected CronetTestFramework startCronetTestFrameworkAndSkipFactoryInit() {
+    // Helper method to tell the framework to skip library init during construction.
+    protected CronetTestFramework startCronetTestFrameworkAndSkipLibraryInit() {
         String[] commandLineArgs = {
-                CronetTestFramework.LIBRARY_INIT_KEY, CronetTestFramework.LIBRARY_INIT_SKIP};
+                CronetTestFramework.LIBRARY_INIT_KEY, CronetTestFramework.LibraryInitType.NONE};
         mCronetTestFramework =
                 startCronetTestFrameworkWithUrlAndCommandLineArgs(null, commandLineArgs);
         return mCronetTestFramework;
     }
 
+    /**
+     * Starts the CronetTest framework for the legacy API.
+     * @param url if non-null, a request will be made with that url.
+     */
+    protected CronetTestFramework startCronetTestFrameworkForLegacyApi(String url) {
+        String[] commandLineArgs = {
+                CronetTestFramework.LIBRARY_INIT_KEY, CronetTestFramework.LibraryInitType.LEGACY};
+        mCronetTestFramework =
+                startCronetTestFrameworkWithUrlAndCommandLineArgs(url, commandLineArgs);
+        return mCronetTestFramework;
+    }
+
     @Override
     protected void runTest() throws Throwable {
         if (!getClass().getPackage().getName().equals(
                 "org.chromium.net.urlconnection")) {
             super.runTest();
             return;
         }
         try {
             Method method = getClass().getMethod(getName(), (Class[]) null);
             if (method.isAnnotationPresent(CompareDefaultWithCronet.class)) {
@@ skipping 20 matching lines @@
     @Retention(RetentionPolicy.RUNTIME)
     public @interface CompareDefaultWithCronet {
     }
 
     @Target(ElementType.METHOD)
     @Retention(RetentionPolicy.RUNTIME)
     public @interface OnlyRunCronetHttpURLConnection {
     }
 
 }