[Signin][Test] Use AccountManagerTestRule instead of SyncTestRule in signin tests

This CL uses AccountManagerTestRule instead of SyncTestRule in
SigninFragmentTest to facilitate ProfileDataCache update tests in the
future.

Bug: 1167672
Change-Id: If3d8753b5a894a76b9db2d961aaa336306b717ee
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2632678
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Reviewed-by: Tanmoy Mollik <triploblastic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#845742}

chrome/android/java/src/org/chromium/chrome/browser/signin/SigninFragmentBase.java

@@ -46,6 +46,7 @@ import org.chromium.chrome.browser.signin.ui.account_picker.AccountPickerDialogF
 import org.chromium.chrome.browser.sync.SyncUserDataWiper;
 import org.chromium.components.externalauth.UserRecoverableErrorHandler;
 import org.chromium.components.signin.AccountManagerDelegateException;
+import org.chromium.components.signin.AccountManagerFacade;
 import org.chromium.components.signin.AccountManagerFacadeProvider;
 import org.chromium.components.signin.AccountManagerResult;
 import org.chromium.components.signin.AccountTrackerService;
@@ -95,6 +96,7 @@ public abstract class SigninFragmentBase
         int ADD_ACCOUNT = 3;
     }
 
+    private final AccountManagerFacade mAccountManagerFacade;
     private @SigninFlowType int mSigninFlowType;
     private @ChildAccountStatus.Status int mChildAccountStatus;
 
@@ -170,6 +172,7 @@ public abstract class SigninFragmentBase
     }
 
     protected SigninFragmentBase() {
+        mAccountManagerFacade = AccountManagerFacadeProvider.getInstance();
         mAccountsChangedObserver = this::triggerUpdateAccounts;
         mProfileDataCacheObserver = this::updateProfileData;
     }
@@ -472,8 +475,7 @@ public abstract class SigninFragmentBase
         new AsyncTask<String>() {
             @Override
             public String doInBackground() {
-                return AccountManagerFacadeProvider.getInstance().getAccountGaiaId(
-                        mSelectedAccountName);
+                return mAccountManagerFacade.getAccountGaiaId(mSelectedAccountName);
             }
 
             @Override
@@ -512,17 +514,16 @@ public abstract class SigninFragmentBase
     public void addAccount() {
         RecordUserAction.record("Signin_AddAccountToDevice");
         // TODO(https://crbug.com/842860): Revise createAddAccountIntent and AccountAdder.
-        AccountManagerFacadeProvider.getInstance().createAddAccountIntent(
-                (@Nullable Intent intent) -> {
-                    if (intent != null) {
-                        startActivityForResult(intent, ADD_ACCOUNT_REQUEST_CODE);
-                        return;
-                    }
+        mAccountManagerFacade.createAddAccountIntent((@Nullable Intent intent) -> {
+            if (intent != null) {
+                startActivityForResult(intent, ADD_ACCOUNT_REQUEST_CODE);
+                return;
+            }
 
-                    // AccountManagerFacade couldn't create intent, use SigninUtils to open settings
-                    // instead.
-                    SigninUtils.openSettingsForAllAccounts(getActivity());
-                });
+            // AccountManagerFacade couldn't create intent, use SigninUtils to open settings
+            // instead.
+            SigninUtils.openSettingsForAllAccounts(getActivity());
+        });
     }
 
     @Override
@@ -539,7 +540,7 @@ public abstract class SigninFragmentBase
             }
 
             // Wait for the account cache to be updated and select newly-added account.
-            AccountManagerFacadeProvider.getInstance().waitForPendingUpdates(() -> {
+            mAccountManagerFacade.waitForPendingUpdates(() -> {
                 mAccountSelectionPending = true;
                 mRequestedAccountName = addedAccountName;
                 triggerUpdateAccounts();
@@ -551,7 +552,7 @@ public abstract class SigninFragmentBase
     public void onResume() {
         super.onResume();
         mResumed = true;
-        AccountManagerFacadeProvider.getInstance().addObserver(mAccountsChangedObserver);
+        mAccountManagerFacade.addObserver(mAccountsChangedObserver);
         mProfileDataCache.addObserver(mProfileDataCacheObserver);
         triggerUpdateAccounts();
 
@@ -563,7 +564,7 @@ public abstract class SigninFragmentBase
         super.onPause();
         mResumed = false;
         mProfileDataCache.removeObserver(mProfileDataCacheObserver);
-        AccountManagerFacadeProvider.getInstance().removeObserver(mAccountsChangedObserver);
+        mAccountManagerFacade.removeObserver(mAccountsChangedObserver);
 
         mView.stopAnimations();
     }
@@ -581,7 +582,7 @@ public abstract class SigninFragmentBase
     }
 
     private void triggerUpdateAccounts() {
-        AccountManagerFacadeProvider.getInstance().getGoogleAccounts(this::updateAccounts);
+        mAccountManagerFacade.getGoogleAccounts(this::updateAccounts);
     }
 
     private void updateAccounts(AccountManagerResult<List<Account>> accounts) {

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

@@ -31,6 +31,7 @@ import androidx.test.filters.MediumTest;
 import org.hamcrest.Matcher;
 import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -52,14 +53,16 @@ import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
-import org.chromium.chrome.browser.sync.SyncTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
 import org.chromium.chrome.test.util.ActivityUtils;
 import org.chromium.chrome.test.util.ChromeRenderTestRule;
+import org.chromium.chrome.test.util.browser.signin.AccountManagerTestRule;
 import org.chromium.chrome.test.util.browser.sync.SyncTestUtil;
 import org.chromium.components.signin.ChildAccountStatus;
 import org.chromium.components.signin.base.CoreAccountInfo;
 import org.chromium.components.signin.metrics.SigninAccessPoint;
+import org.chromium.components.signin.test.util.FakeProfileDataSource;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.ui.test.util.DisableAnimationsTestRule;
 import org.chromium.ui.test.util.DummyUiActivity;
@@ -95,7 +98,12 @@ public class SigninFragmentTest {
     public final MockitoRule mMockitoRule = MockitoJUnit.rule();
 
     @Rule
-    public final SyncTestRule mSyncTestRule = new SyncTestRule();
+    public final AccountManagerTestRule mAccountManagerTestRule =
+            new AccountManagerTestRule(new FakeProfileDataSource());
+
+    @Rule
+    public final ChromeTabbedActivityTestRule mChromeActivityTestRule =
+            new ChromeTabbedActivityTestRule();
 
     @Rule
     public final BaseActivityTestRule<DummyUiActivity> mActivityTestRule =
@@ -110,6 +118,12 @@ public class SigninFragmentTest {
 
     private SigninActivity mSigninActivity;
 
+    @Before
+    public void setUp() {
+        mActivityTestRule.setFinishActivity(true);
+        mChromeActivityTestRule.startMainActivityOnBlankPage();
+    }
+
     @After
     public void tearDown() throws Exception {
         // Since SigninActivity is launched inside this test class, we need to
@@ -126,7 +140,8 @@ public class SigninFragmentTest {
         mSigninActivity = ActivityUtils.waitForActivity(
                 InstrumentationRegistry.getInstrumentation(), SigninActivity.class, () -> {
                     SigninActivityLauncherImpl.get().launchActivityForPromoAddAccountFlow(
-                            mSyncTestRule.getActivity(), SigninAccessPoint.BOOKMARK_MANAGER);
+                            mChromeActivityTestRule.getActivity(),
+                            SigninAccessPoint.BOOKMARK_MANAGER);
                 });
         mRenderTestRule.render(mSigninActivity.findViewById(R.id.fragment_container),
                 "signin_fragment_new_account");
@@ -136,13 +151,14 @@ public class SigninFragmentTest {
     @LargeTest
     @Feature("RenderTest")
     public void testSigninFragmentNotDefaultAccountWithPrimaryAccount() throws IOException {
-        CoreAccountInfo accountInfo = mSyncTestRule.addTestAccount();
-        mSyncTestRule.addAccount("test.second.account@gmail.com");
+        CoreAccountInfo accountInfo =
+                mAccountManagerTestRule.addAccount(AccountManagerTestRule.TEST_ACCOUNT_EMAIL);
+        mAccountManagerTestRule.addAccount("test.second.account@gmail.com");
         mSigninActivity = ActivityUtils.waitForActivity(
                 InstrumentationRegistry.getInstrumentation(), SigninActivity.class, () -> {
                     SigninActivityLauncherImpl.get().launchActivityForPromoChooseAccountFlow(
-                            mSyncTestRule.getActivity(), SigninAccessPoint.BOOKMARK_MANAGER,
-                            accountInfo.getEmail());
+                            mChromeActivityTestRule.getActivity(),
+                            SigninAccessPoint.BOOKMARK_MANAGER, accountInfo.getEmail());
                 });
         mRenderTestRule.render(mSigninActivity.findViewById(R.id.fragment_container),
                 "signin_fragment_choose_primary_account");
@@ -152,14 +168,14 @@ public class SigninFragmentTest {
     @LargeTest
     @Feature("RenderTest")
     public void testSigninFragmentNotDefaultAccountWithSecondaryAccount() throws IOException {
-        mSyncTestRule.addTestAccount();
+        mAccountManagerTestRule.addAccount(AccountManagerTestRule.TEST_ACCOUNT_EMAIL);
         String secondAccountName = "test.second.account@gmail.com";
-        mSyncTestRule.addAccount(secondAccountName);
+        mAccountManagerTestRule.addAccount(secondAccountName);
         mSigninActivity = ActivityUtils.waitForActivity(
                 InstrumentationRegistry.getInstrumentation(), SigninActivity.class, () -> {
                     SigninActivityLauncherImpl.get().launchActivityForPromoChooseAccountFlow(
-                            mSyncTestRule.getActivity(), SigninAccessPoint.BOOKMARK_MANAGER,
-                            secondAccountName);
+                            mChromeActivityTestRule.getActivity(),
+                            SigninAccessPoint.BOOKMARK_MANAGER, secondAccountName);
                 });
         mRenderTestRule.render(mSigninActivity.findViewById(R.id.fragment_container),
                 "signin_fragment_choose_secondary_account");
@@ -169,12 +185,13 @@ public class SigninFragmentTest {
     @LargeTest
     @Feature("RenderTest")
     public void testSigninFragmentDefaultAccount() throws IOException {
-        CoreAccountInfo accountInfo = mSyncTestRule.addTestAccount();
+        CoreAccountInfo accountInfo =
+                mAccountManagerTestRule.addAccount(AccountManagerTestRule.TEST_ACCOUNT_EMAIL);
         mSigninActivity = ActivityUtils.waitForActivity(
                 InstrumentationRegistry.getInstrumentation(), SigninActivity.class, () -> {
                     SigninActivityLauncherImpl.get().launchActivityForPromoDefaultFlow(
-                            mSyncTestRule.getActivity(), SigninAccessPoint.BOOKMARK_MANAGER,
-                            accountInfo.getEmail());
+                            mChromeActivityTestRule.getActivity(),
+                            SigninAccessPoint.BOOKMARK_MANAGER, accountInfo.getEmail());
                 });
         mRenderTestRule.render(mSigninActivity.findViewById(R.id.fragment_container),
                 "signin_fragment_default_account");
@@ -217,7 +234,7 @@ public class SigninFragmentTest {
                 new HistogramDelta("Signin.AndroidDeviceAccountsNumberWhenEnteringFRE", 1);
         HistogramDelta startPageHistogram =
                 new HistogramDelta("Signin.SigninStartedAccessPoint", SigninAccessPoint.START_PAGE);
-        mSyncTestRule.addTestAccount();
+        mAccountManagerTestRule.addAccount(AccountManagerTestRule.TEST_ACCOUNT_EMAIL);
         CustomSigninFirstRunFragment fragment = new CustomSigninFirstRunFragment();
         Bundle bundle = new Bundle();
         bundle.putInt(SigninFirstRunFragment.CHILD_ACCOUNT_STATUS, ChildAccountStatus.NOT_CHILD);
@@ -247,7 +264,7 @@ public class SigninFragmentTest {
                 new HistogramDelta("Signin.AndroidDeviceAccountsNumberWhenEnteringFRE", 1);
         HistogramDelta startPageHistogram =
                 new HistogramDelta("Signin.SigninStartedAccessPoint", SigninAccessPoint.START_PAGE);
-        mSyncTestRule.addTestAccount();
+        mAccountManagerTestRule.addAccount(AccountManagerTestRule.TEST_ACCOUNT_EMAIL);
         CustomSigninFirstRunFragment fragment = new CustomSigninFirstRunFragment();
         Bundle bundle = new Bundle();
         bundle.putInt(
@@ -273,11 +290,12 @@ public class SigninFragmentTest {
     @Test
     @LargeTest
     public void testClickingSettingsDoesNotSetFirstSetupComplete() {
-        CoreAccountInfo accountInfo = mSyncTestRule.addTestAccount();
+        CoreAccountInfo accountInfo =
+                mAccountManagerTestRule.addAccount(AccountManagerTestRule.TEST_ACCOUNT_EMAIL);
         mSigninActivity = ActivityUtils.waitForActivity(
                 InstrumentationRegistry.getInstrumentation(), SigninActivity.class, () -> {
                     SigninActivityLauncherImpl.get().launchActivityForPromoDefaultFlow(
-                            mSyncTestRule.getActivity(), SigninAccessPoint.SETTINGS,
+                            mChromeActivityTestRule.getActivity(), SigninAccessPoint.SETTINGS,
                             accountInfo.getEmail());
                 });
         onView(withText(accountInfo.getEmail())).check(matches(isDisplayed()));
@@ -304,7 +322,7 @@ public class SigninFragmentTest {
         mSigninActivity = ActivityUtils.waitForActivity(
                 InstrumentationRegistry.getInstrumentation(), SigninActivity.class, () -> {
                     SigninActivityLauncherImpl.get().launchActivity(
-                            mSyncTestRule.getActivity(), SigninAccessPoint.SETTINGS);
+                            mChromeActivityTestRule.getActivity(), SigninAccessPoint.SETTINGS);
                 });
         onView(withId(R.id.positive_button)).check(matches(withText(R.string.signin_add_account)));
         onView(withId(R.id.negative_button)).check(matches(withText(R.string.cancel)));
@@ -316,14 +334,15 @@ public class SigninFragmentTest {
     public void testSelectNonDefaultAccountInAccountPickerDialog() {
         HistogramDelta bookmarkHistogram = new HistogramDelta(
                 "Signin.SigninStartedAccessPoint", SigninAccessPoint.BOOKMARK_MANAGER);
-        CoreAccountInfo defaultAccountInfo = mSyncTestRule.addTestAccount();
+        CoreAccountInfo defaultAccountInfo =
+                mAccountManagerTestRule.addAccount(AccountManagerTestRule.TEST_ACCOUNT_EMAIL);
         String nonDefaultAccountName = "test.account.nondefault@gmail.com";
-        mSyncTestRule.addAccount(nonDefaultAccountName);
+        mAccountManagerTestRule.addAccount(nonDefaultAccountName);
         mSigninActivity = ActivityUtils.waitForActivity(
                 InstrumentationRegistry.getInstrumentation(), SigninActivity.class, () -> {
                     SigninActivityLauncherImpl.get().launchActivityForPromoDefaultFlow(
-                            mSyncTestRule.getActivity(), SigninAccessPoint.BOOKMARK_MANAGER,
-                            defaultAccountInfo.getEmail());
+                            mChromeActivityTestRule.getActivity(),
+                            SigninAccessPoint.BOOKMARK_MANAGER, defaultAccountInfo.getEmail());
                 });
         onView(withText(defaultAccountInfo.getEmail()))
                 .check(matches(isDisplayed()))