Sync: Refactor the ProfileSyncService and sync setup flow to remove use of WebUI from PSS.

chrome/browser/sync/sync_setup_wizard.cc

 // 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.
 
 #include "chrome/browser/sync/sync_setup_wizard.h"
 
 #include <stddef.h>
 #include <ostream>
 
 #include "base/logging.h"
@@ skipping 59 matching lines @@
   return flow;
 }
 
 // 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 ||
+             start_state == NONFATAL_ERROR ||
              start_state == SYNC_EVERYTHING ||
              start_state == CONFIGURE) {
     result = DONE;
   }
   DCHECK_NE(FATAL_ERROR, result) <<
       "Invalid start state for discrete run: " << start_state;
   return result;
 }