When enabling password sync manually, use the passphrase migration flow to cr...

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
===================================================================
--- chrome/browser/sync/profile_sync_service.cc	(revision 75617)
+++ chrome/browser/sync/profile_sync_service.cc	(working copy)
@@ -729,8 +729,10 @@
     return;
   }
 
-  if (WizardIsVisible()) {
+  if (WizardIsVisible() && for_decryption) {
     wizard_.Step(SyncSetupWizard::ENTER_PASSPHRASE);
+  } else if (WizardIsVisible() && !for_decryption) {
+    SigninForPassphraseMigration(NULL);

[tim (not reviewing), 2011/02/23 18:10:44]

comment explaining why we do this would be nice

   }
 
   NotifyObservers();
@@ -762,6 +764,7 @@
 
   if (WizardIsVisible()) {
     wizard_.Focus();
+    wizard_.Step(SyncSetupWizard::GAIA_LOGIN);

[tim (not reviewing), 2011/02/23 18:10:44]

Can you add a comment here why the step is necessary

     return;
   }