[Sync Setup UI] Separate stepping the SyncSetupWizard from syncSetup page navigation.

chrome/browser/ui/webui/sync_setup_handler.cc

Index: chrome/browser/ui/webui/sync_setup_handler.cc
diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc
index c15b4f80404c7da10883543988b40527fe1b819b..290a3b2fdb5812d7aae2951f38a80b85d60a62ee 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler.cc
@@ -681,6 +681,8 @@ void SyncSetupHandler::HandleShowSetupUI(const ListValue* args) {
     CloseOverlay();
     return;
   }
+
+  StepWizardForShowSetupUI();
   ShowSetupUI();
 }
 
@@ -712,6 +714,10 @@ void SyncSetupHandler::OpenSyncSetup() {
     return;
   }
 
+  // The wizard must be stepped before attaching. Allow subclasses to step the
+  // wizard to appropriate state.
+  StepWizardForShowSetupUI();
+
   // Attach this as the sync setup handler, before calling ShowSetupUI().
   if (!service->get_wizard().AttachSyncSetupHandler(this)) {
     LOG(ERROR) << "SyncSetupHandler attach failed!";