[Cronet] Clean up tests

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java
index bc805c458cb90111ec68a3922c4715e1d05f8250..48bd9d17711097ae9efacc053579efdef7c5010c 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java
@@ -28,7 +28,6 @@ import java.util.concurrent.Executors;
 public class QuicTest extends CronetTestBase {
     private static final String TAG = QuicTest.class.getSimpleName();
     private static final String QUIC_PROTOCOL_STRING_PREFIX = "http/2+quic/";
-    private CronetTestFramework mTestFramework;
     private ExperimentalCronetEngine.Builder mBuilder;
 
     @Override
@@ -57,7 +56,7 @@ public class QuicTest extends CronetTestBase {
                                                  .put("QUIC", quicParams)
                                                  .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, QuicTestServer.createMockCertVerifier());
@@ -73,7 +72,7 @@ public class QuicTest extends CronetTestBase {
     @Feature({"Cronet"})
     @OnlyRunNativeCronet
     public void testQuicLoadUrl() throws Exception {
-        mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, mBuilder);
+        ExperimentalCronetEngine cronetEngine = mBuilder.build();
         String quicURL = QuicTestServer.getServerURL() + "/simple.txt";
         TestUrlRequestCallback callback = new TestUrlRequestCallback();
 
@@ -81,8 +80,8 @@ public class QuicTest extends CronetTestBase {
         // since there is no http server running on the corresponding TCP port,
         // QUIC will always succeed with a 200 (see
         // net::HttpStreamFactoryImpl::Request::OnStreamFailed).
-        UrlRequest.Builder requestBuilder = mTestFramework.mCronetEngine.newUrlRequestBuilder(
-                quicURL, callback, callback.getExecutor());
+        UrlRequest.Builder requestBuilder =
+                cronetEngine.newUrlRequestBuilder(quicURL, callback, callback.getExecutor());
         requestBuilder.build().start();
         callback.blockForDone();
 
@@ -108,12 +107,12 @@ public class QuicTest extends CronetTestBase {
         }
         assertTrue(fileContainsString("local_prefs.json",
                 QuicTestServer.getServerHost() + ":" + QuicTestServer.getServerPort()));
-        mTestFramework.mCronetEngine.shutdown();
+        cronetEngine.shutdown();
 
         // Make another request using a new context but with no QUIC hints.
         ExperimentalCronetEngine.Builder builder =
                 new ExperimentalCronetEngine.Builder(getContext());
-        builder.setStoragePath(CronetTestFramework.getTestStorage(getContext()));
+        builder.setStoragePath(getTestStorage(getContext()));
         builder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK, 1000 * 1024);
         builder.enableQuic(true);
         JSONObject hostResolverParams = CronetTestUtil.generateHostResolverRules();
@@ -122,10 +121,10 @@ public class QuicTest extends CronetTestBase {
         builder.setExperimentalOptions(experimentalOptions.toString());
         CronetTestUtil.setMockCertVerifierForTesting(
                 builder, QuicTestServer.createMockCertVerifier());
-        mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, builder);
+        cronetEngine = builder.build();
         TestUrlRequestCallback callback2 = new TestUrlRequestCallback();
-        requestBuilder = mTestFramework.mCronetEngine.newUrlRequestBuilder(
-                quicURL, callback2, callback2.getExecutor());
+        requestBuilder =
+                cronetEngine.newUrlRequestBuilder(quicURL, callback2, callback2.getExecutor());
         requestBuilder.build().start();
         callback2.blockForDone();
         assertEquals(200, callback2.mResponseInfo.getHttpStatusCode());
@@ -139,8 +138,7 @@ public class QuicTest extends CronetTestBase {
     // Returns whether a file contains a particular string.
     @SuppressFBWarnings("OBL_UNSATISFIED_OBLIGATION_EXCEPTION_EDGE")
     private boolean fileContainsString(String filename, String content) throws IOException {
-        File file =
-                new File(CronetTestFramework.getTestStorage(getContext()) + "/prefs/" + filename);
+        File file = new File(getTestStorage(getContext()) + "/prefs/" + filename);
         FileInputStream fileInputStream = new FileInputStream(file);
         byte[] data = new byte[(int) file.length()];
         fileInputStream.read(data);
@@ -156,7 +154,7 @@ public class QuicTest extends CronetTestBase {
     @OnlyRunNativeCronet
     @SuppressWarnings("deprecation")
     public void testNQEWithQuic() throws Exception {
-        mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, mBuilder);
+        ExperimentalCronetEngine cronetEngine = mBuilder.build();
         String quicURL = QuicTestServer.getServerURL() + "/simple.txt";
 
         TestNetworkQualityRttListener rttListener =
@@ -164,18 +162,18 @@ public class QuicTest extends CronetTestBase {
         TestNetworkQualityThroughputListener throughputListener =
                 new TestNetworkQualityThroughputListener(Executors.newSingleThreadExecutor());
 
-        mTestFramework.mCronetEngine.addRttListener(rttListener);
-        mTestFramework.mCronetEngine.addThroughputListener(throughputListener);
+        cronetEngine.addRttListener(rttListener);
+        cronetEngine.addThroughputListener(throughputListener);
 
-        mTestFramework.mCronetEngine.configureNetworkQualityEstimatorForTesting(true, true, true);
+        cronetEngine.configureNetworkQualityEstimatorForTesting(true, true, true);
         TestUrlRequestCallback callback = new TestUrlRequestCallback();
 
         // Although the native stack races QUIC and SPDY for the first request,
         // since there is no http server running on the corresponding TCP port,
         // QUIC will always succeed with a 200 (see
         // net::HttpStreamFactoryImpl::Request::OnStreamFailed).
-        UrlRequest.Builder requestBuilder = mTestFramework.mCronetEngine.newUrlRequestBuilder(
-                quicURL, callback, callback.getExecutor());
+        UrlRequest.Builder requestBuilder =
+                cronetEngine.newUrlRequestBuilder(quicURL, callback, callback.getExecutor());
         requestBuilder.build().start();
         callback.blockForDone();
 
@@ -204,14 +202,14 @@ public class QuicTest extends CronetTestBase {
 
         // Verify that effective connection type callback is received and
         // effective connection type is correctly set.
-        assertTrue(mTestFramework.mCronetEngine.getEffectiveConnectionType()
-                != EffectiveConnectionType.TYPE_UNKNOWN);
+        assertTrue(
+                cronetEngine.getEffectiveConnectionType() != EffectiveConnectionType.TYPE_UNKNOWN);
 
         // Verify that the HTTP RTT, transport RTT and downstream throughput
         // estimates are available.
-        assertTrue(mTestFramework.mCronetEngine.getHttpRttMs() >= 0);
-        assertTrue(mTestFramework.mCronetEngine.getTransportRttMs() >= 0);
-        assertTrue(mTestFramework.mCronetEngine.getDownstreamThroughputKbps() >= 0);
+        assertTrue(cronetEngine.getHttpRttMs() >= 0);
+        assertTrue(cronetEngine.getTransportRttMs() >= 0);
+        assertTrue(cronetEngine.getDownstreamThroughputKbps() >= 0);
 
         // Verify that the cached estimates were written to the prefs.
         while (true) {
@@ -227,22 +225,22 @@ public class QuicTest extends CronetTestBase {
             }
         }
         assertTrue(fileContainsString("local_prefs.json", "network_qualities"));
-        mTestFramework.mCronetEngine.shutdown();
+        cronetEngine.shutdown();
     }
 
     @SmallTest
     @OnlyRunNativeCronet
     @Feature({"Cronet"})
     public void testMetricsWithQuic() throws Exception {
-        mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, mBuilder);
+        ExperimentalCronetEngine cronetEngine = mBuilder.build();
         TestRequestFinishedListener requestFinishedListener = new TestRequestFinishedListener();
-        mTestFramework.mCronetEngine.addRequestFinishedListener(requestFinishedListener);
+        cronetEngine.addRequestFinishedListener(requestFinishedListener);
 
         String quicURL = QuicTestServer.getServerURL() + "/simple.txt";
         TestUrlRequestCallback callback = new TestUrlRequestCallback();
 
-        UrlRequest.Builder requestBuilder = mTestFramework.mCronetEngine.newUrlRequestBuilder(
-                quicURL, callback, callback.getExecutor());
+        UrlRequest.Builder requestBuilder =
+                cronetEngine.newUrlRequestBuilder(quicURL, callback, callback.getExecutor());
         Date startTime = new Date();
         requestBuilder.build().start();
         callback.blockForDone();
@@ -260,8 +258,8 @@ public class QuicTest extends CronetTestBase {
         // Second request should use the same connection and not have ConnectTiming numbers
         callback = new TestUrlRequestCallback();
         requestFinishedListener.reset();
-        requestBuilder = mTestFramework.mCronetEngine.newUrlRequestBuilder(
-                quicURL, callback, callback.getExecutor());
+        requestBuilder =
+                cronetEngine.newUrlRequestBuilder(quicURL, callback, callback.getExecutor());
         startTime = new Date();
         requestBuilder.build().start();
         callback.blockForDone();
@@ -276,7 +274,7 @@ public class QuicTest extends CronetTestBase {
         assertEquals(RequestFinishedInfo.SUCCEEDED, requestInfo.getFinishedReason());
         MetricsTestUtil.checkNoConnectTiming(requestInfo.getMetrics());
 
-        mTestFramework.mCronetEngine.shutdown();
+        cronetEngine.shutdown();
     }
 
     // Helper method to assert that the request is negotiated over QUIC.