Moved the handling of the initial passphrase into SyncSetupFlow.

chrome/browser/sync/profile_sync_service.h

Index: chrome/browser/sync/profile_sync_service.h
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index 0af7081470d24f4fc938ef66497ecb372cc6fb5c..a15220c35230d28eb3ddfd1ce02e831361838c17 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -440,14 +440,10 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
   // 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_).
@@ -635,16 +631,11 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
   // 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_;
@@ -662,6 +653,12 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
   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);