Fix issues with token refresh in AccountReconcilor

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 141 matching lines @@
 
 void AndroidProfileOAuth2TokenService::ValidateAccounts(JNIEnv* env,
                                                         jobject obj,
                                                         jobjectArray accounts,
                                                         jstring j_current_acc) {
   std::vector<std::string> account_ids;
   base::android::AppendJavaStringArrayToStringVector(env,
                                                      accounts,
                                                      &account_ids);
   std::string signed_in_account = ConvertJavaStringToUTF8(env, j_current_acc);
+  ValidateAccounts(signed_in_account, account_ids);
+}
 
+void AndroidProfileOAuth2TokenService::ValidateAccounts(
+    const std::string& signed_in_account,
+    const std::vector<std::string>& account_ids) {
   if (signed_in_account.empty())
     return;
 
   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();
+
+    // 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++) {
+      if (*it != signed_in_account) {
+        FireRefreshTokenAvailable(*it);
+      }
+    }
   } else {
     // Currently signed in account does not any longer exist among accounts on
     // system.
     FireRefreshTokenRevoked(signed_in_account);
   }
 }
 
 void AndroidProfileOAuth2TokenService::FireRefreshTokenAvailableFromJava(
     JNIEnv* env,
     jobject obj,
@@ skipping 63 matching lines @@
   GoogleServiceAuthError err(result ?
                              GoogleServiceAuthError::NONE :
                              GoogleServiceAuthError::CONNECTION_FAILED);
   heap_callback->Run(err, token, base::Time());
 }
 
 // static
 bool AndroidProfileOAuth2TokenService::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }