Convert the rest of chrome_public_test_apk InstrumentationTestCases to JUnit4

chrome/android/javatests/src/org/chromium/chrome/browser/tab/TabIdManagerTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/tab/TabIdManagerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/tab/TabIdManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/tab/TabIdManagerTest.java
index f727944d7889cd37087aea8179ca4e7c8a1df8a8..54b2e6927f966d4839db8259cfa2889c2a7782d2 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/tab/TabIdManagerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/tab/TabIdManagerTest.java
@@ -6,24 +6,37 @@ package org.chromium.chrome.browser.tab;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.support.test.InstrumentationRegistry;
+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.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.test.util.AdvancedMockContext;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 
 /** Tests for the TabIdManager. */
-public class TabIdManagerTest extends InstrumentationTestCase {
+@RunWith(ChromeJUnit4ClassRunner.class)
+public class TabIdManagerTest {
     Context mContext;
 
-    @Override
+    @Rule
+    public UiThreadTestRule mRule = new UiThreadTestRule();
+
+    @Before
     public void setUp() throws Exception {
-        super.setUp();
-        mContext = new AdvancedMockContext(getInstrumentation().getTargetContext());
+        mContext = new AdvancedMockContext(
+                InstrumentationRegistry.getInstrumentation().getTargetContext());
     }
 
     /** Tests that IDs are stored and generated properly. */
+    @Test
     @UiThreadTest
     @SmallTest
     public void testBasic() {
@@ -33,13 +46,15 @@ public class TabIdManagerTest extends InstrumentationTestCase {
         editor.apply();
 
         TabIdManager manager = TabIdManager.getInstance(mContext);
-        assertEquals("Wrong Tab ID was generated",
-                11684, manager.generateValidId(Tab.INVALID_TAB_ID));
+        Assert.assertEquals(
+                "Wrong Tab ID was generated", 11684, manager.generateValidId(Tab.INVALID_TAB_ID));
 
-        assertEquals("Wrong next Tab ID", 11685, prefs.getInt(TabIdManager.PREF_NEXT_ID, -1));
+        Assert.assertEquals(
+                "Wrong next Tab ID", 11685, prefs.getInt(TabIdManager.PREF_NEXT_ID, -1));
     }
 
     /** Tests that the max ID is updated properly. */
+    @Test
     @UiThreadTest
     @SmallTest
     public void testIncrementIdCounterTo() {
@@ -49,15 +64,18 @@ public class TabIdManagerTest extends InstrumentationTestCase {
         editor.apply();
 
         TabIdManager manager = TabIdManager.getInstance(mContext);
-        assertEquals("Wrong Tab ID was generated",
-                11684, manager.generateValidId(Tab.INVALID_TAB_ID));
+        Assert.assertEquals(
+                "Wrong Tab ID was generated", 11684, manager.generateValidId(Tab.INVALID_TAB_ID));
 
-        assertEquals("Wrong next Tab ID", 11685, prefs.getInt(TabIdManager.PREF_NEXT_ID, -1));
+        Assert.assertEquals(
+                "Wrong next Tab ID", 11685, prefs.getInt(TabIdManager.PREF_NEXT_ID, -1));
 
         manager.incrementIdCounterTo(100);
-        assertEquals("Didn't stay the same", 11685, prefs.getInt(TabIdManager.PREF_NEXT_ID, -1));
+        Assert.assertEquals(
+                "Didn't stay the same", 11685, prefs.getInt(TabIdManager.PREF_NEXT_ID, -1));
 
         manager.incrementIdCounterTo(1000000);
-        assertEquals("Didn't increase", 1000000, prefs.getInt(TabIdManager.PREF_NEXT_ID, -1));
+        Assert.assertEquals(
+                "Didn't increase", 1000000, prefs.getInt(TabIdManager.PREF_NEXT_ID, -1));
     }
 }