Moved the handling of the initial passphrase into SyncSetupFlow.

chrome/browser/sync/profile_sync_service.h

 // Copyright (c) 2011 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 <string>
 
@@ skipping 421 matching lines @@
 
   // Returns true if a secondary passphrase is being used.
   virtual bool IsUsingSecondaryPassphrase() const;
 
   // Sets the Cryptographer's passphrase, or caches it until that is possible.
   // This will check asynchronously whether the passphrase is valid and notify
   // ProfileSyncServiceObservers via the NotificationService when the outcome
   // is known.
   // |is_explicit| is true if the call is in response to the user explicitly
   // setting a passphrase as opposed to implicitly (from the users' perspective)
-  // using their Google Account password.  An implicit SetPassphrase will *not*
+  // using their Google Account password.  An implicit SetPassphrase will
   // *not* override an explicit passphrase set previously.
-  // |is_creation| is true if the call is in response to the user setting
-  // up a new passphrase, and false if it's being set in response to a prompt
-  // for an existing passphrase.
   virtual void SetPassphrase(const std::string& passphrase,
-                             bool is_explicit,
-                             bool is_creation);
+                             bool is_explicit);
 
   // Sets the set of datatypes that are waiting for encryption
   // (pending_types_for_encryption_).
   // Note that this does not trigger the actual encryption. The encryption call
   // is kicked off automatically the next time the datatype manager is
   // reconfigured.
   virtual void set_pending_types_for_encryption(
       const syncable::ModelTypeSet& encrypted_types);
 
   // Get the currently encrypted data types.
@@ skipping 167 matching lines @@
 
   // This allows us to gracefully handle an ABORTED return code from the
   // DataTypeManager in the event that the server informed us to cease and
   // desist syncing immediately.
   bool expect_sync_configuration_aborted_;
 
   // Sometimes we need to temporarily hold on to a passphrase because we don't
   // yet have a backend to send it to.  This happens during initialization as
   // we don't StartUp until we have a valid token, which happens after valid
   // credentials were provided.
-  struct CachedPassphrase {
-    std::string value;
-    bool is_explicit;
-    bool is_creation;
-    CachedPassphrase() : is_explicit(false), is_creation(false) {}
+  struct CachedPassphrases {
+    std::string explicit_passphrase;
+    std::string gaia_passphrase;
   };
-  CachedPassphrase cached_passphrase_;
-
-  // TODO(lipalani): Bug 82221 unify this with the CachedPassphrase struct.
-  std::string gaia_password_;
+  CachedPassphrases cached_passphrases_;
 
   // Keep track of where we are in a server clear operation
   ClearServerDataState clear_server_data_state_;
 
   // Timeout for the clear data command.  This timeout is a temporary hack
   // and is necessary because the nudge sync framework can drop nudges for
   // a wide variety of sync-related conditions (throttling, connections issues,
   // syncer paused, etc.).  It can only be removed correctly when the framework
   // is reworked to allow one-shot commands like clearing server data.
   base::OneShotTimer<ProfileSyncService> clear_server_data_timer_;
 
   // The most recently requested set of types to encrypt. Set by the user,
   // and cached until the syncer either finishes encryption
   // (OnEncryptionComplete) or the user cancels.
   syncable::ModelTypeSet pending_types_for_encryption_;
   bool set_backend_encrypted_types_;
 
+  // If true, we want to automatically start sync signin whenever we have
+  // credentials (user doesn't need to go through the startup flow). This is
+  // typically enabled on platforms (like ChromeOS) that have their own
+  // distinct signin flow.
+  bool auto_start_enabled_;
+
   scoped_ptr<browser_sync::BackendMigrator> migrator_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_