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

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java
index b293107b28c92f997ba1237337a5874a9da19d93..fbf93c461da766f9ef424bc0e522146cacaa65c8 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java
@@ -39,6 +39,7 @@ public class CronetUrlRequestTest extends CronetTestBase {
     private static final String TEST_URL = "http://127.0.0.1:8000";
 
     private CronetTestFramework mTestFramework;
+    private MockUrlRequestJobFactory mMockUrlRequestJobFactory;
 
     @Override
     protected void setUp() throws Exception {
@@ -46,11 +47,12 @@ public class CronetUrlRequestTest extends CronetTestBase {
         mTestFramework = startCronetTestFramework();
         assertTrue(NativeTestServer.startNativeTestServer(getContext()));
         // Add url interceptors after native application context is initialized.
-        MockUrlRequestJobFactory.setUp();
+        mMockUrlRequestJobFactory = new MockUrlRequestJobFactory(mTestFramework.mCronetEngine);

[mef, 2016/11/16 20:01:27]

Hrm, how would this work if mTestFramework.mCronetEngine is JavaCronetEngine?

[pauljensen, 2016/11/18 18:12:10]

It won't; it'll get a ClassCastException trying to cast JavaCronetEngine to
CronetUrlRequestContext.  For better or worse we only run setUp() once prior to
running our tests with the native impl and then the Java impl.

[mef, 2016/11/18 21:45:50]

Acknowledged.

     }
 
     @Override
     protected void tearDown() throws Exception {
+        mMockUrlRequestJobFactory.shutdown();
         NativeTestServer.shutdownNativeTestServer();
         mTestFramework.mCronetEngine.shutdown();
         super.tearDown();