[Cronet] Test the libcronet that's shipped, not libcronet_test

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTest.java
index c66b4fdbe24289e177b1d027a935970b75d76648..f55ef28998a401efb0841f05d20e3e31bacb4403 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTest.java
@@ -9,6 +9,7 @@ import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.test.util.Feature;
+import org.chromium.net.CronetEngine;
 import org.chromium.net.CronetTestBase;
 import org.chromium.net.CronetTestFramework;
 import org.chromium.net.MockUrlRequestJobFactory;
@@ -41,6 +42,7 @@ import java.util.regex.Pattern;
  * See {@link CronetTestBase#runTest()} for details.
  */
 public class CronetHttpURLConnectionTest extends CronetTestBase {
+    private CronetEngine mCronetEngine;
 
     @Override
     protected void setUp() throws Exception {
@@ -50,7 +52,8 @@ public class CronetHttpURLConnectionTest extends CronetTestBase {
                 CronetTestFramework.LIBRARY_INIT_KEY,
                 CronetTestFramework.LibraryInitType.HTTP_URL_CONNECTION,
         };
-        startCronetTestFrameworkWithUrlAndCommandLineArgs(null, commandLineArgs);
+        mCronetEngine = startCronetTestFrameworkWithUrlAndCommandLineArgs(null,
+                commandLineArgs).mCronetEngine;
         assertTrue(NativeTestServer.startNativeTestServer(getContext()));
     }
 
@@ -109,7 +112,8 @@ public class CronetHttpURLConnectionTest extends CronetTestBase {
     @OnlyRunCronetHttpURLConnection
     public void testReadTimeout() throws Exception {
         // Add url interceptors.
-        MockUrlRequestJobFactory.setUp();
+        MockUrlRequestJobFactory mockUrlRequestJobFactory =
+                new MockUrlRequestJobFactory(mCronetEngine);
         URL url = new URL(MockUrlRequestJobFactory.getMockUrlForHangingRead());
         HttpURLConnection connection = (HttpURLConnection) url.openConnection();
         connection.setReadTimeout(1000);
@@ -121,6 +125,7 @@ public class CronetHttpURLConnectionTest extends CronetTestBase {
         } catch (SocketTimeoutException e) {
             // Expected
         }
+        mockUrlRequestJobFactory.shutdown();
     }
 
     @SmallTest
@@ -707,7 +712,8 @@ public class CronetHttpURLConnectionTest extends CronetTestBase {
         String data = "MyBigFunkyData";
         int dataLength = data.length();
         int repeatCount = 100000;
-        MockUrlRequestJobFactory.setUp();
+        MockUrlRequestJobFactory mockUrlRequestJobFactory =
+                new MockUrlRequestJobFactory(mCronetEngine);
         URL url = new URL(MockUrlRequestJobFactory.getMockUrlForData(data, repeatCount));
         HttpURLConnection connection =
                 (HttpURLConnection) url.openConnection();
@@ -738,6 +744,7 @@ public class CronetHttpURLConnectionTest extends CronetTestBase {
         }
         assertEquals(200, connection.getResponseCode());
         assertEquals("OK", connection.getResponseMessage());
+        mockUrlRequestJobFactory.shutdown();
     }
 
     @SmallTest