Fix issues with token refresh in AccountReconcilor

chrome/browser/signin/account_reconcilor.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_ACCOUNT_RECONCILOR_H_
 #define CHROME_BROWSER_SIGNIN_ACCOUNT_RECONCILOR_H_
 
+#include <deque>
+
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
 class GaiaAuthFetcher;
@@ skipping 36 matching lines @@
 
   static std::vector<std::string> ParseListAccountsData(
       const std::string& data);
 
   // Start and stop the periodic reconciliation.
   void StartPeriodicReconciliation();
   void StopPeriodicReconciliation();
   void PeriodicReconciliation();
 
   void PerformMergeAction(const std::string& account_id);
+  void PerformMergeAction(const std::deque<std::string>& account_ids);
   void PerformRemoveAction(const std::string& account_id);
   void StartReconcileAction();
   void FinishReconcileAction();
 
   void GetAccountsFromCookie();
   void ValidateAccountsFromTokenService();
 
   void OnCookieChanged(ChromeCookieDetails* details);
 
   // Overriden from content::NotificationObserver
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Overriden from OAuth2TokenService::Consumer
   virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                                  const std::string& access_token,
                                  const base::Time& expiration_time) OVERRIDE;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
                                  const GoogleServiceAuthError& error) OVERRIDE;
 
   // Overriden from OAuth2TokenService::Observer
   virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE;
+  virtual void OnRefreshTokenAvailable(
+      const std::deque<std::string>& account_ids) OVERRIDE;
   virtual void OnRefreshTokenRevoked(const std::string& account_id) OVERRIDE;
   virtual void OnRefreshTokensLoaded() OVERRIDE;
 
   // Overriden from GaiaAuthConsumer
   virtual void OnListAccountsSuccess(const std::string& data) OVERRIDE;
   virtual void OnListAccountsFailure(
       const GoogleServiceAuthError& error) OVERRIDE;
 
   // The profile that this reconcilor belongs to.
   Profile* profile_;
@@ skipping 11 matching lines @@
   std::string primary_account_;
   std::vector<std::string> chrome_accounts_;
   scoped_ptr<OAuth2TokenService::Request>* requests_;
   std::set<std::string> valid_chrome_accounts_;
   std::set<std::string> invalid_chrome_accounts_;
 
   DISALLOW_COPY_AND_ASSIGN(AccountReconcilor);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_ACCOUNT_RECONCILOR_H_