[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..e6d53a1bdc7bb31349f4359dd0906f240efe1aa7 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,10 @@ public class CronetUrlTest extends CronetTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testLoadUrl() throws Exception {
-        CronetTestFramework testFramework = startCronetTestFrameworkWithUrl(URL);
+        String[] commandLineArgs = {
+                CronetTestFramework.LIBRARY_INIT_KEY, CronetTestFramework.LibraryInitType.LEGACY};
+        CronetTestFramework testFramework =
+                startCronetTestFrameworkWithUrlAndCommandLineArgs(URL, commandLineArgs);
 
         // Make sure that the URL is set as expected.
         assertEquals(URL, testFramework.getUrl());
@@ -43,7 +46,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 +98,10 @@ public class CronetUrlTest extends CronetTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testCalledByNativeException() throws Exception {
-        CronetTestFramework testFramework = startCronetTestFrameworkWithUrl(URL);
+        String[] commandLineArgs = {
+                CronetTestFramework.LIBRARY_INIT_KEY, CronetTestFramework.LibraryInitType.LEGACY};
+        CronetTestFramework testFramework =
+                startCronetTestFrameworkWithUrlAndCommandLineArgs(URL, commandLineArgs);
 
         HashMap<String, String> headers = new HashMap<String, String>();
         BadHttpUrlRequestListener listener = new BadHttpUrlRequestListener();
@@ -113,7 +120,10 @@ public class CronetUrlTest extends CronetTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testSetUploadDataWithNullContentType() throws Exception {
-        CronetTestFramework testFramework = startCronetTestFrameworkWithUrl(URL);
+        String[] commandLineArgs = {
+                CronetTestFramework.LIBRARY_INIT_KEY, CronetTestFramework.LibraryInitType.LEGACY};
+        CronetTestFramework testFramework =

[mef, 2015/11/24 20:38:33]

Can this construct be extracted into a method like
startCronetTestFrameworkForLegacyApiWithUrl(URL)?

[xunjieli, 2015/11/24 21:28:06]

Done.

+                startCronetTestFrameworkWithUrlAndCommandLineArgs(URL, commandLineArgs);
 
         HashMap<String, String> headers = new HashMap<String, String>();
         BadHttpUrlRequestListener listener = new BadHttpUrlRequestListener();
@@ -135,10 +145,11 @@ 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
 
+        String[] commandLineArgs = {
+                CronetTestFramework.LIBRARY_INIT_KEY, CronetTestFramework.LibraryInitType.LEGACY};
         CronetTestFramework testFramework =
-                startCronetTestFrameworkWithUrlAndCronetEngineBuilder(URL, builder);
+                new CronetTestFramework(URL, commandLineArgs, getContext(), builder);
 
         // Make sure that the URL is set as expected.
         assertEquals(URL, testFramework.getUrl());
@@ -148,7 +159,10 @@ public class CronetUrlTest extends CronetTestBase {
     @SmallTest
     @Feature({"Cronet"})
     public void testRequestHead() throws Exception {
-        CronetTestFramework testFramework = startCronetTestFrameworkWithUrl(URL);
+        String[] commandLineArgs = {
+                CronetTestFramework.LIBRARY_INIT_KEY, CronetTestFramework.LibraryInitType.LEGACY};
+        CronetTestFramework testFramework =
+                startCronetTestFrameworkWithUrlAndCommandLineArgs(URL, commandLineArgs);
 
         HashMap<String, String> headers = new HashMap<String, String>();
         TestHttpUrlRequestListener listener = new TestHttpUrlRequestListener();