[Cronet] Clean up tests

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 120c5df330319fd99c409a049b3ef0eaa98db951..f8e1756fe4c5ff6ecea416041707b2d77304c27a 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 ENABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS = true;
     private static final boolean DISABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS = false;
 
-    private CronetTestFramework mTestFramework;
+    private CronetEngine mCronetEngine;
     private ExperimentalCronetEngine.Builder mBuilder;
     private TestUrlRequestCallback mListener;
     private String mServerUrl; // https://test.example.com:6121
@@ -72,7 +72,7 @@ public class PkpTest extends CronetTestBase {
         createCronetEngineBuilder(ENABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS, KNOWN_ROOT);
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);
-        startCronetFramework();
+        startCronetEngine();
         sendRequestAndWaitForResult();
 
         assertErrorResponse();
@@ -94,7 +94,7 @@ public class PkpTest extends CronetTestBase {
         byte[] matchingHash = CertTestUtil.getPublicKeySha256(cert);
 
         addPkpSha256(mServerHost, matchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);
-        startCronetFramework();
+        startCronetEngine();
         sendRequestAndWaitForResult();
 
         assertSuccessfulResponse();
@@ -114,7 +114,7 @@ public class PkpTest extends CronetTestBase {
         createCronetEngineBuilder(ENABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS, KNOWN_ROOT);
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mDomain, nonMatchingHash, INCLUDE_SUBDOMAINS, DISTANT_FUTURE);
-        startCronetFramework();
+        startCronetEngine();
         sendRequestAndWaitForResult();
 
         assertErrorResponse();
@@ -134,7 +134,7 @@ public class PkpTest extends CronetTestBase {
         createCronetEngineBuilder(ENABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS, KNOWN_ROOT);
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mDomain, nonMatchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);
-        startCronetFramework();
+        startCronetEngine();
         sendRequestAndWaitForResult();
 
         assertSuccessfulResponse();
@@ -154,7 +154,7 @@ public class PkpTest extends CronetTestBase {
         createCronetEngineBuilder(ENABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS, KNOWN_ROOT);
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256("otherhost.com", nonMatchingHash, INCLUDE_SUBDOMAINS, DISTANT_FUTURE);
-        startCronetFramework();
+        startCronetEngine();
         sendRequestAndWaitForResult();
 
         assertSuccessfulResponse();
@@ -174,7 +174,7 @@ public class PkpTest extends CronetTestBase {
         final int tenSecondsAhead = 10;
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, tenSecondsAhead);
-        startCronetFramework();
+        startCronetEngine();
         sendRequestAndWaitForResult();
 
         assertErrorResponse();
@@ -194,7 +194,7 @@ public class PkpTest extends CronetTestBase {
         final int oneSecondAgo = -1;
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, oneSecondAgo);
-        startCronetFramework();
+        startCronetEngine();
         sendRequestAndWaitForResult();
 
         assertSuccessfulResponse();
@@ -212,7 +212,7 @@ public class PkpTest extends CronetTestBase {
         createCronetEngineBuilder(DISABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS, UNKNOWN_ROOT);
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);
-        startCronetFramework();
+        startCronetEngine();
         sendRequestAndWaitForResult();
 
         assertErrorResponse();
@@ -230,7 +230,7 @@ public class PkpTest extends CronetTestBase {
         createCronetEngineBuilder(ENABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS, UNKNOWN_ROOT);
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);
-        startCronetFramework();
+        startCronetEngine();
         sendRequestAndWaitForResult();
 
         assertSuccessfulResponse();
@@ -248,7 +248,7 @@ public class PkpTest extends CronetTestBase {
         createCronetEngineBuilder(ENABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS, KNOWN_ROOT);
         byte[] nonMatchingHash = generateSomeSha256();
         addPkpSha256(mServerHost, nonMatchingHash, EXCLUDE_SUBDOMAINS, DISTANT_FUTURE);
-        startCronetFramework();
+        startCronetEngine();
         sendRequestAndWaitForResult();
         assertErrorResponse();
         shutdownCronetEngine();
@@ -256,7 +256,7 @@ public class PkpTest extends CronetTestBase {
         // Restart Cronet engine and try the same request again. Since the pins are not persisted,
         // a successful response is expected.
         createCronetEngineBuilder(ENABLE_PINNING_BYPASS_FOR_LOCAL_ANCHORS, KNOWN_ROOT);
-        startCronetFramework();
+        startCronetEngine();
         sendRequestAndWaitForResult();
         assertSuccessfulResponse();
     }
@@ -397,19 +397,19 @@ public class PkpTest extends CronetTestBase {
         JSONObject experimentalOptions = new JSONObject()
                                                  .put("HostResolverRules", hostResolverParams);
         mBuilder.setExperimentalOptions(experimentalOptions.toString());
-        mBuilder.setStoragePath(CronetTestFramework.getTestStorage(getContext()));
+        mBuilder.setStoragePath(getTestStorage(getContext()));
         mBuilder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK_NO_HTTP, 1000 * 1024);
         CronetTestUtil.setMockCertVerifierForTesting(
                 mBuilder, MockCertVerifier.createMockCertVerifier(CERTS_USED, knownRoot));
     }
 
-    private void startCronetFramework() {
-        mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, mBuilder);
+    private void startCronetEngine() {
+        mCronetEngine = mBuilder.build();
     }
 
     private void shutdownCronetEngine() {
-        if (mTestFramework != null && mTestFramework.mCronetEngine != null) {
-            mTestFramework.mCronetEngine.shutdown();
+        if (mCronetEngine != null) {
+            mCronetEngine.shutdown();
         }
     }
 
@@ -430,8 +430,8 @@ public class PkpTest extends CronetTestBase {
         mListener = new TestUrlRequestCallback();
 
         String quicURL = mServerUrl + "/simple.txt";
-        UrlRequest.Builder requestBuilder = mTestFramework.mCronetEngine.newUrlRequestBuilder(
-                quicURL, mListener, mListener.getExecutor());
+        UrlRequest.Builder requestBuilder =
+                mCronetEngine.newUrlRequestBuilder(quicURL, mListener, mListener.getExecutor());
         requestBuilder.build().start();
         mListener.blockForDone();
     }