Calls FireRefreshTokenRevoked if an account is removed.

chrome/browser/signin/android_profile_oauth2_token_service.cc

 // 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.
 
 #include "chrome/browser/signin/android_profile_oauth2_token_service.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
@@ skipping 139 matching lines @@
                                             access_token);
 
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> j_access_token =
       ConvertUTF8ToJavaString(env, access_token);
   Java_OAuth2TokenService_invalidateOAuth2AuthToken(
       env, base::android::GetApplicationContext(),
       j_access_token.obj());
 }
 
-void AndroidProfileOAuth2TokenService::ValidateAccounts(JNIEnv* env,
-                                                        jobject obj,
-                                                        jobjectArray accounts,
-                                                        jstring j_current_acc) {
+bool AndroidProfileOAuth2TokenService::ValidateAccounts(
+    JNIEnv* env,
+    jobject obj,
+    jobjectArray prev_account_ids,
+    jstring j_current_acc) {
   std::vector<std::string> account_ids;
   base::android::AppendJavaStringArrayToStringVector(env,
-                                                     accounts,
+                                                     prev_account_ids,
                                                      &account_ids);
   std::string signed_in_account = ConvertJavaStringToUTF8(env, j_current_acc);
-  ValidateAccounts(signed_in_account, account_ids);
+  return ValidateAccounts(signed_in_account, account_ids);
 }
 
-void AndroidProfileOAuth2TokenService::ValidateAccounts(
+bool AndroidProfileOAuth2TokenService::ValidateAccounts(
     const std::string& signed_in_account,
-    const std::vector<std::string>& account_ids) {
+    const std::vector<std::string>& prev_account_ids) {
   if (signed_in_account.empty())
-    return;
+    return false;

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

Should this return here, or should we still fire the revokes if
|prev_account_ids| is not empty?

Seems like you might be able to just remove lines 176-177.  If
|signed_in_accounts| is empty, it will fail the find() at line 180, and hit the
code at line 210.  What do you think?

 
+  std::vector<std::string> account_ids = GetAccounts();
   if (std::find(account_ids.begin(),
                 account_ids.end(),
                 signed_in_account) != account_ids.end()) {
-    // Currently signed in account still exists among accounts on system.
-    std::vector<std::string> ids = GetAccounts();
+    // Test to see if an account is removed from the Android AccountManager.
+    // If so, invoke FireRefreshTokenRevoked to notify the reconcilor.
+    for (std::vector<std::string>::const_iterator it = prev_account_ids.begin();
+         it != prev_account_ids.end(); it++) {
+      if (*it == signed_in_account)
+        continue;
+
+      if (std::find(account_ids.begin(),
+                    account_ids.end(),
+                    *it) == account_ids.end()) {
+        FireRefreshTokenRevoked(*it);
+      }
+    }
 
     // Always fire the primary signed in account first.
     FireRefreshTokenAvailable(signed_in_account);
 
-    for (std::vector<std::string>::iterator it = ids.begin();
-        it != ids.end(); it++) {
+    for (std::vector<std::string>::iterator it = account_ids.begin();
+         it != account_ids.end(); it++) {
       if (*it != signed_in_account) {
         FireRefreshTokenAvailable(*it);
       }
     }
+    return true;
   } else {
     // Currently signed in account does not any longer exist among accounts on
-    // system.
+    // system together with all other accounts.
     FireRefreshTokenRevoked(signed_in_account);
+    for (std::vector<std::string>::const_iterator it = prev_account_ids.begin();
+         it != prev_account_ids.end(); it++) {
+      if (*it == signed_in_account)
+        continue;
+      FireRefreshTokenRevoked(*it);
+    }
+    return false;
   }
 }

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

I think it would be good to write tests for this function, since it does a lot
of things.  Tests I could see:

1/ |prev_account_ids| empty, system accounts non-empty
2/ |prev_account_ids| == non-empty system accounts
3/ |prev_account_ids| non-empty but not equal to non-empty system accounts
4/ 1-3 above, with empty |signed_in_account|
5/ 1-3 above, with non-empty |signed_in_account| and its in system accounts
6/ 1-3 above, with non-empty |signed_in_account| and its not in system accounts

After each case, make sure stored accounts is what you expect and that all
available and revoked events were fired.

 
 void AndroidProfileOAuth2TokenService::FireRefreshTokenAvailableFromJava(
     JNIEnv* env,
     jobject obj,
     const jstring account_name) {
   std::string account_id = ConvertJavaStringToUTF8(env, account_name);
   AndroidProfileOAuth2TokenService::FireRefreshTokenAvailable(account_id);
 }
 
 void AndroidProfileOAuth2TokenService::FireRefreshTokenAvailable(
@@ skipping 36 matching lines @@
 
 void AndroidProfileOAuth2TokenService::FireRefreshTokensLoaded() {
   // Notify native observers.
   OAuth2TokenService::FireRefreshTokensLoaded();
   // Notify Java observers.
   JNIEnv* env = AttachCurrentThread();
   Java_OAuth2TokenService_notifyRefreshTokensLoaded(
       env, java_ref_.obj());
 }
 
+void AndroidProfileOAuth2TokenService::RevokeAllCredentials() {
+  std::vector<std::string> accounts = GetAccounts();
+  for (std::vector<std::string>::iterator it = accounts.begin();
+       it != accounts.end(); it++) {
+    FireRefreshTokenRevoked(*it);
+  }
+}
+
 // Called from Java when fetching of an OAuth2 token is finished. The
 // |authToken| param is only valid when |result| is true.
 void OAuth2TokenFetched(JNIEnv* env, jclass clazz,
     jstring authToken,
     jboolean result,
     jlong nativeCallback) {
   std::string token = ConvertJavaStringToUTF8(env, authToken);
   scoped_ptr<FetchOAuth2TokenCallback> heap_callback(
       reinterpret_cast<FetchOAuth2TokenCallback*>(nativeCallback));
   // Android does not provide enough information to know if the credentials are
   // wrong, so assume any error is transient by using CONNECTION_FAILED.
   GoogleServiceAuthError err(result ?
                              GoogleServiceAuthError::NONE :
                              GoogleServiceAuthError::CONNECTION_FAILED);
   heap_callback->Run(err, token, base::Time());
 }
 
 // static
 bool AndroidProfileOAuth2TokenService::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }