[Cronet] Switch from InstrumentationTest to junit

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.net;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
 import java.util.HashMap;
 import java.util.concurrent.Executors;
 
 /**
  * Test fixture to test upload APIs.  Uses an in-process test server.
  */
 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);
     }
 
     /**
      * Sets request to have an upload channel containing the given data.
      * uploadDataLength should generally be uploadData.length(), unless a test
      * needs to get a read error.
      */
     private void setUploadChannel(HttpUrlRequest request,
                                   String contentType,
@@ skipping 287 matching lines @@
         // Upload a single empty chunk.
         ByteBuffer byteBuffer = ByteBuffer.allocateDirect(0);
         request.appendChunk(byteBuffer, true);
 
         listener.blockForComplete();
 
         assertEquals(200, listener.mHttpStatusCode);
         assertEquals("", listener.mResponseAsString);
     }
 }