[Cronet] Clean up tests

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java
index 7a06ae766164a4c24b9bbb84b53bf51819f8c517..fefad0f12f0936ff8c73b1358eaaa905179abf1d 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/BrotliTest.java
@@ -12,7 +12,7 @@ import org.chromium.base.test.util.Feature;
  * Simple test for Brotli support.
  */
 public class BrotliTest extends CronetTestBase {
-    private CronetTestFramework mTestFramework;
+    private CronetEngine mCronetEngine;
 
     @Override
     protected void setUp() throws Exception {
@@ -26,7 +26,7 @@ public class BrotliTest extends CronetTestBase {
     @Override
     protected void tearDown() throws Exception {
         assertTrue(Http2TestServer.shutdownHttp2TestServer());
-        mTestFramework.mCronetEngine.shutdown();
+        mCronetEngine.shutdown();
         super.tearDown();
     }
 
@@ -39,7 +39,7 @@ public class BrotliTest extends CronetTestBase {
         builder.enableBrotli(true);
         CronetTestUtil.setMockCertVerifierForTesting(
                 builder, QuicTestServer.createMockCertVerifier());
-        mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, builder);
+        mCronetEngine = builder.build();
         String url = Http2TestServer.getEchoAllHeadersUrl();
         TestUrlRequestCallback callback = startAndWaitForComplete(url);
         assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
@@ -54,7 +54,7 @@ public class BrotliTest extends CronetTestBase {
                 new ExperimentalCronetEngine.Builder(getContext());
         CronetTestUtil.setMockCertVerifierForTesting(
                 builder, QuicTestServer.createMockCertVerifier());
-        mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, builder);
+        mCronetEngine = builder.build();
         String url = Http2TestServer.getEchoAllHeadersUrl();
         TestUrlRequestCallback callback = startAndWaitForComplete(url);
         assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
@@ -70,7 +70,7 @@ public class BrotliTest extends CronetTestBase {
         builder.enableBrotli(true);
         CronetTestUtil.setMockCertVerifierForTesting(
                 builder, QuicTestServer.createMockCertVerifier());
-        mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, builder);
+        mCronetEngine = builder.build();
         String url = Http2TestServer.getServeSimpleBrotliResponse();
         TestUrlRequestCallback callback = startAndWaitForComplete(url);
         assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
@@ -81,8 +81,8 @@ public class BrotliTest extends CronetTestBase {
 
     private TestUrlRequestCallback startAndWaitForComplete(String url) {
         TestUrlRequestCallback callback = new TestUrlRequestCallback();
-        UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder(
-                url, callback, callback.getExecutor());
+        UrlRequest.Builder builder =
+                mCronetEngine.newUrlRequestBuilder(url, callback, callback.getExecutor());
         builder.build().start();
         callback.blockForDone();
         return callback;