[Cronet] Switch from InstrumentationTest to junit

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/HistogramManagerTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/HistogramManagerTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/HistogramManagerTest.java
index 30f81476730a54d24d8c53c867646ab0022ea36e..3e18a9b879e288fe173eff1289766b956a26d38e 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/HistogramManagerTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/HistogramManagerTest.java
@@ -17,20 +17,20 @@ public class HistogramManagerTest extends CronetTestBase {
     // URLs used for tests.
     private static final String TEST_URL = "http://127.0.0.1:8000";
 
-    CronetTestActivity mActivity;
+    CronetTestFramework mTestFramework;
 
     @SmallTest
     @Feature({"Cronet"})
     public void testHistogramManager() throws Exception {
-        mActivity = launchCronetTestApp();
-        byte delta1[] = mActivity.mHistogramManager.getHistogramDeltas();
+        mTestFramework = startCronetTestFramework();
+        byte delta1[] = mTestFramework.mHistogramManager.getHistogramDeltas();
 
         TestUrlRequestListener listener = new TestUrlRequestListener();
         UrlRequest.Builder builder = new UrlRequest.Builder(
-                TEST_URL, listener, listener.getExecutor(), mActivity.mCronetEngine);
+                TEST_URL, listener, listener.getExecutor(), mTestFramework.mCronetEngine);
         builder.build().start();
         listener.blockForDone();
-        byte delta2[] = mActivity.mHistogramManager.getHistogramDeltas();
+        byte delta2[] = mTestFramework.mHistogramManager.getHistogramDeltas();
         assertTrue(delta2.length != 0);
         assertFalse(Arrays.equals(delta1, delta2));
     }