[Cronet] Switch from InstrumentationTest to junit

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/ChromiumUrlRequestTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/ChromiumUrlRequestTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/ChromiumUrlRequestTest.java
index 2c2219ba50a57a04babb412425234a9ac1eb467b..51dfd0a26ccc10b78b165e7b104afdb27416df70 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/ChromiumUrlRequestTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/ChromiumUrlRequestTest.java
@@ -21,16 +21,15 @@ import java.util.concurrent.Executors;
  * Tests making requests using {@link ChromiumUrlRequest}.
  */
 public class ChromiumUrlRequestTest extends CronetTestBase {
-    private CronetTestActivity mActivity;
+    private CronetTestFramework mTestFramework;
     private TestHttpUrlRequestListener mListener;
     private HttpUrlRequest mRequest;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mActivity = launchCronetTestApp();
-        assertTrue(NativeTestServer.startNativeTestServer(
-                getInstrumentation().getTargetContext()));
+        mTestFramework = startCronetTestFramework();
+        assertTrue(NativeTestServer.startNativeTestServer(getContext()));
         MockUrlRequestJobFactory.setUp();
     }
 
@@ -45,11 +44,8 @@ public class ChromiumUrlRequestTest extends CronetTestBase {
             String url, boolean disableRedirects) {
         HashMap<String, String> headers = new HashMap<String, String>();
         mListener = new TestHttpUrlRequestListener();
-        mRequest = mActivity.mRequestFactory.createRequest(
-                url,
-                HttpUrlRequest.REQUEST_PRIORITY_MEDIUM,
-                headers,
-                mListener);
+        mRequest = mTestFramework.mRequestFactory.createRequest(
+                url, HttpUrlRequest.REQUEST_PRIORITY_MEDIUM, headers, mListener);
         if (disableRedirects) {
             mRequest.disableRedirects();
         }
@@ -240,10 +236,8 @@ public class ChromiumUrlRequestTest extends CronetTestBase {
 
             // Create request.
             final HttpUrlRequest request =
-                    mActivity.mRequestFactory.createRequest(
-                            NativeTestServer.getSuccessURL(),
-                            HttpUrlRequest.REQUEST_PRIORITY_LOW, headers,
-                            channel, listener);
+                    mTestFramework.mRequestFactory.createRequest(NativeTestServer.getSuccessURL(),
+                            HttpUrlRequest.REQUEST_PRIORITY_LOW, headers, channel, listener);
             request.start();
             listener.blockForStart();
             Runnable cancelTask = new Runnable() {
@@ -276,11 +270,8 @@ public class ChromiumUrlRequestTest extends CronetTestBase {
                 repeatCount);
 
         // Create request.
-        final HttpUrlRequest request =
-                mActivity.mRequestFactory.createRequest(
-                        mockUrl,
-                        HttpUrlRequest.REQUEST_PRIORITY_LOW, headers,
-                        channel, listener);
+        final HttpUrlRequest request = mTestFramework.mRequestFactory.createRequest(
+                mockUrl, HttpUrlRequest.REQUEST_PRIORITY_LOW, headers, channel, listener);
         // Channel will cancel the request from the network thread during the
         // first write.
         channel.setRequestToCancelOnWrite(request);