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

chrome/browser/signin/oauth2_token_service_delegate_android.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_DELEGATE_ANDROID_OAUTH2_TOKEN_SERVICE_H_
-#define CHROME_BROWSER_SIGNIN_DELEGATE_ANDROID_OAUTH2_TOKEN_SERVICE_H_
+#ifndef CHROME_BROWSER_SIGNIN_OAUTH2_TOKEN_SERVICE_DELEGATE_ANDROID_H_
+#define CHROME_BROWSER_SIGNIN_OAUTH2_TOKEN_SERVICE_DELEGATE_ANDROID_H_
 
 #include <jni.h>
+#include <map>
 #include <string>
 
 #include "base/android/jni_weak_ref.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "google_apis/gaia/oauth2_token_service_delegate.h"
 
@@ skipping 21 matching lines @@
 
   // Called by the TestingProfile class to disable account validation in
   // tests.  This prevents the token service from trying to look up system
   // accounts which requires special permission.
   static void set_is_testing_profile() { is_testing_profile_ = true; }
 
   void Initialize();
 
   // OAuth2TokenServiceDelegate overrides:
   bool RefreshTokenIsAvailable(const std::string& account_id) const override;
+  bool RefreshTokenHasError(const std::string& account_id) const override;
   void UpdateAuthError(const std::string& account_id,
                        const GoogleServiceAuthError& error) override;
   std::vector<std::string> GetAccounts() override;
 
   // Lists account at the OS level.
   std::vector<std::string> GetSystemAccounts();
 
   void ValidateAccounts(JNIEnv* env,
                         jobject obj,
                         jstring current_account,
@@ skipping 43 matching lines @@
                              const std::string& access_token) override;
 
   // Called to notify observers when a refresh token is available.
   void FireRefreshTokenAvailable(const std::string& account_id) override;
   // Called to notify observers when a refresh token has been revoked.
   void FireRefreshTokenRevoked(const std::string& account_id) override;
   // Called to notify observers when refresh tokans have been loaded.
   void FireRefreshTokensLoaded() override;
 
  private:
+  struct ErrorInfo {

[anthonyvd, 2015/08/11 15:43:10]

Any reason why errors_ doesn't just store the GoogleServiceAuthError directly?
Is it not copyable?

[Roger Tawa OOO till Jul 10th, 2015/08/11 16:25:25]

GoogleServiceAuthError does not have a no-arg ctor, so can't be used in an
std::map directly.

+    ErrorInfo();
+    explicit ErrorInfo(const GoogleServiceAuthError& error);
+    GoogleServiceAuthError error;
+  };
+
   // Return whether |signed_in_account| is valid and we have access
   // to all the tokens in |curr_account_ids|. If |force_notifications| is true,
   // TokenAvailable notifications will be sent anyway, even if the account was
   // already known.
   bool ValidateAccounts(const std::string& signed_in_account,
                         const std::vector<std::string>& prev_account_ids,
                         const std::vector<std::string>& curr_account_ids,
                         std::vector<std::string>& refreshed_ids,
                         std::vector<std::string>& revoked_ids,
                         bool force_notifications);
 
   base::android::ScopedJavaGlobalRef<jobject> java_ref_;
 
+  // Maps account_id to the last error for that account.
+  std::map<std::string, ErrorInfo> errors_;
+
   static bool is_testing_profile_;
 
   DISALLOW_COPY_AND_ASSIGN(OAuth2TokenServiceDelegateAndroid);
 };
 
-#endif  // CHROME_BROWSER_SIGNIN_DELEGATE_ANDROID_OAUTH2_TOKEN_SERVICE_H_
+#endif  // CHROME_BROWSER_SIGNIN_OAUTH2_TOKEN_SERVICE_DELEGATE_ANDROID_H_