Fix issues with token refresh in AccountReconcilor

chrome/browser/signin/android_profile_oauth2_token_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SIGNIN_ANDROID_PROFILE_OAUTH2_TOKEN_SERVICE_H_
 #define CHROME_BROWSER_SIGNIN_ANDROID_PROFILE_OAUTH2_TOKEN_SERVICE_H_
 
 #include <jni.h>
+#include <deque>
 #include <string>
 
 #include "base/android/jni_helper.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 
 class TokenService;
@@ skipping 39 matching lines @@
                                                  const jstring account_name);
   // Triggers a notification to all observers of the OAuth2TokenService that a
   // refresh token is now available.
   virtual void FireRefreshTokenRevokedFromJava(JNIEnv* env,
                                                jobject obj,
                                                const jstring account_name);
   // Triggers a notification to all observers of the OAuth2TokenService that all
   // refresh tokens have now been loaded.
   virtual void FireRefreshTokensLoadedFromJava(JNIEnv* env, jobject obj);
 
+  // Called to notify observers when a refresh token is available.
+  virtual void FireRefreshTokenAvailable(
+      const std::string& account_id) OVERRIDE;
+  virtual void FireRefreshTokenAvailable(
+      const std::deque<std::string>& account_ids) OVERRIDE;
+
  protected:
   friend class ProfileOAuth2TokenServiceFactory;
   AndroidProfileOAuth2TokenService();
   virtual ~AndroidProfileOAuth2TokenService();
 
   // Overridden from OAuth2TokenService to intercept token fetch requests and
   // redirect them to the Account Manager.
   virtual void FetchOAuth2Token(RequestImpl* request,
                                 const std::string& account_id,
                                 net::URLRequestContextGetter* getter,
                                 const std::string& client_id,
                                 const std::string& client_secret,
                                 const ScopeSet& scopes) OVERRIDE;
 
   // Overridden from OAuth2TokenService to intercept token fetch requests and
   // redirect them to the Account Manager.
   virtual void InvalidateOAuth2Token(const std::string& account_id,
                                      const std::string& client_id,
                                      const ScopeSet& scopes,
                                      const std::string& access_token) OVERRIDE;
 
-  // Called to notify observers when a refresh token is available.
-  virtual void FireRefreshTokenAvailable(
-      const std::string& account_id) OVERRIDE;
   // Called to notify observers when a refresh token has been revoked.
   virtual void FireRefreshTokenRevoked(const std::string& account_id) OVERRIDE;
   // Called to notify observers when refresh tokans have been loaded.
   virtual void FireRefreshTokensLoaded() OVERRIDE;
 
  private:
   base::android::ScopedJavaGlobalRef<jobject> java_ref_;
 
   DISALLOW_COPY_AND_ASSIGN(AndroidProfileOAuth2TokenService);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_ANDROID_PROFILE_OAUTH2_TOKEN_SERVICE_H_