Merge 75769 - When enabling password sync manually, use the passphrase migrat...

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
===================================================================
--- chrome/browser/sync/profile_sync_service.cc	(revision 75848)
+++ chrome/browser/sync/profile_sync_service.cc	(working copy)
@@ -700,8 +700,13 @@
     return;
   }
 
-  if (WizardIsVisible()) {
+  if (WizardIsVisible() && for_decryption) {
     wizard_.Step(SyncSetupWizard::ENTER_PASSPHRASE);
+  } else if (WizardIsVisible() && !for_decryption) {
+    // The user is enabling an encrypted data type for the first
+    // time, and we don't even have a default passphrase.  We need
+    // to refresh credentials and show the passphrase migration.
+    SigninForPassphraseMigration(NULL);
   }
 
   NotifyObservers();
@@ -733,6 +738,9 @@
 
   if (WizardIsVisible()) {
     wizard_.Focus();
+    // Force the wizard to step to the login screen (which will only actually
+    // happen if the transition is valid).
+    wizard_.Step(SyncSetupWizard::GAIA_LOGIN);
     return;
   }