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

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java
index ed8f586d649cda9ae63575581352c43c7655eaba..bd22a6ddc26056642d82ef604690ac9b5246a509 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java
@@ -64,15 +64,27 @@ public class CronetTestBase extends AndroidTestCase {
         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(