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

components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.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.Context;
 import android.content.ContextWrapper;
 import android.os.ConditionVariable;
 import android.os.Handler;
@@ skipping 128 matching lines @@
         urlRequestBuilder.build().start();
         callback.blockForDone();
         assertEquals(userAgentValue, callback.mResponseAsString);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     // TODO(xunjieli): Remove annotation after crbug.com/539519 is fixed.
     @SuppressWarnings("deprecation")
     public void testDataReductionProxyEnabled() throws Exception {
-        mTestFramework = startCronetTestFrameworkAndSkipFactoryInit();
+        mTestFramework = startCronetTestFrameworkAndSkipLibraryInit();
 
         // Ensure native code is loaded before trying to start test server.
         new CronetEngine.Builder(getContext()).setLibraryName("cronet_tests").build().shutdown();
 
         assertTrue(NativeTestServer.startNativeTestServer(getContext()));
         if (!NativeTestServer.isDataReductionProxySupported()) {
             return;
         }
         String serverHostPort = NativeTestServer.getHostPort();
 
@@ skipping 144 matching lines @@
         // May not have read all the data, in theory. Just enable auto-advance
         // and finish the request.
         callback.setAutoAdvance(true);
         callback.startNextRead(urlRequest);
         callback.blockForDone();
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testShutdownDuringInit() throws Exception {
-        final CronetTestFramework testFramework = startCronetTestFrameworkAndSkipFactoryInit();
+        final CronetTestFramework testFramework = startCronetTestFrameworkAndSkipLibraryInit();
         final ConditionVariable block = new ConditionVariable(false);
 
         // Post a task to main thread to block until shutdown is called to test
         // scenario when shutdown is called right after construction before
         // context is fully initialized on the main thread.
         Runnable blockingTask = new Runnable() {
             public void run() {
                 try {
                     block.block();
                 } catch (Exception e) {
@@ skipping 18 matching lines @@
             cronetEngine.stopNetLog();
             fail("Should throw an exception.");
         } catch (Exception e) {
             assertEquals("Engine is shut down.", e.getMessage());
         }
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testInitAndShutdownOnMainThread() throws Exception {
-        final CronetTestFramework testFramework = startCronetTestFrameworkAndSkipFactoryInit();
+        final CronetTestFramework testFramework = startCronetTestFrameworkAndSkipLibraryInit();
         final ConditionVariable block = new ConditionVariable(false);
 
         // Post a task to main thread to init and shutdown on the main thread.
         Runnable blockingTask = new Runnable() {
             public void run() {
                 // Create new request context, loading the library.
                 final CronetEngine cronetEngine = testFramework.initCronetEngine();
                 // Shutdown right after init.
                 cronetEngine.shutdown();
                 // Verify that context is shutdown.
@@ skipping 317 matching lines @@
 
         // Shutdown original context and create another that uses the same cache.
         mTestFramework.mCronetEngine.shutdown();
         mTestFramework.mCronetEngine = mTestFramework.getCronetEngineBuilder().build();
         checkRequestCaching(url, true);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testInitEngineAndStartRequest() {
-        CronetTestFramework testFramework = startCronetTestFrameworkAndSkipFactoryInit();
+        CronetTestFramework testFramework = startCronetTestFrameworkAndSkipLibraryInit();
 
         // Immediately make a request after initializing the engine.
         CronetEngine cronetEngine = testFramework.initCronetEngine();
         TestUrlRequestCallback callback = new TestUrlRequestCallback();
         UrlRequest.Builder urlRequestBuilder =
                 new UrlRequest.Builder(TEST_URL, callback, callback.getExecutor(), cronetEngine);
         urlRequestBuilder.build().start();
         callback.blockForDone();
         assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testInitEngineStartTwoRequests() throws Exception {
-        CronetTestFramework testFramework = startCronetTestFrameworkAndSkipFactoryInit();
+        CronetTestFramework testFramework = startCronetTestFrameworkAndSkipLibraryInit();
 
         // Make two requests after initializing the context.
         CronetEngine cronetEngine = testFramework.initCronetEngine();
         int[] statusCodes = {0, 0};
         String[] urls = {TEST_URL, URL_404};
         for (int i = 0; i < 2; i++) {
             TestUrlRequestCallback callback = new TestUrlRequestCallback();
             UrlRequest.Builder urlRequestBuilder =
                     new UrlRequest.Builder(urls[i], callback, callback.getExecutor(), cronetEngine);
             urlRequestBuilder.build().start();
             callback.blockForDone();
             statusCodes[i] = callback.mResponseInfo.getHttpStatusCode();
         }
         assertEquals(200, statusCodes[0]);
         assertEquals(404, statusCodes[1]);
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testInitTwoEnginesSimultaneously() throws Exception {
-        final CronetTestFramework testFramework = startCronetTestFrameworkAndSkipFactoryInit();
+        final CronetTestFramework testFramework = startCronetTestFrameworkAndSkipLibraryInit();
 
         // Threads will block on runBlocker to ensure simultaneous execution.
         ConditionVariable runBlocker = new ConditionVariable(false);
         RequestThread thread1 = new RequestThread(testFramework, TEST_URL, runBlocker);
         RequestThread thread2 = new RequestThread(testFramework, URL_404, runBlocker);
 
         thread1.start();
         thread2.start();
         runBlocker.open();
         thread1.join();
         thread2.join();
         assertEquals(200, thread1.mCallback.mResponseInfo.getHttpStatusCode());
         assertEquals(404, thread2.mCallback.mResponseInfo.getHttpStatusCode());
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testInitTwoEnginesInSequence() throws Exception {
-        final CronetTestFramework testFramework = startCronetTestFrameworkAndSkipFactoryInit();
+        final CronetTestFramework testFramework = startCronetTestFrameworkAndSkipLibraryInit();
 
         ConditionVariable runBlocker = new ConditionVariable(true);
         RequestThread thread1 = new RequestThread(testFramework, TEST_URL, runBlocker);
         RequestThread thread2 = new RequestThread(testFramework, URL_404, runBlocker);
 
         thread1.start();
         thread1.join();
         thread2.start();
         thread2.join();
         assertEquals(200, thread1.mCallback.mResponseInfo.getHttpStatusCode());
@@ skipping 28 matching lines @@
         TestUrlRequestCallback callback = new TestUrlRequestCallback();
         UrlRequest.Builder builder = new UrlRequest.Builder(
                 TEST_URL, callback, callback.getExecutor(), mTestFramework.mCronetEngine);
         builder.build().start();
         callback.blockForDone();
         byte delta2[] = mTestFramework.mCronetEngine.getGlobalMetricsDeltas();
         assertTrue(delta2.length != 0);
         assertFalse(Arrays.equals(delta1, delta2));
     }
 }