GAIA ID migration for Android

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

Index: chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java
index 8203c303cb36671ca2cb797e43651eb4b255009c..b00537b476baae781f6c194803792fea591991d5 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java
@@ -107,6 +107,8 @@ public class SigninHelper {
 
     private final SigninManager mSigninManager;
 
+    private final AccountTrackerService mAccountTrackerService;
+
     private final OAuth2TokenService mOAuth2TokenService;
 
     private final SyncController mSyncController;
@@ -124,12 +126,18 @@ public class SigninHelper {
         mContext = context;
         mProfileSyncService = ProfileSyncService.get();
         mSigninManager = SigninManager.get(mContext);
+        mAccountTrackerService = AccountTrackerService.get(mContext);
         mOAuth2TokenService = OAuth2TokenService.getForProfile(Profile.getLastUsedProfile());
         mSyncController = SyncController.get(context);
         mChromeSigninController = ChromeSigninController.get(mContext);
     }
 
     public void validateAccountSettings(boolean accountsChanged) {
+        if (accountsChanged) {
+            // Account details have changed so inform AccountTrackerService refresh itself.
+            mAccountTrackerService.forceRefresh();
+        }
+
         Account syncAccount = mChromeSigninController.getSignedInUser();
         if (syncAccount == null) {
             if (SigninManager.getAndroidSigninPromoExperimentGroup() < 0) return;