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..c8302562cc70a6ccb4831e00fc6ecd8ed09f9a8e 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 |
@@ -34,7 +34,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 +387,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 +400,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 +431,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(); |
} |