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

components/signin/core/browser/account_reconcilor.cc

 // Copyright 2014 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 "components/signin/core/browser/account_reconcilor.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_client.h"
 #include "components/signin/core/browser/signin_metrics.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_oauth_client.h"
 #include "google_apis/gaia/gaia_urls.h"
 
-
 namespace {
 
 class AccountEqualToFunc : public std::equal_to<gaia::ListedAccount> {
  public:
   bool operator()(const gaia::ListedAccount& p1,
                   const gaia::ListedAccount& p2) const;
 };
 
 bool AccountEqualToFunc::operator()(
     const gaia::ListedAccount& p1,
@@ skipping 216 matching lines @@
 
 void AccountReconcilor::StartReconcile() {
   if (!IsProfileConnected() || !client_->AreSigninCookiesAllowed()) {
     VLOG(1) << "AccountReconcilor::StartReconcile: !connected or no cookies";
     return;
   }
 
   if (is_reconcile_started_)
     return;
 
-  is_reconcile_started_ = true;
-  error_during_last_reconcile_ = false;
-
   // Reset state for validating gaia cookie.
   gaia_accounts_.clear();
 
   // Reset state for validating oauth2 tokens.
   primary_account_.clear();
   chrome_accounts_.clear();
   add_to_cookie_.clear();
   ValidateAccountsFromTokenService();
 
+  if (primary_account_.empty()) {
+    VLOG(1) << "AccountReconcilor::StartReconcile: primary has error";
+    return;
+  }
+
+  is_reconcile_started_ = true;
+  error_during_last_reconcile_ = false;
+
   // Rely on the GCMS to manage calls to and responses from ListAccounts.
   if (cookie_manager_service_->ListAccounts(&gaia_accounts_)) {
     OnGaiaAccountsInCookieUpdated(
         gaia_accounts_, GoogleServiceAuthError(GoogleServiceAuthError::NONE));
   }
 }
 
 void AccountReconcilor::OnGaiaAccountsInCookieUpdated(
         const std::vector<gaia::ListedAccount>& accounts,
         const GoogleServiceAuthError& error) {
@@ skipping 15 matching lines @@
     AbortReconcile();
   }
 }
 
 void AccountReconcilor::ValidateAccountsFromTokenService() {
   primary_account_ = signin_manager_->GetAuthenticatedAccountId();
   DCHECK(!primary_account_.empty());
 
   chrome_accounts_ = token_service_->GetAccounts();
 
+  // Remove any accounts that have an error.  There is no point in trying to
+  // reconcile them, since it won't work anyway.  If the list ends up being
+  // empty, or if the primary account is in error, then don't reconcile any
+  // accounts.
+  for (auto i = chrome_accounts_.begin(); i != chrome_accounts_.end(); ++i) {
+    if (token_service_->GetDelegate()->RefreshTokenHasError(*i)) {
+      if (primary_account_ == *i) {
+        primary_account_.clear();
+        chrome_accounts_.clear();
+        break;
+      } else {
+        VLOG(1) << "AccountReconcilor::ValidateAccountsFromTokenService: "
+                << *i << " has error, won't reconcile";
+        i->clear();
+      }
+    }
+  }
+  chrome_accounts_.erase(std::remove(chrome_accounts_.begin(),
+                                     chrome_accounts_.end(),
+                                     std::string()),
+                         chrome_accounts_.end());
+
   VLOG(1) << "AccountReconcilor::ValidateAccountsFromTokenService: "
           << "Chrome " << chrome_accounts_.size() << " accounts, "
           << "Primary is '" << primary_account_ << "'";
 }
 
 void AccountReconcilor::OnNewProfileManagementFlagChanged(
     bool new_flag_status) {
   if (new_flag_status) {
     // The reconciler may have been newly created just before this call, or may
     // have already existed and in mid-reconcile. To err on the safe side, force
@@ skipping 131 matching lines @@
           << "Account added: " << account_id << ", "
           << "Error was " << error.ToString();
   // Always listens to GaiaCookieManagerService. Only proceed if reconciling.
   if (is_reconcile_started_ && MarkAccountAsAddedToCookie(account_id)) {
     if (error.state() != GoogleServiceAuthError::State::NONE)
       error_during_last_reconcile_ = true;
     CalculateIfReconcileIsDone();
     ScheduleStartReconcileIfChromeAccountsChanged();
   }
 }