[Cronet] Switch from InstrumentationTest to junit

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/SdchTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/SdchTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/SdchTest.java
index 4b5a689ac18e499fbc4bf1476ea46f003fa58bdb..f7022dcc7c50e9c12a584eb6a5e3fa84e19ff2e4 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/SdchTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/SdchTest.java
@@ -22,7 +22,7 @@ import java.util.Map;
  * Tests Sdch support.
  */
 public class SdchTest extends CronetTestBase {
-    private CronetTestActivity mActivity;
+    private CronetTestFramework mTestFramework;
 
     private enum Sdch {
         ENABLED,
@@ -36,22 +36,22 @@ public class SdchTest extends CronetTestBase {
 
     private void setUp(Sdch setting, Api api) {
         List<String> commandLineArgs = new ArrayList<String>();
-        commandLineArgs.add(CronetTestActivity.CACHE_KEY);
-        commandLineArgs.add(CronetTestActivity.CACHE_DISK);
+        commandLineArgs.add(CronetTestFramework.CACHE_KEY);
+        commandLineArgs.add(CronetTestFramework.CACHE_DISK);
         if (setting == Sdch.ENABLED) {
-            commandLineArgs.add(CronetTestActivity.SDCH_KEY);
-            commandLineArgs.add(CronetTestActivity.SDCH_ENABLE);
+            commandLineArgs.add(CronetTestFramework.SDCH_KEY);
+            commandLineArgs.add(CronetTestFramework.SDCH_ENABLE);
         }
 
         String[] args = new String[commandLineArgs.size()];
-        mActivity =
-                launchCronetTestAppWithUrlAndCommandLineArgs(null, commandLineArgs.toArray(args));
+        mTestFramework = startCronetTestFrameworkWithUrlAndCommandLineArgs(
+                null, commandLineArgs.toArray(args));
         long urlRequestContextAdapter = (api == Api.LEGACY)
-                ? getContextAdapter((ChromiumUrlRequestFactory) mActivity.mRequestFactory)
-                : getContextAdapter((CronetUrlRequestContext) mActivity.mCronetEngine);
+                ? getContextAdapter((ChromiumUrlRequestFactory) mTestFramework.mRequestFactory)
+                : getContextAdapter((CronetUrlRequestContext) mTestFramework.mCronetEngine);
         NativeTestServer.registerHostResolverProc(urlRequestContextAdapter, api == Api.LEGACY);
         // Start NativeTestServer.
-        assertTrue(NativeTestServer.startNativeTestServer(getInstrumentation().getTargetContext()));
+        assertTrue(NativeTestServer.startNativeTestServer(getContext()));
     }
 
     @Override
@@ -66,13 +66,13 @@ public class SdchTest extends CronetTestBase {
         setUp(Sdch.ENABLED, Api.LEGACY);
         String targetUrl = NativeTestServer.getSdchURL() + "/sdch/test";
         long contextAdapter =
-                getContextAdapter((ChromiumUrlRequestFactory) mActivity.mRequestFactory);
+                getContextAdapter((ChromiumUrlRequestFactory) mTestFramework.mRequestFactory);
         DictionaryAddedObserver observer =
                 new DictionaryAddedObserver(targetUrl, contextAdapter, true /** Legacy Api */);
 
         // Make a request to /sdch/index which advertises the dictionary.
         TestHttpUrlRequestListener listener1 =
-                startAndWaitForComplete_LegacyApi(mActivity.mRequestFactory,
+                startAndWaitForComplete_LegacyApi(mTestFramework.mRequestFactory,
                         NativeTestServer.getSdchURL() + "/sdch/index?q=LeQxM80O");
         assertEquals(200, listener1.mHttpStatusCode);
         assertEquals("This is an index page.\n", listener1.mResponseAsString);
@@ -83,7 +83,7 @@ public class SdchTest extends CronetTestBase {
 
         // Make a request to fetch encoded response at /sdch/test.
         TestHttpUrlRequestListener listener2 =
-                startAndWaitForComplete_LegacyApi(mActivity.mRequestFactory, targetUrl);
+                startAndWaitForComplete_LegacyApi(mTestFramework.mRequestFactory, targetUrl);
         assertEquals(200, listener2.mHttpStatusCode);
         assertEquals("The quick brown fox jumps over the lazy dog.\n", listener2.mResponseAsString);
     }
@@ -95,7 +95,7 @@ public class SdchTest extends CronetTestBase {
         // Make a request to /sdch/index.
         // Since Sdch is not enabled, no dictionary should be advertised.
         TestHttpUrlRequestListener listener =
-                startAndWaitForComplete_LegacyApi(mActivity.mRequestFactory,
+                startAndWaitForComplete_LegacyApi(mTestFramework.mRequestFactory,
                         NativeTestServer.getSdchURL() + "/sdch/index?q=LeQxM80O");
         assertEquals(200, listener.mHttpStatusCode);
         assertEquals("This is an index page.\n", listener.mResponseAsString);
@@ -109,7 +109,7 @@ public class SdchTest extends CronetTestBase {
         // Make a request to /sdch/index which advertises a bad dictionary that
         // does not exist.
         TestHttpUrlRequestListener listener1 =
-                startAndWaitForComplete_LegacyApi(mActivity.mRequestFactory,
+                startAndWaitForComplete_LegacyApi(mTestFramework.mRequestFactory,
                         NativeTestServer.getSdchURL() + "/sdch/index?q=NotFound");
         assertEquals(200, listener1.mHttpStatusCode);
         assertEquals("This is an index page.\n", listener1.mResponseAsString);
@@ -118,7 +118,7 @@ public class SdchTest extends CronetTestBase {
 
         // Make a request to fetch /sdch/test, and make sure request succeeds.
         TestHttpUrlRequestListener listener2 = startAndWaitForComplete_LegacyApi(
-                mActivity.mRequestFactory, NativeTestServer.getSdchURL() + "/sdch/test");
+                mTestFramework.mRequestFactory, NativeTestServer.getSdchURL() + "/sdch/test");
         assertEquals(200, listener2.mHttpStatusCode);
         assertEquals("Sdch is not used.\n", listener2.mResponseAsString);
     }
@@ -128,13 +128,14 @@ public class SdchTest extends CronetTestBase {
     public void testSdchEnabled() throws Exception {
         setUp(Sdch.ENABLED, Api.ASYNC);
         String targetUrl = NativeTestServer.getSdchURL() + "/sdch/test";
-        long contextAdapter = getContextAdapter((CronetUrlRequestContext) mActivity.mCronetEngine);
+        long contextAdapter =
+                getContextAdapter((CronetUrlRequestContext) mTestFramework.mCronetEngine);
         DictionaryAddedObserver observer =
                 new DictionaryAddedObserver(targetUrl, contextAdapter, false /** Legacy Api */);
 
         // Make a request to /sdch which advertises the dictionary.
-        TestUrlRequestListener listener1 = startAndWaitForComplete(
-                mActivity.mCronetEngine, NativeTestServer.getSdchURL() + "/sdch/index?q=LeQxM80O");
+        TestUrlRequestListener listener1 = startAndWaitForComplete(mTestFramework.mCronetEngine,
+                NativeTestServer.getSdchURL() + "/sdch/index?q=LeQxM80O");
         assertEquals(200, listener1.mResponseInfo.getHttpStatusCode());
         assertEquals("This is an index page.\n", listener1.mResponseAsString);
         assertEquals(Arrays.asList("/sdch/dict/LeQxM80O"),
@@ -144,7 +145,7 @@ public class SdchTest extends CronetTestBase {
 
         // Make a request to fetch encoded response at /sdch/test.
         TestUrlRequestListener listener2 =
-                startAndWaitForComplete(mActivity.mCronetEngine, targetUrl);
+                startAndWaitForComplete(mTestFramework.mCronetEngine, targetUrl);
         assertEquals(200, listener2.mResponseInfo.getHttpStatusCode());
         assertEquals("The quick brown fox jumps over the lazy dog.\n", listener2.mResponseAsString);
 
@@ -152,7 +153,7 @@ public class SdchTest extends CronetTestBase {
         // calling shutdown on the CronetEngine.
         // TODO(xunjieli): Remove once crbug.com/486120 is fixed.
         Thread.sleep(5000);
-        mActivity.mCronetEngine.shutdown();
+        mTestFramework.mCronetEngine.shutdown();
 
         // Shutting down the context will make JsonPrefStore to flush pending
         // writes to disk.
@@ -161,7 +162,7 @@ public class SdchTest extends CronetTestBase {
 
         // Test persistence.
         CronetUrlRequestContext newContext =
-                new CronetUrlRequestContext(mActivity.getCronetEngineBuilder());
+                new CronetUrlRequestContext(mTestFramework.getCronetEngineBuilder());
 
         long newContextAdapter = getContextAdapter(newContext);
         NativeTestServer.registerHostResolverProc(newContextAdapter, false);
@@ -181,8 +182,8 @@ public class SdchTest extends CronetTestBase {
         setUp(Sdch.DISABLED, Api.ASYNC);
         // Make a request to /sdch.
         // Since Sdch is not enabled, no dictionary should be advertised.
-        TestUrlRequestListener listener = startAndWaitForComplete(
-                mActivity.mCronetEngine, NativeTestServer.getSdchURL() + "/sdch/index?q=LeQxM80O");
+        TestUrlRequestListener listener = startAndWaitForComplete(mTestFramework.mCronetEngine,
+                NativeTestServer.getSdchURL() + "/sdch/index?q=LeQxM80O");
         assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
         assertEquals("This is an index page.\n", listener.mResponseAsString);
         assertEquals(null, listener.mResponseInfo.getAllHeaders().get("Get-Dictionary"));
@@ -194,8 +195,8 @@ public class SdchTest extends CronetTestBase {
         setUp(Sdch.ENABLED, Api.ASYNC);
         // Make a request to /sdch/index which advertises a bad dictionary that
         // does not exist.
-        TestUrlRequestListener listener1 = startAndWaitForComplete(
-                mActivity.mCronetEngine, NativeTestServer.getSdchURL() + "/sdch/index?q=NotFound");
+        TestUrlRequestListener listener1 = startAndWaitForComplete(mTestFramework.mCronetEngine,
+                NativeTestServer.getSdchURL() + "/sdch/index?q=NotFound");
         assertEquals(200, listener1.mResponseInfo.getHttpStatusCode());
         assertEquals("This is an index page.\n", listener1.mResponseAsString);
         assertEquals(Arrays.asList("/sdch/dict/NotFound"),
@@ -203,7 +204,7 @@ public class SdchTest extends CronetTestBase {
 
         // Make a request to fetch /sdch/test, and make sure Sdch encoding is not used.
         TestUrlRequestListener listener2 = startAndWaitForComplete(
-                mActivity.mCronetEngine, NativeTestServer.getSdchURL() + "/sdch/test");
+                mTestFramework.mCronetEngine, NativeTestServer.getSdchURL() + "/sdch/test");
         assertEquals(200, listener2.mResponseInfo.getHttpStatusCode());
         assertEquals("Sdch is not used.\n", listener2.mResponseAsString);
     }
@@ -259,8 +260,8 @@ public class SdchTest extends CronetTestBase {
 
     // Returns whether a file contains a particular string.
     private boolean fileContainsString(String filename, String content) throws IOException {
-        BufferedReader reader =
-                new BufferedReader(new FileReader(mActivity.getTestStorage() + "/" + filename));
+        BufferedReader reader = new BufferedReader(
+                new FileReader(mTestFramework.getTestStorage() + "/" + filename));
         String line;
         while ((line = reader.readLine()) != null) {
             if (line.contains(content)) {