Start moving signin code out of browser/sync.

chrome/browser/sync/profile_sync_service.h

 // Copyright (c) 2012 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_SYNC_PROFILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
 #pragma once
 
 #include <list>
 #include <string>
@@ skipping 301 matching lines @@
   // takes place, and the backend isn't initialized yet?
   virtual bool sync_initialized() const;
   virtual bool unrecoverable_error_detected() const;
   const std::string& unrecoverable_error_message() {
     return unrecoverable_error_message_;
   }
   tracked_objects::Location unrecoverable_error_location() {
     return unrecoverable_error_location_;
   }
 
-  // Tracks whether the user is currently authenticating or not. This is used
+  // Reports whether the user is currently authenticating or not. This is used
   // by the sync_ui_util helper routines to allow the UI to properly display
   // an "authenticating..." status message instead of an auth error when we are
   // in the process of trying to update credentials.
-  // TODO(atwilson): This state should reside up in the UI or in a profile-
-  // specific SyncUIUtil object rather than in ProfileSyncService.
+  // TODO(atwilson): This state now resides in SigninManager - this method
+  // will be removed once we've cleaned up the callers. http://crbug.com/95269.
   virtual bool UIShouldDepictAuthInProgress() const;
-  virtual void SetUIShouldDepictAuthInProgress(bool auth_in_progress);
 
   // Returns true if OnPassphraseRequired has been called for any reason.
   virtual bool IsPassphraseRequired() const;
 
   // Returns true if OnPassphraseRequired has been called for decryption and
   // we have an encrypted data type enabled.
   virtual bool IsPassphraseRequiredForDecryption() const;
 
   sync_api::PassphraseRequiredReason passphrase_required_reason() const {
     return passphrase_required_reason_;
@@ skipping 168 matching lines @@
   void AcknowledgeSyncedTypes();
 
   SyncGlobalError* sync_global_error() { return sync_global_error_.get(); }
 
   virtual const FailedDatatypesHandler& failed_datatypes_handler();
 
   browser_sync::DataTypeManager::ConfigureStatus configure_status() {
     return configure_status_;
   }
 
+  // If true, the ProfileSyncService has detected that a new GAIA signin has
+  // succeeded, and is waiting for initialization to complete. This is used by
+  // the UI to differentiate between a new auth error (encountered as part of
+  // the initialization process) and a pre-existing auth error that just hasn't
+  // been cleared yet.
+  bool waiting_for_auth() const { return is_auth_in_progress_; }
+
   // ProfileKeyedService implementation.
   virtual void Shutdown() OVERRIDE;
 
  protected:
   // Used by test classes that derive from ProfileSyncService.
   virtual browser_sync::SyncBackendHost* GetBackendForTest();
 
   // Helper to install and configure a data type manager.
   void ConfigureDataTypeManager();
 
@@ skipping 79 matching lines @@
       browser_sync::DataTypeManager::ConfigureResult result);
 
   // Reconfigures the data type manager with the latest enabled types.
   // Note: Does not initialize the backend if it is not already initialized.
   // This function needs to be called only after sync has been initialized
   // (i.e.,only for reconfigurations). The reason we don't initialize the
   // backend is because if we had encountered an unrecoverable error we dont
   // want to startup once more.
   virtual void ReconfigureDatatypeManager();
 
-
-  // Time at which we begin an attempt a GAIA authorization.
-  base::TimeTicks auth_start_time_;
-
-  // Time at which error UI is presented for the new tab page.
-  base::TimeTicks auth_error_time_;
-
   // Factory used to create various dependent objects.
   scoped_ptr<ProfileSyncComponentsFactory> factory_;
 
   // The profile whose data we are synchronizing.
   Profile* profile_;
 
   // The class that handles getting, setting, and persisting sync
   // preferences.
   browser_sync::SyncPrefs sync_prefs_;
 
   // TODO(ncarter): Put this in a profile, once there is UI for it.
   // This specifies where to find the sync server.
   GURL sync_service_url_;
 
   // The last time we detected a successful transition from SYNCING state.
   // Our backend notifies us whenever we should take a new snapshot.
   base::Time last_synced_time_;
 
   // List of available data type controllers.
   browser_sync::DataTypeController::TypeMap data_type_controllers_;
 
   // Whether the SyncBackendHost has been initialized.
   bool backend_initialized_;
 
-  // Various pieces of UI query this value to determine if they should show
-  // an "Authenticating.." type of message.  We are the only central place
-  // all auth attempts funnel through, so it makes sense to provide this.
-  // As its name suggests, this should NOT be used for anything other than UI.
+  // Set to true if a signin has completed but we're still waiting for the
+  // backend to refresh its credentials.
   bool is_auth_in_progress_;
 
   SyncSetupWizard wizard_;
 
   // Encapsulates user signin - used to set/get the user's authenticated
   // email address.
   SigninManager* signin_;
 
   // True if an unrecoverable error (e.g. violation of an assumed invariant)
   // occurred during syncer operation.  This value should be checked before
@@ skipping 79 matching lines @@
   browser_sync::DataTypeManager::ConfigureStatus configure_status_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };
 
 bool ShouldShowActionOnUI(
     const browser_sync::SyncProtocolError& error);
 
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_