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

components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java

Index: components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java
diff --git a/components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java b/components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java
index fbee5f926ae4265d4a9f9128985e8ab39d1418ef..a1a759a19fa8583a1dec1521148c395706f0a1c2 100644
--- a/components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java
+++ b/components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java
@@ -34,12 +34,7 @@ public class CronetTestFramework {
     public static final String POST_DATA_KEY = "postData";
     public static final String CACHE_KEY = "cache";
     public static final String SDCH_KEY = "sdch";
-
     public static final String LIBRARY_INIT_KEY = "libraryInit";
-    /**
-      * Skips library initialization.
-      */
-    public static final String LIBRARY_INIT_SKIP = "skip";
 
     // Uses disk cache.
     public static final String CACHE_DISK = "disk";
@@ -54,14 +49,21 @@ public class CronetTestFramework {
     public static final String SDCH_ENABLE = "enable";
 
     /**
-      * Initializes Cronet Async API only.
-      */
-    public static final String LIBRARY_INIT_CRONET_ONLY = "cronetOnly";
-
-    /**
-      * Initializes Cronet HttpURLConnection Wrapper API.
-      */
-    public static final String LIBRARY_INIT_WRAPPER = "wrapperOnly";
+     * Library init type strings to use along with {@link LIBRARY_INIT_KEY}.
+     * If unspecified, {@link LibraryInitType.CRONET} will be used.
+     */
+    public static final class LibraryInitType {
+        // Initializes Cronet Async API.
+        public static final String CRONET = "cronet";
+        // Initializes Cronet legacy API.
+        public static final String LEGACY = "legacy";
+        // Initializes Cronet HttpURLConnection API.
+        public static final String HTTP_URL_CONNECTION = "http_url_connection";
+        // Do not initialize.
+        public static final String NONE = "none";
+
+        private LibraryInitType() {}
+    }
 
     public URLStreamHandlerFactory mStreamHandlerFactory;
     public CronetEngine mCronetEngine;
@@ -118,26 +120,29 @@ public class CronetTestFramework {
         mCronetEngineBuilder = initializeCronetEngineBuilderWithPresuppliedBuilder(builder);
 
         String initString = getCommandLineArg(LIBRARY_INIT_KEY);
-        if (LIBRARY_INIT_SKIP.equals(initString)) {
-            return;
-        }
-
-        mCronetEngine = initCronetEngine();
-
-        if (LIBRARY_INIT_WRAPPER.equals(initString)) {
-            mStreamHandlerFactory = mCronetEngine.createURLStreamHandlerFactory();
-        }
-
-        // Start collecting metrics.
-        mCronetEngine.getGlobalMetricsDeltas();
 
-        if (LIBRARY_INIT_CRONET_ONLY.equals(initString)) {
-            return;
+        if (initString == null) {
+            initString = LibraryInitType.CRONET;
         }
 
-        mRequestFactory = initRequestFactory();
-        if (appUrl != null) {
-            startWithURL(appUrl);
+        switch (initString) {
+            case LibraryInitType.NONE:
+                break;
+            case LibraryInitType.LEGACY:
+                mRequestFactory = initRequestFactory();
+                if (appUrl != null) {
+                    startWithURL(appUrl);
+                }
+                break;
+            case LibraryInitType.HTTP_URL_CONNECTION:
+                mCronetEngine = initCronetEngine();
+                mStreamHandlerFactory = mCronetEngine.createURLStreamHandlerFactory();
+                break;
+            default:
+                mCronetEngine = initCronetEngine();
+                // Start collecting metrics.
+                mCronetEngine.getGlobalMetricsDeltas();
+                break;
         }
     }