[Cronet] Switch from InstrumentationTest to junit

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/UploadTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/UploadTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/UploadTest.java
index ac6a77f8d342dd13683316851ec7d58f6c4cef14..75345bcf05223af9d19b8b64f803412dd42911fe 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/UploadTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/UploadTest.java
@@ -24,21 +24,20 @@ public class UploadTest extends CronetTestBase {
     private static final String UPLOAD_DATA = "Nifty upload data!";
     private static final String UPLOAD_CHANNEL_DATA = "Upload channel data";
 
-    private CronetTestActivity mActivity;
+    private CronetTestFramework mTestFramework;
 
     // @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mActivity = launchCronetTestApp();
-        assertNotNull(mActivity);
-        assertTrue(NativeTestServer.startNativeTestServer(
-                getInstrumentation().getTargetContext()));
+        mTestFramework = startCronetTestFramework();
+        assertNotNull(mTestFramework);
+        assertTrue(NativeTestServer.startNativeTestServer(getContext()));
     }
 
     private HttpUrlRequest createRequest(
             String url, HttpUrlRequestListener listener) {
         HashMap<String, String> headers = new HashMap<String, String>();
-        return mActivity.mRequestFactory.createRequest(
+        return mTestFramework.mRequestFactory.createRequest(
                 url, HttpUrlRequest.REQUEST_PRIORITY_MEDIUM, headers, listener);
     }