Expose ReconcilorState. Rename MergeSession in Signin Tracker.

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"
@@ skipping 46 matching lines @@
     GaiaCookieManagerService* cookie_manager_service)
     : token_service_(token_service),
       signin_manager_(signin_manager),
       client_(client),
       cookie_manager_service_(cookie_manager_service),
       registered_with_token_service_(false),
       registered_with_cookie_manager_service_(false),
       registered_with_content_settings_(false),
       is_reconcile_started_(false),
       first_execution_(true),
+      error_during_last_reconcile_(false),
       chrome_accounts_changed_(false) {
   VLOG(1) << "AccountReconcilor::AccountReconcilor";
 }
 
 AccountReconcilor::~AccountReconcilor() {
   VLOG(1) << "AccountReconcilor::~AccountReconcilor";
   // Make sure shutdown was called first.
   DCHECK(!registered_with_token_service_);
   DCHECK(!registered_with_cookie_manager_service_);
 }
@@ skipping 92 matching lines @@
     return;
 
   cookie_manager_service_->RemoveObserver(this);
   registered_with_cookie_manager_service_ = false;
 }
 
 bool AccountReconcilor::IsProfileConnected() {
   return signin_manager_->IsAuthenticated();
 }
 
+AccountReconcilor::State AccountReconcilor::GetState() {
+  if (!is_reconcile_started_) {
+    return error_during_last_reconcile_
+        ? AccountReconcilor::State::NOT_RECONCILING_ERROR_OCCURED
+        : AccountReconcilor::State::NOT_RECONCILING;
+  }
+
+  return add_to_cookie_.empty()
+      ? AccountReconcilor::State::GATHERING_INFORMATION
+      : AccountReconcilor::State::APPLYING_CHANGES;
+}
+
 void AccountReconcilor::OnContentSettingChanged(
     const ContentSettingsPattern& primary_pattern,
     const ContentSettingsPattern& secondary_pattern,
     ContentSettingsType content_type,
     std::string resource_identifier) {
   // If this is not a change to cookie settings, just ignore.
   if (content_type != CONTENT_SETTINGS_TYPE_COOKIES)
     return;
 
   // If this does not affect GAIA, just ignore.  If the primary pattern is
@@ skipping 53 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();
 
   // 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<std::pair<std::string, bool> >& accounts,
         const GoogleServiceAuthError& error) {
   if (error.state() == GoogleServiceAuthError::NONE) {

[Roger Tawa OOO till Jul 10th, 2015/04/27 20:08:49]

Nit: can you add a VLOG above the if?

[Mike Lerman, 2015/04/27 20:16:49]

Done.

     gaia_accounts_ = accounts;
 
     // It is possible that O2RT is not available at this moment.
     if (token_service_->GetAccounts().empty())
       return;
 
     is_reconcile_started_ ? FinishReconcile() : StartReconcile();
   } else {
+    if (is_reconcile_started_)
+      error_during_last_reconcile_ = true;
     AbortReconcile();
   }
 }
 
 void AccountReconcilor::ValidateAccountsFromTokenService() {
   primary_account_ = signin_manager_->GetAuthenticatedAccountId();
   DCHECK(!primary_account_.empty());
 
   chrome_accounts_ = token_service_->GetAccounts();
 
@@ skipping 134 matching lines @@
       add_to_cookie_.erase(i);
       return true;
     }
   }
   return false;
 }
 
 void AccountReconcilor::OnAddAccountToCookieCompleted(
     const std::string& account_id,
     const GoogleServiceAuthError& error) {
   // Always listens to GaiaCookieManagerService. Only proceed if reconciling.

[Roger Tawa OOO till Jul 10th, 2015/04/27 20:08:49]

Nit: can you add a VLOG here?

[Mike Lerman, 2015/04/27 20:16:49]

Done.

   if (is_reconcile_started_ && MarkAccountAsAddedToCookie(account_id)) {
+    if (error.state() != GoogleServiceAuthError::State::NONE)
+      error_during_last_reconcile_ = true;
     CalculateIfReconcileIsDone();
     ScheduleStartReconcileIfChromeAccountsChanged();
   }
 }