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

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlTest.java
index 86ac30a4a9e608ba7092c50c4ad99e72140a5a3a..e4f5e666579cd67fcdd17a2fae56d51935960b3b 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlTest.java
@@ -24,7 +24,7 @@ public class CronetUrlTest extends CronetTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testLoadUrl() throws Exception {
-        CronetTestFramework testFramework = startCronetTestFrameworkWithUrl(URL);
+        CronetTestFramework testFramework = startCronetTestFrameworkForLegacyApi(URL);
 
         // Make sure that the URL is set as expected.
         assertEquals(URL, testFramework.getUrl());
@@ -34,7 +34,7 @@ public class CronetUrlTest extends CronetTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testInvalidUrl() throws Exception {
-        CronetTestFramework testFramework = startCronetTestFrameworkWithUrl("127.0.0.1:8000");
+        CronetTestFramework testFramework = startCronetTestFrameworkForLegacyApi("127.0.0.1:8000");
 
         // The load should fail.
         assertEquals(0, testFramework.getHttpStatusCode());
@@ -43,7 +43,8 @@ public class CronetUrlTest extends CronetTestBase {
     @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);
 
@@ -94,7 +95,7 @@ public class CronetUrlTest extends CronetTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testCalledByNativeException() throws Exception {
-        CronetTestFramework testFramework = startCronetTestFrameworkWithUrl(URL);
+        CronetTestFramework testFramework = startCronetTestFrameworkForLegacyApi(URL);
 
         HashMap<String, String> headers = new HashMap<String, String>();
         BadHttpUrlRequestListener listener = new BadHttpUrlRequestListener();
@@ -113,7 +114,7 @@ public class CronetUrlTest extends CronetTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testSetUploadDataWithNullContentType() throws Exception {
-        CronetTestFramework testFramework = startCronetTestFrameworkWithUrl(URL);
+        CronetTestFramework testFramework = startCronetTestFrameworkForLegacyApi(URL);
 
         HashMap<String, String> headers = new HashMap<String, String>();
         BadHttpUrlRequestListener listener = new BadHttpUrlRequestListener();
@@ -135,10 +136,8 @@ public class CronetUrlTest extends CronetTestBase {
     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
 
-        CronetTestFramework testFramework =
-                startCronetTestFrameworkWithUrlAndCronetEngineBuilder(URL, builder);
+        CronetTestFramework testFramework = startCronetTestFrameworkForLegacyApi(URL);
 
         // Make sure that the URL is set as expected.
         assertEquals(URL, testFramework.getUrl());
@@ -148,7 +147,7 @@ public class CronetUrlTest extends CronetTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testRequestHead() throws Exception {
-        CronetTestFramework testFramework = startCronetTestFrameworkWithUrl(URL);
+        CronetTestFramework testFramework = startCronetTestFrameworkForLegacyApi(URL);
 
         HashMap<String, String> headers = new HashMap<String, String>();
         TestHttpUrlRequestListener listener = new TestHttpUrlRequestListener();