Expose ReconcilorState. Rename MergeSession in Signin Tracker.

components/signin/core/browser/account_reconcilor.h

 // 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.
 #ifndef COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_
 #define COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_
 
 #include <deque>
 #include <functional>
 #include <set>
 #include <string>
@@ skipping 22 matching lines @@
 namespace net {
 class CanonicalCookie;
 }
 
 class AccountReconcilor : public KeyedService,
                           public content_settings::Observer,
                           public GaiaCookieManagerService::Observer,
                           public OAuth2TokenService::Observer,
                           public SigninManagerBase::Observer {
  public:
+  enum State {
+      NOT_RECONCILING,
+      NOT_RECONCILING_ERROR_OCCURED,
+      GATHERING_INFORMATION,
+      APPLYING_CHANGES
+  };
+
   AccountReconcilor(ProfileOAuth2TokenService* token_service,
                     SigninManagerBase* signin_manager,
                     SigninClient* client,
                     GaiaCookieManagerService* cookie_manager_service);
   ~AccountReconcilor() override;
 
   void Initialize(bool start_reconcile_if_tokens_available);
 
   // Signal that the status of the new_profile_management flag has changed.
   // Pass the new status as an explicit parameter since disabling the flag
   // doesn't remove it from the CommandLine::ForCurrentProcess().
   void OnNewProfileManagementFlagChanged(bool new_flag_status);
 
   // KeyedService implementation.
   void Shutdown() override;
 
+  // Determine what the reconcilor is currently doing.
+  State GetState();
+
  private:
   bool IsRegisteredWithTokenService() const {
     return registered_with_token_service_;
   }
 
   const std::vector<std::pair<std::string, bool> >& GetGaiaAccountsForTesting()
       const {
     return gaia_accounts_;
   }
 
@@ skipping 98 matching lines @@
   bool registered_with_content_settings_;
 
   // True while the reconcilor is busy checking or managing the accounts in
   // this profile.
   bool is_reconcile_started_;
   base::Time m_reconcile_start_time_;
 
   // True iff this is the first time the reconcilor is executing.
   bool first_execution_;
 
+  // True iff an error occured during the last attempt to reconcile.
+  bool error_during_last_reconcile_;
+
   // Used during reconcile action.
   // These members are used to validate the gaia cookie.  |gaia_accounts_|
   // holds the state of google accounts in the gaia cookie.  Each element is
   // a pair that holds the email address of the account and a boolean that
   // indicates whether the account is valid or not.  The accounts in the vector
   // are ordered the in same way as the gaia cookie.
   std::vector<std::pair<std::string, bool> > gaia_accounts_;
 
   // Used during reconcile action.
   // These members are used to validate the tokens in OAuth2TokenService.
   std::string primary_account_;
   std::vector<std::string> chrome_accounts_;
   std::vector<std::string> add_to_cookie_;
   bool chrome_accounts_changed_;
 
   DISALLOW_COPY_AND_ASSIGN(AccountReconcilor);
 };
 
 #endif  // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_RECONCILOR_H_