Convert ChromeActivityTestCaseBase direct children to JUnit4

chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/ChromeBrowserSyncAdapterTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/ChromeBrowserSyncAdapterTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/ChromeBrowserSyncAdapterTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/ChromeBrowserSyncAdapterTest.java
index 80b64f1d6b2fe2c076da8f374ddea4983a9529ca..a58bf2f9f64d3fc8ad1ab4866fa6315559aef36d 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/ChromeBrowserSyncAdapterTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/ChromeBrowserSyncAdapterTest.java
@@ -12,15 +12,25 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SyncResult;
 import android.os.Bundle;
+import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.MediumTest;
 
+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.ApplicationStatus;
 import org.chromium.base.CommandLine;
+import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.base.test.util.ScalableTimeout;
 import org.chromium.chrome.browser.ChromeActivity;
-import org.chromium.chrome.test.ChromeActivityTestCaseBase;
+import org.chromium.chrome.browser.ChromeSwitches;
+import org.chromium.chrome.test.ChromeActivityTestRule;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.components.invalidation.PendingInvalidation;
 import org.chromium.components.signin.AccountManagerHelper;
 import org.chromium.components.sync.AndroidSyncSettings;
@@ -30,7 +40,14 @@ import org.chromium.content.browser.test.util.CriteriaHelper;
 /**
  * Tests for ChromeBrowserSyncAdapter.
  */
-public class ChromeBrowserSyncAdapterTest extends ChromeActivityTestCaseBase<ChromeActivity> {
+@RunWith(ChromeJUnit4ClassRunner.class)
+@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
+        ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG})
+public class ChromeBrowserSyncAdapterTest {
+    @Rule
+    public ChromeActivityTestRule<ChromeActivity> mActivityTestRule =
+            new ChromeActivityTestRule<>(ChromeActivity.class);
+
     private static final Account TEST_ACCOUNT =
             AccountManagerHelper.createAccountFromName("test@gmail.com");
     private static final long WAIT_FOR_LAUNCHER_MS = ScalableTimeout.scaleTimeout(10 * 1000);
@@ -65,25 +82,18 @@ public class ChromeBrowserSyncAdapterTest extends ChromeActivityTestCaseBase<Chr
         }
     }
 
-    public ChromeBrowserSyncAdapterTest() {
-        super(ChromeActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mSyncAdapter = new TestSyncAdapter(
-                getInstrumentation().getTargetContext(), getActivity().getApplication());
-    }
-
-    @Override
-    public void startMainActivity() throws InterruptedException {
-        startMainActivityOnBlankPage();
+    @Before
+    public void setUp() throws Exception {
+        mActivityTestRule.startMainActivityOnBlankPage();
+        mSyncAdapter =
+                new TestSyncAdapter(InstrumentationRegistry.getInstrumentation().getTargetContext(),
+                        mActivityTestRule.getActivity().getApplication());
     }
 
     private void performSyncWithBundle(Bundle bundle) {
         mSyncAdapter.onPerformSync(TEST_ACCOUNT, bundle,
-                AndroidSyncSettings.getContractAuthority(getActivity()), null, new SyncResult());
+                AndroidSyncSettings.getContractAuthority(mActivityTestRule.getActivity()), null,
+                new SyncResult());
     }
 
     private void sendChromeToBackground(Activity activity) {
@@ -103,16 +113,18 @@ public class ChromeBrowserSyncAdapterTest extends ChromeActivityTestCaseBase<Chr
         return ApplicationStatus.hasVisibleActivities();
     }
 
+    @Test
     @MediumTest
     @Feature({"Sync"})
     @RetryOnFailure
     public void testRequestSyncNoInvalidationData() {
         performSyncWithBundle(new Bundle());
-        assertTrue(mSyncAdapter.mInvalidatedAllTypes);
-        assertFalse(mSyncAdapter.mInvalidated);
-        assertTrue(CommandLine.isInitialized());
+        Assert.assertTrue(mSyncAdapter.mInvalidatedAllTypes);
+        Assert.assertFalse(mSyncAdapter.mInvalidated);
+        Assert.assertTrue(CommandLine.isInitialized());
     }
 
+    @Test
     @MediumTest
     @Feature({"Sync"})
     public void testRequestSyncSpecificDataType() {
@@ -124,26 +136,28 @@ public class ChromeBrowserSyncAdapterTest extends ChromeActivityTestCaseBase<Chr
         performSyncWithBundle(
                 PendingInvalidation.createBundle(objectId, objectSource, version, payload));
 
-        assertFalse(mSyncAdapter.mInvalidatedAllTypes);
-        assertTrue(mSyncAdapter.mInvalidated);
-        assertEquals(objectSource, mSyncAdapter.mObjectSource);
-        assertEquals(objectId, mSyncAdapter.mObjectId);
-        assertEquals(version, mSyncAdapter.mVersion);
-        assertEquals(payload, mSyncAdapter.mPayload);
-        assertTrue(CommandLine.isInitialized());
+        Assert.assertFalse(mSyncAdapter.mInvalidatedAllTypes);
+        Assert.assertTrue(mSyncAdapter.mInvalidated);
+        Assert.assertEquals(objectSource, mSyncAdapter.mObjectSource);
+        Assert.assertEquals(objectId, mSyncAdapter.mObjectId);
+        Assert.assertEquals(version, mSyncAdapter.mVersion);
+        Assert.assertEquals(payload, mSyncAdapter.mPayload);
+        Assert.assertTrue(CommandLine.isInitialized());
     }
 
+    @Test
     @MediumTest
     @Feature({"Sync"})
     @RetryOnFailure
     public void testRequestSyncWhenChromeInBackground() {
-        sendChromeToBackground(getActivity());
+        sendChromeToBackground(mActivityTestRule.getActivity());
         performSyncWithBundle(new Bundle());
-        assertFalse(mSyncAdapter.mInvalidatedAllTypes);
-        assertFalse(mSyncAdapter.mInvalidated);
-        assertTrue(CommandLine.isInitialized());
+        Assert.assertFalse(mSyncAdapter.mInvalidatedAllTypes);
+        Assert.assertFalse(mSyncAdapter.mInvalidated);
+        Assert.assertTrue(CommandLine.isInitialized());
     }
 
+    @Test
     @MediumTest
     @Feature({"Sync"})
     @RetryOnFailure
@@ -151,7 +165,7 @@ public class ChromeBrowserSyncAdapterTest extends ChromeActivityTestCaseBase<Chr
         Bundle extras = new Bundle();
         extras.putBoolean(ContentResolver.SYNC_EXTRAS_INITIALIZE, true);
         performSyncWithBundle(extras);
-        assertFalse(mSyncAdapter.mInvalidatedAllTypes);
-        assertFalse(mSyncAdapter.mInvalidated);
+        Assert.assertFalse(mSyncAdapter.mInvalidatedAllTypes);
+        Assert.assertFalse(mSyncAdapter.mInvalidated);
     }
 }