[Cronet] Switch from InstrumentationTest to junit

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

 // Copyright 2015 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.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 /**
  * Tests that directly drive {@code CronetUploadDataStream} and
  * {@code UploadDataProvider} to simulate different ordering of reset, init,
  * read, and rewind calls.
  */
 public class CronetUploadTest extends CronetTestBase {
     private TestDrivenDataProvider mDataProvider;
     private CronetUploadDataStream mUploadDataStream;
     private TestUploadDataStreamHandler mHandler;
 
     @Override
     @SuppressWarnings("PrimitiveArrayPassedToVarargsMethod")
     protected void setUp() throws Exception {
         super.setUp();
-        launchCronetTestApp();
+        startCronetTestFramework();
         ExecutorService executor = Executors.newSingleThreadExecutor();
         List<byte[]> reads = Arrays.asList("hello".getBytes());
         mDataProvider = new TestDrivenDataProvider(executor, reads);
         mUploadDataStream = new CronetUploadDataStream(mDataProvider, executor);
         mHandler = new TestUploadDataStreamHandler(
                 mUploadDataStream.createUploadDataStreamForTesting());
     }
 
     @Override
     protected void tearDown() throws Exception {
@@ skipping 250 matching lines @@
         // will then destroy the CronetUploadDataStreamAdapter.
         mHandler.destroyNativeObjects();
 
         // Signal rewind completes, and wait for init to complete.
         mDataProvider.onRewindSucceeded(mUploadDataStream);
 
         assertEquals(1, mDataProvider.getNumRewindCalls());
         assertEquals(1, mDataProvider.getNumReadCalls());
     }
 }