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 <string>
 
@@ skipping 32 matching lines @@
       const std::string& account_id) OVERRIDE;
 
   // Lists account IDs of all accounts with a refresh token.
   virtual std::vector<std::string> GetAccounts() OVERRIDE;
 
   void ValidateAccounts(JNIEnv* env,
                         jobject obj,
                         jobjectArray accounts,
                         jstring current_account);
 
+  // Called to notify observers when a refresh token is available.
+  virtual void FireRefreshTokenAvailable(
+      const std::string& account_id) OVERRIDE;

[Roger Tawa OOO till Jul 10th, 2013/11/21 16:02:32]

Don't this change if ValidateAccounts() is called LogInSignedInUser().

[acleung1, 2013/11/26 09:28:31]

Yes. Since I have refactored ValidateAccounts just now, we can avoid making this
change.

   // Triggers a notification to all observers of the OAuth2TokenService that a
   // refresh token is now available. This may cause observers to retry
   // operations that require authentication.
   virtual void FireRefreshTokenAvailableFromJava(JNIEnv* env,
                                                  jobject obj,
                                                  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,
@@ skipping 16 matching lines @@
                                 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_