Convert the rest of chrome_public_test_apk InstrumentationTestCases to JUnit4

chrome/android/javatests/src/org/chromium/chrome/browser/banners/InstallerDelegateTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/banners/InstallerDelegateTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/banners/InstallerDelegateTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/banners/InstallerDelegateTest.java
index 4d207506746c18eb6081d5d321d34e950fb1e06b..e64a9c3b92af8a822fd8d54f38e3de9f95b9a6c8 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/banners/InstallerDelegateTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/banners/InstallerDelegateTest.java
@@ -7,9 +7,15 @@ package org.chromium.chrome.browser.banners;
 import android.content.pm.PackageInfo;
 import android.os.HandlerThread;
 import android.support.test.filters.SmallTest;
-import android.test.InstrumentationTestCase;
 import android.test.mock.MockPackageManager;
 
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
@@ -18,8 +24,8 @@ import org.chromium.content.browser.test.util.CriteriaHelper;
  * Tests the InstallerDelegate to make sure that it functions correctly and responds to changes
  * in the PackageManager.
  */
-public class InstallerDelegateTest extends InstrumentationTestCase
-        implements InstallerDelegate.Observer{
+@RunWith(BaseJUnit4ClassRunner.class)
+public class InstallerDelegateTest implements InstallerDelegate.Observer {
     private static final String MOCK_PACKAGE_NAME = "mock.package.name";
 
     /**
@@ -55,13 +61,11 @@ public class InstallerDelegateTest extends InstrumentationTestCase
         mResultDelegate = delegate;
         mResultSuccess = success;
         mResultFinished = true;
-        assertTrue(mInstallStarted);
+        Assert.assertTrue(mInstallStarted);
     }
 
-    @Override
+    @Before
     public void setUp() throws Exception {
-        super.setUp();
-
         mPackageManager = new TestPackageManager();
 
         // Create a thread for the InstallerDelegate to run on.  We need this thread because the
@@ -77,10 +81,9 @@ public class InstallerDelegateTest extends InstrumentationTestCase
         mResultFinished = false;
     }
 
-    @Override
+    @After
     public void tearDown() throws Exception {
         mThread.quit();
-        super.tearDown();
     }
 
     private void startMonitoring() {
@@ -96,22 +99,23 @@ public class InstallerDelegateTest extends InstrumentationTestCase
             }
         });
 
-        assertEquals(expectedResult, mResultSuccess);
-        assertEquals(mTestDelegate, mResultDelegate);
+        Assert.assertEquals(expectedResult, mResultSuccess);
+        Assert.assertEquals(mTestDelegate, mResultDelegate);
     }
 
     /**
      * Tests what happens when the InstallerDelegate detects that the package has successfully
      * been installed.
      */
+    @Test
     @SmallTest
     public void testInstallSuccessful() {
         mTestDelegate.setTimingForTests(1, 5000);
         startMonitoring();
 
-        assertFalse(mResultSuccess);
-        assertNull(mResultDelegate);
-        assertFalse(mResultFinished);
+        Assert.assertFalse(mResultSuccess);
+        Assert.assertNull(mResultDelegate);
+        Assert.assertFalse(mResultFinished);
 
         mPackageManager.isInstalled = true;
         checkResults(true);
@@ -120,14 +124,15 @@ public class InstallerDelegateTest extends InstrumentationTestCase
     /**
      * Tests what happens when the InstallerDelegate task is canceled.
      */
+    @Test
     @SmallTest
     public void testInstallWaitUntilCancel() {
         mTestDelegate.setTimingForTests(1, 5000);
         startMonitoring();
 
-        assertFalse(mResultSuccess);
-        assertNull(mResultDelegate);
-        assertFalse(mResultFinished);
+        Assert.assertFalse(mResultSuccess);
+        Assert.assertNull(mResultDelegate);
+        Assert.assertFalse(mResultFinished);
 
         mTestDelegate.cancel();
         checkResults(false);
@@ -136,6 +141,7 @@ public class InstallerDelegateTest extends InstrumentationTestCase
     /**
      * Tests what happens when the InstallerDelegate times out.
      */
+    @Test
     @SmallTest
     public void testInstallTimeout() {
         mTestDelegate.setTimingForTests(1, 50);
@@ -146,6 +152,7 @@ public class InstallerDelegateTest extends InstrumentationTestCase
     /**
      * Makes sure that the runnable isn't called until returning from start().
      */
+    @Test
     @SmallTest
     @RetryOnFailure
     public void testRunnableRaceCondition() {