Convert the rest of chrome_public_test_apk InstrumentationTestCases to JUnit4

chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninHelperTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninHelperTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninHelperTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninHelperTest.java
index 4daac7ab9cdb9561851bb36cf489c5bd04aec812..05ef91ddb4ed0a1ae9c79ebc3b81d7c30dde9cef 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninHelperTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninHelperTest.java
@@ -5,12 +5,18 @@
 package org.chromium.chrome.browser.signin;
 
 import android.accounts.Account;
+import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
-import android.test.InstrumentationTestCase;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.AdvancedMockContext;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.RetryOnFailure;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.browser.signin.MockChangeEventChecker;
 import org.chromium.components.signin.AccountManagerHelper;
 import org.chromium.components.signin.ChromeSigninController;
@@ -20,79 +26,87 @@ import org.chromium.components.signin.test.util.MockAccountManager;
 /**
  * Instrumentation tests for {@link SigninHelper}.
  */
-public class SigninHelperTest extends InstrumentationTestCase {
+@RunWith(ChromeJUnit4ClassRunner.class)
+public class SigninHelperTest {
     private MockAccountManager mAccountManager;
     private AdvancedMockContext mContext;
     private MockChangeEventChecker mEventChecker;
 
-    @Override
+    @Before
     public void setUp() {
-        mContext = new AdvancedMockContext(getInstrumentation().getTargetContext());
+        mContext = new AdvancedMockContext(
+                InstrumentationRegistry.getInstrumentation().getTargetContext());
         mEventChecker = new MockChangeEventChecker();
 
         // Mock out the account manager on the device.
-        mAccountManager = new MockAccountManager(mContext, getInstrumentation().getContext());
+        mAccountManager = new MockAccountManager(
+                mContext, InstrumentationRegistry.getInstrumentation().getContext());
         AccountManagerHelper.overrideAccountManagerHelperForTests(mContext, mAccountManager);
     }
 
+    @Test
     @SmallTest
     @RetryOnFailure
     public void testAccountsChangedPref() {
-        assertEquals("Should never return true before the pref has ever been set.",
-                false, SigninHelper.checkAndClearAccountsChangedPref(mContext));
-        assertEquals("Should never return true before the pref has ever been set.",
-                false, SigninHelper.checkAndClearAccountsChangedPref(mContext));
+        Assert.assertEquals("Should never return true before the pref has ever been set.", false,
+                SigninHelper.checkAndClearAccountsChangedPref(mContext));
+        Assert.assertEquals("Should never return true before the pref has ever been set.", false,
+                SigninHelper.checkAndClearAccountsChangedPref(mContext));
 
         // Mark the pref as set.
         SigninHelper.markAccountsChangedPref(mContext);
 
-        assertEquals("Should return true first time after marking accounts changed",
-                true, SigninHelper.checkAndClearAccountsChangedPref(mContext));
-        assertEquals("Should only return true first time after marking accounts changed",
+        Assert.assertEquals("Should return true first time after marking accounts changed", true,
+                SigninHelper.checkAndClearAccountsChangedPref(mContext));
+        Assert.assertEquals("Should only return true first time after marking accounts changed",
                 false, SigninHelper.checkAndClearAccountsChangedPref(mContext));
-        assertEquals("Should only return true first time after marking accounts changed",
+        Assert.assertEquals("Should only return true first time after marking accounts changed",
                 false, SigninHelper.checkAndClearAccountsChangedPref(mContext));
 
         // Mark the pref as set again.
         SigninHelper.markAccountsChangedPref(mContext);
 
-        assertEquals("Should return true first time after marking accounts changed",
-                true, SigninHelper.checkAndClearAccountsChangedPref(mContext));
-        assertEquals("Should only return true first time after marking accounts changed",
+        Assert.assertEquals("Should return true first time after marking accounts changed", true,
+                SigninHelper.checkAndClearAccountsChangedPref(mContext));
+        Assert.assertEquals("Should only return true first time after marking accounts changed",
                 false, SigninHelper.checkAndClearAccountsChangedPref(mContext));
-        assertEquals("Should only return true first time after marking accounts changed",
+        Assert.assertEquals("Should only return true first time after marking accounts changed",
                 false, SigninHelper.checkAndClearAccountsChangedPref(mContext));
     }
 
+    @Test
     @SmallTest
     @RetryOnFailure
     public void testSimpleAccountRename() {
         setSignedInAccountName("A");
         mEventChecker.insertRenameEvent("A", "B");
         SigninHelper.updateAccountRenameData(mContext, mEventChecker);
-        assertEquals("B", getNewSignedInAccountName());
+        Assert.assertEquals("B", getNewSignedInAccountName());
     }
 
+    @Test
     @DisabledTest(message = "crbug.com/568623")
     @SmallTest
     public void testNotSignedInAccountRename() {
         setSignedInAccountName("A");
         mEventChecker.insertRenameEvent("B", "C");
         SigninHelper.updateAccountRenameData(mContext, mEventChecker);
-        assertEquals(null, getNewSignedInAccountName());
+        Assert.assertEquals(null, getNewSignedInAccountName());
     }
 
+    @Test
     @SmallTest
     public void testSimpleAccountRenameTwice() {
         setSignedInAccountName("A");
         mEventChecker.insertRenameEvent("A", "B");
         SigninHelper.updateAccountRenameData(mContext, mEventChecker);
-        assertEquals("B", getNewSignedInAccountName());
+        Assert.assertEquals("B", getNewSignedInAccountName());
         mEventChecker.insertRenameEvent("B", "C");
         SigninHelper.updateAccountRenameData(mContext, mEventChecker);
-        assertEquals("C", getNewSignedInAccountName());
+        Assert.assertEquals("C", getNewSignedInAccountName());
     }
 
+    @Test
     @SmallTest
     @RetryOnFailure
     public void testNotSignedInAccountRename2() {
@@ -100,9 +114,10 @@ public class SigninHelperTest extends InstrumentationTestCase {
         mEventChecker.insertRenameEvent("B", "C");
         mEventChecker.insertRenameEvent("C", "D");
         SigninHelper.updateAccountRenameData(mContext, mEventChecker);
-        assertEquals(null, getNewSignedInAccountName());
+        Assert.assertEquals(null, getNewSignedInAccountName());
     }
 
+    @Test
     @SmallTest
     @RetryOnFailure
     public void testChainedAccountRename2() {
@@ -113,9 +128,10 @@ public class SigninHelperTest extends InstrumentationTestCase {
         mEventChecker.insertRenameEvent("B", "C");
         mEventChecker.insertRenameEvent("C", "D");
         SigninHelper.updateAccountRenameData(mContext, mEventChecker);
-        assertEquals("D", getNewSignedInAccountName());
+        Assert.assertEquals("D", getNewSignedInAccountName());
     }
 
+    @Test
     @SmallTest
     @RetryOnFailure
     public void testLoopedAccountRename() {
@@ -130,7 +146,7 @@ public class SigninHelperTest extends InstrumentationTestCase {
         AccountHolder accountHolder = AccountHolder.builder(account).build();
         mAccountManager.addAccountHolderExplicitly(accountHolder);
         SigninHelper.updateAccountRenameData(mContext, mEventChecker);
-        assertEquals("D", getNewSignedInAccountName());
+        Assert.assertEquals("D", getNewSignedInAccountName());
     }
 
     private void setSignedInAccountName(String account) {