Revert of Convert ChromeActivityTestCaseBase direct children to JUnit4

chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImplTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImplTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImplTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImplTest.java
index eb51fff92e6342c515108f844acfc8f782fba650..a9094d86a18b1cd08a9f22b7c17a35b96618f365 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImplTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImplTest.java
@@ -9,18 +9,9 @@
 import android.content.pm.ResolveInfo;
 import android.support.test.filters.SmallTest;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.chrome.browser.ChromeActivity;
-import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.instantapps.InstantAppsHandler;
-import org.chromium.chrome.test.ChromeActivityTestRule;
-import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29,43 +20,34 @@
 /**
  * Instrumentation tests for {@link ExternalNavigationHandler}.
  */
-@RunWith(ChromeJUnit4ClassRunner.class)
-@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
-        ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG})
-public class ExternalNavigationDelegateImplTest {
-    @Rule
-    public ChromeActivityTestRule<ChromeActivity> mActivityTestRule =
-            new ChromeActivityTestRule<>(ChromeActivity.class);
+public class ExternalNavigationDelegateImplTest extends ChromeActivityTestCaseBase<ChromeActivity> {
+
+    public ExternalNavigationDelegateImplTest() {
+        super(ChromeActivity.class);
+    }
 
     private static List<ResolveInfo> makeResolveInfos(ResolveInfo... infos) {
         return Arrays.asList(infos);
     }
 
-    @Test
     @SmallTest
     public void testIsPackageSpecializedHandler_NoResolveInfo() {
         String packageName = "";
         List<ResolveInfo> resolveInfos = new ArrayList<ResolveInfo>();
-        Assert.assertEquals(0,
-                ExternalNavigationDelegateImpl
-                        .getSpecializedHandlersWithFilter(resolveInfos, packageName)
-                        .size());
+        assertEquals(0, ExternalNavigationDelegateImpl.getSpecializedHandlersWithFilter(
+                                resolveInfos, packageName).size());
     }
 
-    @Test
     @SmallTest
     public void testIsPackageSpecializedHandler_NoPathOrAuthority() {
         String packageName = "";
         ResolveInfo info = new ResolveInfo();
         info.filter = new IntentFilter();
         List<ResolveInfo> resolveInfos = makeResolveInfos(info);
-        Assert.assertEquals(0,
-                ExternalNavigationDelegateImpl
-                        .getSpecializedHandlersWithFilter(resolveInfos, packageName)
-                        .size());
+        assertEquals(0, ExternalNavigationDelegateImpl.getSpecializedHandlersWithFilter(
+                                resolveInfos, packageName).size());
     }
 
-    @Test
     @SmallTest
     public void testIsPackageSpecializedHandler_WithPath() {
         String packageName = "";
@@ -73,13 +55,10 @@
         info.filter = new IntentFilter();
         info.filter.addDataPath("somepath", 2);
         List<ResolveInfo> resolveInfos = makeResolveInfos(info);
-        Assert.assertEquals(1,
-                ExternalNavigationDelegateImpl
-                        .getSpecializedHandlersWithFilter(resolveInfos, packageName)
-                        .size());
+        assertEquals(1, ExternalNavigationDelegateImpl.getSpecializedHandlersWithFilter(
+                                resolveInfos, packageName).size());
     }
 
-    @Test
     @SmallTest
     public void testIsPackageSpecializedHandler_WithAuthority() {
         String packageName = "";
@@ -87,13 +66,10 @@
         info.filter = new IntentFilter();
         info.filter.addDataAuthority("http://www.google.com", "80");
         List<ResolveInfo> resolveInfos = makeResolveInfos(info);
-        Assert.assertEquals(1,
-                ExternalNavigationDelegateImpl
-                        .getSpecializedHandlersWithFilter(resolveInfos, packageName)
-                        .size());
+        assertEquals(1, ExternalNavigationDelegateImpl.getSpecializedHandlersWithFilter(
+                                resolveInfos, packageName).size());
     }
 
-    @Test
     @SmallTest
     public void testIsPackageSpecializedHandler_WithTargetPackage_Matching() {
         String packageName = "com.android.chrome";
@@ -103,13 +79,10 @@
         info.activityInfo = new ActivityInfo();
         info.activityInfo.packageName = packageName;
         List<ResolveInfo> resolveInfos = makeResolveInfos(info);
-        Assert.assertEquals(1,
-                ExternalNavigationDelegateImpl
-                        .getSpecializedHandlersWithFilter(resolveInfos, packageName)
-                        .size());
+        assertEquals(1, ExternalNavigationDelegateImpl.getSpecializedHandlersWithFilter(
+                                resolveInfos, packageName).size());
     }
 
-    @Test
     @SmallTest
     public void testIsPackageSpecializedHandler_WithTargetPackage_NotMatching() {
         String packageName = "com.android.chrome";
@@ -119,13 +92,10 @@
         info.activityInfo = new ActivityInfo();
         info.activityInfo.packageName = "com.foo.bar";
         List<ResolveInfo> resolveInfos = makeResolveInfos(info);
-        Assert.assertEquals(0,
-                ExternalNavigationDelegateImpl
-                        .getSpecializedHandlersWithFilter(resolveInfos, packageName)
-                        .size());
+        assertEquals(0, ExternalNavigationDelegateImpl.getSpecializedHandlersWithFilter(
+                                resolveInfos, packageName).size());
     }
 
-    @Test
     @SmallTest
     public void testIsPackageSpecializeHandler_withEphemeralResolver() {
         String packageName = "";
@@ -137,31 +107,28 @@
         info.activityInfo.packageName = "com.google.android.gms";
         List<ResolveInfo> resolveInfos = makeResolveInfos(info);
         // Ephemeral resolver is not counted as a specialized handler.
-        Assert.assertEquals(0,
-                ExternalNavigationDelegateImpl
-                        .getSpecializedHandlersWithFilter(resolveInfos, packageName)
-                        .size());
+        assertEquals(0, ExternalNavigationDelegateImpl.getSpecializedHandlersWithFilter(
+                resolveInfos, packageName).size());
     }
 
-    @Test
     @SmallTest
     public void testIsDownload_noSystemDownloadManager() throws Exception {
         ExternalNavigationDelegateImpl delegate = new ExternalNavigationDelegateImpl(
-                mActivityTestRule.getActivity().getActivityTab());
-        Assert.assertTrue("pdf should be a download, no viewer in Android Chrome",
+                getActivity().getActivityTab());
+        assertTrue("pdf should be a download, no viewer in Android Chrome",
                 delegate.isPdfDownload("http://somesampeleurldne.com/file.pdf"));
-        Assert.assertFalse("URL is not a file, but web page",
+        assertFalse("URL is not a file, but web page",
                 delegate.isPdfDownload("http://somesampleurldne.com/index.html"));
-        Assert.assertFalse("URL is not a file url",
+        assertFalse("URL is not a file url",
                 delegate.isPdfDownload("http://somesampeleurldne.com/not.a.real.extension"));
-        Assert.assertFalse("URL is an image, can be viewed in Chrome",
+        assertFalse("URL is an image, can be viewed in Chrome",
                 delegate.isPdfDownload("http://somesampleurldne.com/image.jpg"));
-        Assert.assertFalse("URL is a text file can be viewed in Chrome",
+        assertFalse("URL is a text file can be viewed in Chrome",
                 delegate.isPdfDownload("http://somesampleurldne.com/copy.txt"));
     }
 
-    @Before
-    public void setUp() throws InterruptedException {
-        mActivityTestRule.startMainActivityOnBlankPage();
+    @Override
+    public void startMainActivity() throws InterruptedException {
+        startMainActivityOnBlankPage();
     }
 }