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

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

 // Copyright 2015 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.os.ConditionVariable;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
@@ skipping 26 matching lines @@
     @SuppressWarnings("deprecation")
     private void setUp(Sdch setting, Api api) {
         List<String> commandLineArgs = new ArrayList<String>();
         commandLineArgs.add(CronetTestFramework.CACHE_KEY);
         commandLineArgs.add(CronetTestFramework.CACHE_DISK);
         if (setting == Sdch.ENABLED) {
             commandLineArgs.add(CronetTestFramework.SDCH_KEY);
             commandLineArgs.add(CronetTestFramework.SDCH_ENABLE);
         }
 
+        if (api == Api.LEGACY) {
+            commandLineArgs.add(CronetTestFramework.LIBRARY_INIT_KEY);
+            commandLineArgs.add(CronetTestFramework.LibraryInitType.LEGACY);
+        } else {
+            commandLineArgs.add(CronetTestFramework.LIBRARY_INIT_KEY);
+            commandLineArgs.add(CronetTestFramework.LibraryInitType.CRONET);
+        }
+
         String[] args = new String[commandLineArgs.size()];
         mTestFramework = startCronetTestFrameworkWithUrlAndCommandLineArgs(
                 null, commandLineArgs.toArray(args));
         long urlRequestContextAdapter = (api == Api.LEGACY)
                 ? getContextAdapter((ChromiumUrlRequestFactory) mTestFramework.mRequestFactory)
                 : getContextAdapter((CronetUrlRequestContext) mTestFramework.mCronetEngine);
         NativeTestServer.registerHostResolverProc(urlRequestContextAdapter, api == Api.LEGACY);
         // Start NativeTestServer.
         assertTrue(NativeTestServer.startNativeTestServer(getContext()));
     }
@@ skipping 215 matching lines @@
         while ((line = reader.readLine()) != null) {
             if (line.contains(content)) {
                 reader.close();
                 return true;
             }
         }
         reader.close();
         return false;
     }
 }