Calls FireRefreshTokenRevoked if an account is removed.

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceTest.java
index 78baa8496d1134b19d6d060afcb4f6d8cd9ba7f2..b745cc4fce2dcf420306830c79dde593913e2c1f 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceTest.java
@@ -85,6 +85,42 @@ public class OAuth2TokenServiceTest extends InstrumentationTestCase {
         runTestOfGetOAuth2AccessTokenWithTimeout(authToken);
     }
 
+    @SmallTest
+    @Feature({"Sync"})
+    public void testCachedAccountsNoChange() {
+        // Start with zero accounts.
+        String[] accounts = OAuth2TokenService.getAccounts(mContext);
+        assertEquals("We should have zero accounts", 0, accounts.length);
+
+        // Add two accounts.
+        Account account1 = AccountManagerHelper.createAccountFromName("foo@gmail.com");
+        AccountHolder accountHolder1 = AccountHolder.create().account(account1).build();
+        mAccountManager.addAccountHolderExplicitly(accountHolder1);
+        Account account2 = AccountManagerHelper.createAccountFromName("bar@gmail.com");
+        AccountHolder accountHolder2 = AccountHolder.create().account(account2).build();
+        mAccountManager.addAccountHolderExplicitly(accountHolder2);
+
+        // Until next validate accounts, O2TS should still believe we have 0 accounts.
+        accounts = OAuth2TokenService.getAccounts(mContext);
+        assertEquals("We should have zero accounts", 0, accounts.length);
+    }
+
+    @SmallTest
+    @Feature({"Sync"})
+    public void testCachedAccountsChanged() {
+        // Start with two Accounts
+        Account account1 = AccountManagerHelper.createAccountFromName("foo@gmail.com");
+        AccountHolder accountHolder1 = AccountHolder.create().account(account1).build();
+        mAccountManager.addAccountHolderExplicitly(accountHolder1);
+        Account account2 = AccountManagerHelper.createAccountFromName("bar@gmail.com");
+        AccountHolder accountHolder2 = AccountHolder.create().account(account2).build();
+        mAccountManager.addAccountHolderExplicitly(accountHolder2);
+
+        // Until next validate accounts, O2TS should still believe we have 0 accounts.
+        String[] accounts = OAuth2TokenService.getAccounts(mContext);
+        assertEquals("We should have zero accounts", 2, accounts.length);

[Roger Tawa OOO till Jul 10th, 2014/04/10 15:30:54]

Comment should say two accounts?

[acleung1, 2014/04/10 21:36:01]

I intent to revert this. (see comments on why in the Java file.)

+    }
+

[Roger Tawa OOO till Jul 10th, 2014/04/10 15:30:54]

Is this test complete?  Seems it does the same as the previous one?

[acleung1, 2014/04/10 21:36:01]

Ditto.

     private void runTestOfGetOAuth2AccessTokenWithTimeout(String expectedToken) {
         String scope = "http://example.com/scope";
         Account account = AccountManagerHelper.createAccountFromName("test@gmail.com");