GAIA ID migration for Android

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.signin;
 
 import android.accounts.Account;
+import android.app.Activity;
+import android.content.Context;
 import android.test.UiThreadTest;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.AdvancedMockContext;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.test.util.ApplicationData;
 import org.chromium.content.browser.test.NativeLibraryTestBase;
 import org.chromium.sync.signin.AccountManagerHelper;
@@ skipping 20 matching lines @@
             AccountHolder.create().account(TEST_ACCOUNT2).alwaysAccept(true).build();
 
     private AdvancedMockContext mContext;
     private OAuth2TokenService mOAuth2TokenService;
     private MockAccountManager mAccountManager;
     private TestObserver mObserver;
     private ChromeSigninController mChromeSigninController;
 
     @Override
     protected void setUp() throws Exception {
+        mapAccountNamesToIds();
         super.setUp();
         ApplicationData.clearAppData(getInstrumentation().getTargetContext());
         loadNativeLibraryAndInitBrowserProcess();
 
         // Set up AccountManager.
         mContext = new AdvancedMockContext(getInstrumentation().getTargetContext());
         mAccountManager = new MockAccountManager(mContext, getInstrumentation().getContext());
         AccountManagerHelper.overrideAccountManagerHelperForTests(mContext, mAccountManager);
 
         // Make sure there is no account signed in yet.
         mChromeSigninController = ChromeSigninController.get(mContext);
         mChromeSigninController.setSignedInAccountName(null);
 
+        // Seed test accounts to AccountTrackerService.
+        seedAccountTrackerService(mContext);
+
         // Get a reference to the service.
         mOAuth2TokenService = getOAuth2TokenServiceOnUiThread();
 
         // Set up observer.
         mObserver = new TestObserver();
         addObserver(mObserver);
     }
 
+    @Override
+    protected void tearDown() throws Exception {
+        mChromeSigninController.setSignedInAccountName(null);
+        super.tearDown();
+    }
+
+    private void mapAccountNamesToIds() {
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                AccountIdProvider.setInstanceForTest(new AccountIdProvider() {
+                    @Override
+                    public String getAccountId(Context ctx, String accountName) {
+                        return "gaia-id-" + accountName;
+                    }
+
+                    @Override
+                    public boolean canBeUsed(Context ctx, Activity activity) {
+                        return true;
+                    }
+                });
+            }
+        });
+    }
+
+    private void seedAccountTrackerService(Context context) {

[nyquist, 2015/09/11 00:42:52]

Add final to this argument

+        final Context mContext = context;

[nyquist, 2015/09/11 00:42:52]

remove this since it's not necessary. Also, for future reference, the m-prefix
is only for instance members.

+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                AccountIdProvider provider = AccountIdProvider.getInstance();
+                String[] accountNames = {TEST_ACCOUNT1.name, TEST_ACCOUNT2.name};
+                String[] accountIds = {provider.getAccountId(mContext, accountNames[0]),
+                        provider.getAccountId(mContext, accountNames[1])};
+                AccountTrackerService.get(mContext).syncForceRefreshForTest(
+                        accountIds, accountNames);
+            }
+        });
+    }
+
     /**
      * The {@link OAuth2TokenService} and the {@link Profile} can only be accessed from the UI
      * thread, so this helper method is a convenience method to retrieve it.
      *
      * @return the OAuth2TokenService.
      */
     private static OAuth2TokenService getOAuth2TokenServiceOnUiThread() {
         final AtomicReference<OAuth2TokenService> service =
                 new AtomicReference<OAuth2TokenService>();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@@ skipping 43 matching lines @@
         // Adding an observer should not lead to a callback.
         assertEquals(0, mObserver.getRevokedCallCount());
 
         // An observer should be called with the correct account.
         mOAuth2TokenService.fireRefreshTokenRevoked(TEST_ACCOUNT1);
         assertEquals(1, mObserver.getRevokedCallCount());
         assertEquals(TEST_ACCOUNT1, mObserver.getLastAccount());
 
         // When removed, an observer should not be called.
         mOAuth2TokenService.removeObserver(mObserver);
-        mOAuth2TokenService.fireRefreshTokenRevoked(TEST_ACCOUNT1);
+        mOAuth2TokenService.fireRefreshTokenRevoked(TEST_ACCOUNT2);
         assertEquals(1, mObserver.getRevokedCallCount());
 
         // No other observer interface method should ever have been called.
         assertEquals(0, mObserver.getAvailableCallCount());
         assertEquals(0, mObserver.getLoadedCallCount());
     }
 
     @MediumTest
     @UiThreadTest
     @Feature({"Sync"})
@@ skipping 273 matching lines @@
 
         public int getLoadedCallCount() {
             return mLoadedCallCount;
         }
 
         public Account getLastAccount() {
             return mLastAccount;
         }
     }
 }