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

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

 // Copyright 2014 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.content.ContextWrapper;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
 
 import java.util.HashMap;
 
 /**
  * Tests that make sure ChromiumUrlRequestContext initialization will not
  * affect embedders' ability to make requests.
  */
 @SuppressWarnings("deprecation")
 public class ContextInitTest extends CronetTestBase {
     // URL used for base tests.
     private static final String URL = "http://127.0.0.1:8000";
     // URL used for tests that return HTTP not found (404).
     private static final String URL_404 = "http://127.0.0.1:8000/notfound404";
 
     @SmallTest
     @Feature({"Cronet"})
     public void testInitFactoryAndStartRequest() {
-        CronetTestFramework testFramework = startCronetTestFrameworkAndSkipFactoryInit();
+        CronetTestFramework testFramework = startCronetTestFrameworkAndSkipLibraryInit();
 
         // Immediately make a request after initializing the factory.
         HttpUrlRequestFactory factory = testFramework.initRequestFactory();
         TestHttpUrlRequestListener listener = makeRequest(factory, URL);
         listener.blockForComplete();
         assertEquals(200, listener.mHttpStatusCode);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testInitFactoryStartRequestAndCancel() {
-        CronetTestFramework testFramework = startCronetTestFrameworkAndSkipFactoryInit();
+        CronetTestFramework testFramework = startCronetTestFrameworkAndSkipLibraryInit();
 
         // Make a request and cancel it after initializing the factory.
         HttpUrlRequestFactory factory = testFramework.initRequestFactory();
         HashMap<String, String> headers = new HashMap<String, String>();
         TestHttpUrlRequestListener listener = new TestHttpUrlRequestListener();
         HttpUrlRequest request = factory.createRequest(
                 URL, HttpUrlRequest.REQUEST_PRIORITY_MEDIUM, headers, listener);
         request.start();
         request.cancel();
         listener.blockForComplete();
         assertEquals(0, listener.mHttpStatusCode);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testInitFactoryStartTwoRequests() throws Exception {
-        CronetTestFramework testFramework = startCronetTestFrameworkAndSkipFactoryInit();
+        CronetTestFramework testFramework = startCronetTestFrameworkAndSkipLibraryInit();
 
         // Make two request right after initializing the factory.
         int[] statusCodes = {0, 0};
         String[] urls = {URL, URL_404};
         HttpUrlRequestFactory factory = testFramework.initRequestFactory();
         for (int i = 0; i < 2; i++) {
             TestHttpUrlRequestListener listener = makeRequest(factory, urls[i]);
             listener.blockForComplete();
             statusCodes[i] = listener.mHttpStatusCode;
         }
@@ skipping 16 matching lines @@
         public void run() {
             HttpUrlRequestFactory factory = mTestFramework.initRequestFactory();
             mCallback = makeRequest(factory, mUrl);
             mCallback.blockForComplete();
         }
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testInitTwoFactoriesSimultaneously() throws Exception {
-        final CronetTestFramework testFramework = startCronetTestFrameworkAndSkipFactoryInit();
+        final CronetTestFramework testFramework = startCronetTestFrameworkAndSkipLibraryInit();
 
         RequestThread thread1 = new RequestThread(testFramework, URL);
         RequestThread thread2 = new RequestThread(testFramework, URL_404);
 
         thread1.start();
         thread2.start();
         thread1.join();
         thread2.join();
         assertEquals(200, thread1.mCallback.mHttpStatusCode);
         assertEquals(404, thread2.mCallback.mHttpStatusCode);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testInitTwoFactoriesInSequence() throws Exception {
-        final CronetTestFramework testFramework = startCronetTestFrameworkAndSkipFactoryInit();
+        final CronetTestFramework testFramework = startCronetTestFrameworkAndSkipLibraryInit();
 
         RequestThread thread1 = new RequestThread(testFramework, URL);
         RequestThread thread2 = new RequestThread(testFramework, URL_404);
 
         thread1.start();
         thread1.join();
         thread2.start();
         thread2.join();
         assertEquals(200, thread1.mCallback.mHttpStatusCode);
         assertEquals(404, thread2.mCallback.mHttpStatusCode);
@@ skipping 23 matching lines @@
                 getContext().getApplicationContext(), testFramework.getCronetEngineBuilder());
         HttpUrlRequestFactory thirdFactory = HttpUrlRequestFactory.createFactory(
                 new ContextWrapper(getContext()), testFramework.getCronetEngineBuilder());
         // Meager attempt to extend lifetimes to ensure they're concurrently
         // alive.
         firstFactory.getName();
         secondFactory.getName();
         thirdFactory.getName();
     }
 }