Fix issues with token refresh in AccountReconcilor

chrome/browser/signin/account_reconcilor.h

Index: chrome/browser/signin/account_reconcilor.h
diff --git a/chrome/browser/signin/account_reconcilor.h b/chrome/browser/signin/account_reconcilor.h
index cf7e9acad1f58afa5af2906881b5edaaf05742b8..af587a014526f6b6c9d86d7810de1b6169d75837 100644
--- a/chrome/browser/signin/account_reconcilor.h
+++ b/chrome/browser/signin/account_reconcilor.h
@@ -4,6 +4,8 @@
 #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"
@@ -60,6 +62,7 @@ class AccountReconcilor : public BrowserContextKeyedService,
   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();
@@ -83,6 +86,8 @@ class AccountReconcilor : public BrowserContextKeyedService,
 
   // 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;