Moved the handling of the initial passphrase into SyncSetupFlow.

chrome/browser/sync/sync_setup_flow.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_SYNC_SETUP_FLOW_H_
 #define CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 40 matching lines @@
                             SyncSetupFlowContainer* container,
                             SyncSetupWizard::State start,
                             SyncSetupWizard::State end);
 
   // Fills |args| with "user" and "error" arguments by querying |service|.
   static void GetArgsForGaiaLogin(
       const ProfileSyncService* service,
       DictionaryValue* args);
 
   // Fills |args| for the configure screen (Choose Data Types/Encryption)
-  static void GetArgsForConfigure(
-      ProfileSyncService* service,
-      DictionaryValue* args);
+  void GetArgsForConfigure(ProfileSyncService* service, DictionaryValue* args);
 
   // Attaches the |handler| to this flow. Returns true if successful and false
   // if a handler has already been attached.
   bool AttachSyncSetupHandler(SyncSetupFlowHandler* handler);
 
   // Returns true if a handler is attached to this flow.
   bool IsAttached() const;
 
   // Triggers a state machine transition to advance_state.
   void Advance(SyncSetupWizard::State advance_state);
@@ skipping 29 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, DiscreteRunChooseDataTypes);
   FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest,
                            DiscreteRunChooseDataTypesAbortedByPendingClear);
   FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, EnterPassphraseRequired);
   FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, NonFatalError);
   FRIEND_TEST_ALL_PREFIXES(SyncSetupWizardTest, CrosAuthSetup);
 
   // Use static Run method to get an instance.
   SyncSetupFlow(SyncSetupWizard::State start_state,
                 SyncSetupWizard::State end_state,
-                const std::string& args,
                 SyncSetupFlowContainer* container,
                 ProfileSyncService* service);
 
   // Returns true if |this| should transition its state machine to |state|
   // based on |current_state_|, or false if that would be nonsense or is
   // a no-op.
   bool ShouldAdvance(SyncSetupWizard::State state);
 
   void ActivateState(SyncSetupWizard::State state);
 
   SyncSetupFlowContainer* container_;  // Our container.  Don't own this.
-  std::string dialog_start_args_;  // The args to pass to the initial page.
 
   SyncSetupWizard::State current_state_;
   SyncSetupWizard::State end_state_;  // The goal.
 
   // Time that the GAIA_LOGIN step was received.
   base::TimeTicks login_start_time_;
 
   // The handler needed for the entire flow. Weak reference.
   SyncSetupFlowHandler* flow_handler_;
 
   // We need this to propagate back all user settings changes. Weak reference.
   ProfileSyncService* service_;
 
   // Set to true if we've tried creating/setting an explicit passphrase, so we
   // can appropriately reflect this in the UI.
   bool tried_creating_explicit_passphrase_;
   bool tried_setting_explicit_passphrase_;
 
+  // We track the passphrase the user entered so we can set it when configuring
+  // the ProfileSyncService.
+  std::string cached_passphrase_;
+
   DISALLOW_COPY_AND_ASSIGN(SyncSetupFlow);
 };
 
 // A really simple wrapper for a SyncSetupFlow so that we don't have to
 // add any public methods to the public SyncSetupWizard interface to notify it
 // when the dialog closes.
 class SyncSetupFlowContainer {
  public:
   SyncSetupFlowContainer() : flow_(NULL) { }
   void set_flow(SyncSetupFlow* flow) {
     DCHECK(!flow_ || !flow);
     flow_ = flow;
   }
 
   SyncSetupFlow* get_flow() { return flow_; }
  private:
   SyncSetupFlow* flow_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncSetupFlowContainer);
 };
 
 #endif  // CHROME_BROWSER_SYNC_SYNC_SETUP_FLOW_H_