Fix some problems with the ENTER_PASSPHRASE state in sync setup....

chrome/browser/sync/sync_setup_flow.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/sync/sync_setup_flow.h"
 
 #include "app/gfx/font_util.h"
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 447 matching lines @@
   switch (state) {
     case SyncSetupWizard::GAIA_LOGIN:
       return current_state_ == SyncSetupWizard::FATAL_ERROR ||
              current_state_ == SyncSetupWizard::GAIA_LOGIN;
     case SyncSetupWizard::GAIA_SUCCESS:
       return current_state_ == SyncSetupWizard::GAIA_LOGIN;
     case SyncSetupWizard::CONFIGURE:
       return current_state_ == SyncSetupWizard::GAIA_SUCCESS;
     case SyncSetupWizard::CREATE_PASSPHRASE:
       return current_state_ == SyncSetupWizard::CONFIGURE;
+    case SyncSetupWizard::ENTER_PASSPHRASE:
+      return current_state_ == SyncSetupWizard::CONFIGURE ||
+             current_state_ == SyncSetupWizard::SETTING_UP;
     case SyncSetupWizard::SETUP_ABORTED_BY_PENDING_CLEAR:
       return current_state_ == SyncSetupWizard::CONFIGURE;
     case SyncSetupWizard::SETTING_UP:
       return current_state_ == SyncSetupWizard::CONFIGURE ||
-             current_state_ == SyncSetupWizard::CREATE_PASSPHRASE;
+             current_state_ == SyncSetupWizard::CREATE_PASSPHRASE ||
+             current_state_ == SyncSetupWizard::ENTER_PASSPHRASE;
     case SyncSetupWizard::FATAL_ERROR:
       return true;  // You can always hit the panic button.
     case SyncSetupWizard::DONE_FIRST_TIME:
     case SyncSetupWizard::DONE:
-      return current_state_ == SyncSetupWizard::SETTING_UP;
+      return current_state_ == SyncSetupWizard::SETTING_UP ||
+             current_state_ == SyncSetupWizard::ENTER_PASSPHRASE;
     default:
       NOTREACHED() << "Unhandled State: " << state;
       return false;
   }
 }
 
 void SyncSetupFlow::Advance(SyncSetupWizard::State advance_state) {
   if (!ShouldAdvance(advance_state)) {
     LOG(WARNING) << "Invalid state change from "
                  << current_state_ << " to " << advance_state;
@@ skipping 159 matching lines @@
       !service_->IsUsingSecondaryPassphrase())
     service_->SetSecondaryPassphrase(configuration_.secondary_passphrase);
 
   service_->OnUserChoseDatatypes(configuration_.sync_everything,
                                  configuration_.data_types);
 
   configuration_pending_ = false;
 }
 
 void SyncSetupFlow::OnPassphraseEntry(const std::string& passphrase) {
-  if (configuration_pending_) {
+  if (current_state_ == SyncSetupWizard::ENTER_PASSPHRASE) {
+    service_->SetSecondaryPassphrase(passphrase);
+    Advance(SyncSetupWizard::SETTING_UP);
+  } else if (configuration_pending_) {
     configuration_.secondary_passphrase = passphrase;
     OnConfigurationComplete();
   }
 }