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

chrome/browser/signin/oauth2_token_service_delegate_android.cc

 // 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.
 
 #include "chrome/browser/signin/oauth2_token_service_delegate_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
@@ skipping 113 matching lines @@
       scope += " ";
     scope += *it;
   }
   return scope;
 }
 
 }  // namespace
 
 bool OAuth2TokenServiceDelegateAndroid::is_testing_profile_ = false;
 
+OAuth2TokenServiceDelegateAndroid::ErrorInfo::ErrorInfo()
+    : error(GoogleServiceAuthError::NONE) {}
+
+OAuth2TokenServiceDelegateAndroid::ErrorInfo::ErrorInfo(
+    const GoogleServiceAuthError& error)
+    : error(error) {}
+
 OAuth2TokenServiceDelegateAndroid::OAuth2TokenServiceDelegateAndroid() {
   DVLOG(1) << "OAuth2TokenServiceDelegateAndroid::ctor";
   JNIEnv* env = AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jobject> local_java_ref =
       Java_OAuth2TokenService_create(env, reinterpret_cast<intptr_t>(this));
   java_ref_.Reset(env, local_java_ref.obj());
 }
 
 OAuth2TokenServiceDelegateAndroid::~OAuth2TokenServiceDelegateAndroid() {
 }
@@ skipping 31 matching lines @@
     const std::string& account_id) const {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> j_account_id =
       ConvertUTF8ToJavaString(env, account_id);
   jboolean refresh_token_is_available =
       Java_OAuth2TokenService_hasOAuth2RefreshToken(
           env, base::android::GetApplicationContext(), j_account_id.obj());
   return refresh_token_is_available == JNI_TRUE;
 }
 
+bool OAuth2TokenServiceDelegateAndroid::RefreshTokenHasError(
+    const std::string& account_id) const {
+  auto it = errors_.find(account_id);
+  // TODO(rogerta): should we distinguish between transient and persistent?
+  return it == errors_.end()
+      ? false
+      : it->second.error.state() != GoogleServiceAuthError::NONE;

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

Any way to put at least part of this in the base class to reduce duplication?
Maybe at least the last part of the ternary, this way changing it to take
Transient/Persistent errors into account would only have to happen in one place.

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

Done.

+}
+
 void OAuth2TokenServiceDelegateAndroid::UpdateAuthError(
     const std::string& account_id,
     const GoogleServiceAuthError& error) {
-  // TODO(rogerta): do we need to update anything, or does the system handle it?
+  if (error.state() == GoogleServiceAuthError::NONE) {
+    errors_.erase(account_id);
+  } else {
+    // TODO(rogerta): should we distinguish between transient and persistent?
+    errors_[account_id] = ErrorInfo(error);
+  }
 }
 
 std::vector<std::string> OAuth2TokenServiceDelegateAndroid::GetAccounts() {
   std::vector<std::string> accounts;
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobjectArray> j_accounts =
       Java_OAuth2TokenService_getAccounts(
           env, base::android::GetApplicationContext());
   // TODO(fgorski): We may decide to filter out some of the accounts.
   base::android::AppendJavaStringArrayToStringVector(env, j_accounts.obj(),
@@ skipping 249 matching lines @@
   GoogleServiceAuthError err(authToken
                                  ? GoogleServiceAuthError::NONE
                                  : GoogleServiceAuthError::CONNECTION_FAILED);
   heap_callback->Run(err, token, base::Time());
 }
 
 // static
 bool OAuth2TokenServiceDelegateAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }