Convert the rest of chrome_public_test_apk InstrumentationTestCases to JUnit4

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/AsyncTabCreationParamsManagerTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/AsyncTabCreationParamsManagerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/AsyncTabCreationParamsManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/AsyncTabCreationParamsManagerTest.java
index dccc98d1d88b755dce7ce743b0da473cbb6dee83..088f155b602349b4dd482d7dc9d7a0ebaef9dba2 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/AsyncTabCreationParamsManagerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/AsyncTabCreationParamsManagerTest.java
@@ -4,17 +4,28 @@
 
 package org.chromium.chrome.browser.tabmodel;
 
+import android.support.test.annotation.UiThreadTest;
 import android.support.test.filters.SmallTest;
-import android.test.InstrumentationTestCase;
-import android.test.UiThreadTest;
+import android.support.test.rule.UiThreadTestRule;
+
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.chromium.chrome.browser.tabmodel.document.AsyncTabCreationParams;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.content_public.browser.LoadUrlParams;
 
 /**
  * Tests that the AsyncTabCreationParamsManager works as expected.
  */
-public class AsyncTabCreationParamsManagerTest extends InstrumentationTestCase {
+@RunWith(ChromeJUnit4ClassRunner.class)
+public class AsyncTabCreationParamsManagerTest {
+    @Rule
+    public UiThreadTestRule mRule = new UiThreadTestRule();
+
+    @Test
     @SmallTest
     @UiThreadTest
     public void testBasicAddingAndRemoval() throws Exception {
@@ -23,9 +34,10 @@ public class AsyncTabCreationParamsManagerTest extends InstrumentationTestCase {
         AsyncTabParamsManager.add(11684, asyncParams);
 
         AsyncTabParams retrievedParams = AsyncTabParamsManager.remove(11684);
-        assertEquals("Removed incorrect parameters from the map", asyncParams, retrievedParams);
+        Assert.assertEquals(
+                "Removed incorrect parameters from the map", asyncParams, retrievedParams);
 
         AsyncTabParams failedParams = AsyncTabParamsManager.remove(11684);
-        assertNull("Removed same parameters twice", failedParams);
+        Assert.assertNull("Removed same parameters twice", failedParams);
     }
-}
+}