Cronet API Refactoring

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/PkpTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/PkpTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/PkpTest.java
index 35b432df0b8ec68963f795f36157bda6af255070..16342df1a2d528d7b957cb07c9d314b9a9e66848 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/PkpTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/PkpTest.java
@@ -6,9 +6,10 @@ package org.chromium.net;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
+import org.json.JSONObject;
+
 import org.chromium.base.test.util.Feature;
 import org.chromium.net.test.util.CertTestUtil;
-import org.json.JSONObject;
 
 import java.io.ByteArrayInputStream;
 import java.security.cert.CertificateFactory;
@@ -34,7 +35,7 @@ public class PkpTest extends CronetTestBase {
     private static final boolean DISABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS = false;
 
     private CronetTestFramework mTestFramework;
-    private CronetEngine.Builder mBuilder;
+    private ExperimentalCronetEngine.Builder mBuilder;
     private TestUrlRequestCallback mListener;
     private String mServerUrl; // https://test.example.com:6121
     private String mServerHost; // test.example.com
@@ -387,7 +388,7 @@ public class PkpTest extends CronetTestBase {
     private void createCronetEngineBuilder(boolean bypassPinningForLocalAnchors, boolean knownRoot)
             throws Exception {
         // Set common CronetEngine parameters
-        mBuilder = new CronetEngine.Builder(getContext());
+        mBuilder = new ExperimentalCronetEngine.Builder(getContext());
         mBuilder.enablePublicKeyPinningBypassForLocalTrustAnchors(bypassPinningForLocalAnchors);
         mBuilder.enableQuic(true);
         mBuilder.addQuicHint(QuicTestServer.getServerHost(), QuicTestServer.getServerPort(),
@@ -400,8 +401,8 @@ public class PkpTest extends CronetTestBase {
         mBuilder.setExperimentalOptions(experimentalOptions.toString());
         mBuilder.setStoragePath(CronetTestFramework.getTestStorage(getContext()));
         mBuilder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK_NO_HTTP, 1000 * 1024);
-        mBuilder.setMockCertVerifierForTesting(
-                MockCertVerifier.createMockCertVerifier(CERTS_USED, knownRoot));
+        CronetTestUtil.setMockCertVerifierForTesting(
+                mBuilder, MockCertVerifier.createMockCertVerifier(CERTS_USED, knownRoot));
     }
 
     private void startCronetFramework() {
@@ -431,8 +432,8 @@ public class PkpTest extends CronetTestBase {
         mListener = new TestUrlRequestCallback();
 
         String quicURL = mServerUrl + "/simple.txt";
-        UrlRequest.Builder requestBuilder = new UrlRequest.Builder(
-                quicURL, mListener, mListener.getExecutor(), mTestFramework.mCronetEngine);
+        UrlRequest.Builder requestBuilder = mTestFramework.mCronetEngine.newUrlRequestBuilder(
+                quicURL, mListener, mListener.getExecutor());
         requestBuilder.build().start();
         mListener.blockForDone();
     }