GAIA ID migration for Android

chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java

Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java
diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java
index efa4a3862947de8c1b8b103d83b6c4c40d37238a..062c260becc39239cbfa87b6064c945d1360f1be 100644
--- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java
+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java
@@ -14,6 +14,7 @@ import org.chromium.chrome.browser.identity.UniqueIdentificationGenerator;
 import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory;
 import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerator;
 import org.chromium.chrome.browser.signin.AccountIdProvider;
+import org.chromium.chrome.browser.signin.AccountTrackerService;
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.chrome.test.util.browser.sync.SyncTestUtil;
@@ -39,6 +40,7 @@ public class SyncTestBase extends ChromeActivityTestCaseBase<ChromeActivity> {
     protected FakeServerHelper mFakeServerHelper;
     protected ProfileSyncService mProfileSyncService;
     protected MockSyncContentResolverDelegate mSyncContentResolver;
+    protected ChromeSigninController mChromeSigninController;
 
     public SyncTestBase() {
       super(ChromeActivity.class);
@@ -64,8 +66,10 @@ public class SyncTestBase extends ChromeActivityTestCaseBase<ChromeActivity> {
         setUpMockAndroidSyncSettings();
         setUpMockAccountManager();
 
-        // Initializes ChromeSigninController to use our test context.
-        ChromeSigninController.get(mContext);
+        // Initializes ChromeSigninController to use our test context and make sure there is no
+        // account is signed in yet.
+        mChromeSigninController = ChromeSigninController.get(mContext);
+        mChromeSigninController.setSignedInAccountName(null);
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
@@ -95,6 +99,8 @@ public class SyncTestBase extends ChromeActivityTestCaseBase<ChromeActivity> {
             }
         });
 
+        if (mChromeSigninController.isSignedIn()) signOut();
+
         super.tearDown();
     }
 
@@ -133,6 +139,14 @@ public class SyncTestBase extends ChromeActivityTestCaseBase<ChromeActivity> {
         Account defaultTestAccount = SyncTestUtil.setupTestAccountThatAcceptsAllAuthTokens(
                 mAccountManager, SyncTestUtil.DEFAULT_TEST_ACCOUNT, SyncTestUtil.DEFAULT_PASSWORD);
 
+        // Force refresh AccountTrackerService since accounts are changed.
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                AccountTrackerService.get(mContext).forceRefresh();
+            }
+        });
+
         UniqueIdentificationGeneratorFactory.registerGenerator(
                 UuidBasedUniqueIdentificationGenerator.GENERATOR_ID,
                 new UniqueIdentificationGenerator() {