Convert the rest of chrome_public_test_apk InstrumentationTestCases to JUnit4

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceTest.java
index fbd0d71a923b936d267691f3229d1173c728ab2e..911cfa438d15772d9bf01cc2ac590e8fb8c73353 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceTest.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.Feature;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.components.signin.AccountManagerHelper;
 import org.chromium.components.signin.test.util.AccountHolder;
 import org.chromium.components.signin.test.util.MockAccountManager;
@@ -19,18 +25,18 @@ import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
 /** Tests for OAuth2TokenService. */
-public class OAuth2TokenServiceTest extends InstrumentationTestCase {
-
+@RunWith(ChromeJUnit4ClassRunner.class)
+public class OAuth2TokenServiceTest {
     private AdvancedMockContext mContext;
     private MockAccountManager mAccountManager;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
+    @Before
+    public void setUp() throws Exception {
         // Mock out the account manager on the device.
-        mContext = new AdvancedMockContext(getInstrumentation().getTargetContext());
-        mAccountManager = new MockAccountManager(mContext, getInstrumentation().getContext());
+        mContext = new AdvancedMockContext(
+                InstrumentationRegistry.getInstrumentation().getTargetContext());
+        mAccountManager = new MockAccountManager(
+                mContext, InstrumentationRegistry.getInstrumentation().getContext());
         AccountManagerHelper.overrideAccountManagerHelperForTests(mContext, mAccountManager);
     }
 
@@ -38,14 +44,16 @@ public class OAuth2TokenServiceTest extends InstrumentationTestCase {
      *  @SmallTest
      *  @Feature({"Sync"})
      */
+    @Test
     @DisabledTest(message = "crbug.com/533417")
     public void testGetAccountsNoAccountsRegistered() {
         String[] accounts = OAuth2TokenService.getAccounts(mContext);
-        assertEquals("There should be no accounts registered", 0, accounts.length);
+        Assert.assertEquals("There should be no accounts registered", 0, accounts.length);
     }
 
     /*@SmallTest
     @Feature({"Sync"})*/
+    @Test
     @DisabledTest(message = "crbug.com/527852")
     public void testGetAccountsOneAccountRegistered() {
         Account account1 = AccountManagerHelper.createAccountFromName("foo@gmail.com");
@@ -53,15 +61,16 @@ public class OAuth2TokenServiceTest extends InstrumentationTestCase {
         mAccountManager.addAccountHolderExplicitly(accountHolder1);
 
         String[] sysAccounts = OAuth2TokenService.getSystemAccountNames(mContext);
-        assertEquals("There should be one registered account", 1, sysAccounts.length);
-        assertEquals("The account should be " + account1, account1.name, sysAccounts[0]);
+        Assert.assertEquals("There should be one registered account", 1, sysAccounts.length);
+        Assert.assertEquals("The account should be " + account1, account1.name, sysAccounts[0]);
 
         String[] accounts = OAuth2TokenService.getAccounts(mContext);
-        assertEquals("There should be zero registered account", 0, accounts.length);
+        Assert.assertEquals("There should be zero registered account", 0, accounts.length);
     }
 
     /*@SmallTest
     @Feature({"Sync"})*/
+    @Test
     @DisabledTest(message = "crbug.com/527852")
     public void testGetAccountsTwoAccountsRegistered() {
         Account account1 = AccountManagerHelper.createAccountFromName("foo@gmail.com");
@@ -72,16 +81,17 @@ public class OAuth2TokenServiceTest extends InstrumentationTestCase {
         mAccountManager.addAccountHolderExplicitly(accountHolder2);
 
         String[] sysAccounts = OAuth2TokenService.getSystemAccountNames(mContext);
-        assertEquals("There should be one registered account", 2, sysAccounts.length);
-        assertTrue("The list should contain " + account1,
+        Assert.assertEquals("There should be one registered account", 2, sysAccounts.length);
+        Assert.assertTrue("The list should contain " + account1,
                 Arrays.asList(sysAccounts).contains(account1.name));
-        assertTrue("The list should contain " + account2,
+        Assert.assertTrue("The list should contain " + account2,
                 Arrays.asList(sysAccounts).contains(account2.name));
 
         String[] accounts = OAuth2TokenService.getAccounts(mContext);
-        assertEquals("There should be zero registered account", 0, accounts.length);
+        Assert.assertEquals("There should be zero registered account", 0, accounts.length);
     }
 
+    @Test
     @DisabledTest(message = "crbug.com/568620")
     @SmallTest
     @Feature({"Sync"})
@@ -93,6 +103,7 @@ public class OAuth2TokenServiceTest extends InstrumentationTestCase {
 
     /*@SmallTest
     @Feature({"Sync"})*/
+    @Test
     @DisabledTest(message = "crbug.com/527852")
     public void testGetOAuth2AccessTokenWithTimeoutOnError() {
         String authToken = null;
@@ -114,6 +125,6 @@ public class OAuth2TokenServiceTest extends InstrumentationTestCase {
 
         String accessToken = OAuth2TokenService.getOAuth2AccessTokenWithTimeout(
                 mContext, account, scope, 5, TimeUnit.SECONDS);
-        assertEquals(expectedToken, accessToken);
+        Assert.assertEquals(expectedToken, accessToken);
     }
 }