Fix reconcilor loop when the primary account is in an auth error state.

google_apis/gaia/oauth2_token_service_delegate.h

 // Copyright 2015 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_DELEGATE_H_
 #define GOOGLE_APIS_GAIA_OAUTH2_TOKEN_SERVICE_DELEGATE_H_
 
 #include "base/observer_list.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/oauth2_token_service.h"
@@ skipping 11 matching lines @@
  public:
   OAuth2TokenServiceDelegate();
   virtual ~OAuth2TokenServiceDelegate();
 
   virtual OAuth2AccessTokenFetcher* CreateAccessTokenFetcher(
       const std::string& account_id,
       net::URLRequestContextGetter* getter,
       OAuth2AccessTokenConsumer* consumer) = 0;
 
   virtual bool RefreshTokenIsAvailable(const std::string& account_id) const = 0;
+  virtual bool RefreshTokenHasError(const std::string& account_id) const;
   virtual void UpdateAuthError(const std::string& account_id,
-                               const GoogleServiceAuthError& error){};
+                               const GoogleServiceAuthError& error) {}
 
   virtual std::vector<std::string> GetAccounts();
   virtual void RevokeAllCredentials(){};
 
   virtual void InvalidateAccessToken(const std::string& account_id,
                                      const std::string& client_id,
                                      const std::set<std::string>& scopes,
                                      const std::string& access_token) {}
 
   virtual void Shutdown() {}
@@ skipping 19 matching lines @@
   class ScopedBatchChange {
    public:
     explicit ScopedBatchChange(OAuth2TokenServiceDelegate* delegate);
     ~ScopedBatchChange();
 
    private:
     OAuth2TokenServiceDelegate* delegate_;  // Weak.
     DISALLOW_COPY_AND_ASSIGN(ScopedBatchChange);
   };
 
+  // This function is called by derived classes to help implement
+  // RefreshTokenHasError().  It centralizes the code for determining if
+  // |error| is worthy of being reported as an error for purposes of
+  // RefreshTokenHasError().
+  static bool IsError(const GoogleServiceAuthError& error);
+
  private:
   // List of observers to notify when refresh token availability changes.
   // Makes sure list is empty on destruction.
   base::ObserverList<OAuth2TokenService::Observer, true> observer_list_;
 
   void StartBatchChanges();
   void EndBatchChanges();
 
   // The depth of batch changes.
   int batch_change_depth_;
 
   DISALLOW_COPY_AND_ASSIGN(OAuth2TokenServiceDelegate);
 };
 
 #endif  // GOOGLE_APIS_GAIA_OAUTH2_TOKEN_SERVICE_DELEGATE_H_