[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..ae349ac241ec75f6a0e741b2b4ca361b8c16511e 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
@@ -404,12 +404,12 @@ public class PkpTest extends CronetTestBase {
     }
 
     private void startCronetFramework() {

[mgersh, 2017/05/23 18:12:13]

It's not using a Framework anymore, so this could be startCronetEngine instead,
or just delete it.

[pauljensen, 2017/05/25 15:15:15]

Done.

-        mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, mBuilder);
+        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();
     }