Fix issues with token refresh in AccountReconcilor

google_apis/gaia/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 GOOGLE_APIS_GAIA_OAUTH2_TOKEN_SERVICE_H_
 #define GOOGLE_APIS_GAIA_OAUTH2_TOKEN_SERVICE_H_
 
+#include <deque>
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
@@ skipping 60 matching lines @@
 
   // Classes that want to listen for token availability should implement this
   // interface and register with the AddObserver() call.
   class Observer {
    public:
     // Called whenever a new login-scoped refresh token is available for
     // account |account_id|. Once available, access tokens can be retrieved for
     // this account.  This is called during initial startup for each token
     // loaded.
     virtual void OnRefreshTokenAvailable(const std::string& account_id) {}
+    virtual void OnRefreshTokenAvailable(
+        const std::deque<std::string>& account_ids) {}
     // Called whenever the login-scoped refresh token becomes unavailable for
     // account |account_id|.
     virtual void OnRefreshTokenRevoked(const std::string& account_id) {}
     // Called after all refresh tokens are loaded during OAuth2TokenService
     // startup.
     virtual void OnRefreshTokensLoaded() {}
    protected:
     virtual ~Observer() {}
   };
 
@@ skipping 124 matching lines @@
   void ClearCacheForAccount(const std::string& account_id);
 
   // Cancels all requests that are currently in progress.
   void CancelAllRequests();
 
   // Cancels all requests related to a given |account_id|.
   void CancelRequestsForAccount(const std::string& account_id);
 
   // Called by subclasses to notify observers.
   virtual void FireRefreshTokenAvailable(const std::string& account_id);
+  virtual void FireRefreshTokenAvailable(
+      const std::deque<std::string>& account_ids);
   virtual void FireRefreshTokenRevoked(const std::string& account_id);
   virtual void FireRefreshTokensLoaded();
 
   // Creates a request implementation. Can be overriden by derived classes to
   // provide additional control of token consumption. |consumer| will outlive
   // the created request.
   virtual scoped_ptr<RequestImpl> CreateRequest(
       const std::string& account_id,
       Consumer* consumer);
 
@@ skipping 100 matching lines @@
   static int max_fetch_retry_num_;
 
   FRIEND_TEST_ALL_PREFIXES(OAuth2TokenServiceTest, RequestParametersOrderTest);
   FRIEND_TEST_ALL_PREFIXES(OAuth2TokenServiceTest,
                            SameScopesRequestedForDifferentClients);
 
   DISALLOW_COPY_AND_ASSIGN(OAuth2TokenService);
 };
 
 #endif  // GOOGLE_APIS_GAIA_OAUTH2_TOKEN_SERVICE_H_