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

chrome/browser/sync/sync_setup_wizard.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_wizard.h"
 
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
 #include "base/singleton.h"
 #include "chrome/browser/browser_thread.h"
@@ skipping 261 matching lines @@
 void SyncSetupWizard::SetParent(gfx::NativeWindow parent_window) {
   parent_window_ = parent_window;
 }
 
 // static
 SyncSetupWizard::State SyncSetupWizard::GetEndStateForDiscreteRun(
     State start_state) {
   State result = FATAL_ERROR;
   if (start_state == GAIA_LOGIN) {
     result = GAIA_SUCCESS;
+  } else if (start_state == ENTER_PASSPHRASE) {
+    result = DONE;
   } else if (start_state == CONFIGURE) {
     result = DONE;
   }
   DCHECK_NE(FATAL_ERROR, result) <<
       "Invalid start state for discrete run: " << start_state;
   return result;
 }