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

chrome/browser/sync/profile_sync_service.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/profile_sync_service.h"
 
 #include <map>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 711 matching lines @@
 
   // We will skip the passphrase prompt and suppress the warning
   // if the passphrase is needed for decryption but the user is
   // not syncing an encrypted data type on this machine.
   // Otherwise we prompt.
   if (!IsEncryptedDatatypeEnabled() && for_decryption) {
     OnPassphraseAccepted();
     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();
 }
 
 void ProfileSyncService::OnPassphraseAccepted() {
   // Make sure the data types that depend on the passphrase are started at
   // this time.
   syncable::ModelTypeSet types;
   GetPreferredDataTypes(&types);
@@ skipping 11 matching lines @@
   if (!cros_user_.empty()) {
     // For ChromeOS, any login UI needs to be handled by the settings page.
     Browser* browser = BrowserList::GetLastActiveWithProfile(profile());
     if (browser)
       browser->ShowOptionsTab(chrome::kPersonalOptionsSubPage);
     return;
   }
 
   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;
   }
 
   if (!auth_error_time_.is_null()) {
     UMA_HISTOGRAM_LONG_TIMES("Sync.ReauthorizationTime",
                              base::TimeTicks::Now() - auth_error_time_);
     auth_error_time_ = base::TimeTicks();  // Reset auth_error_time_ to null.
   }
 
   wizard_.SetParent(parent_window);
@@ skipping 543 matching lines @@
   // is initialized, all enabled data types are consistent with one
   // another, and no unrecoverable error has transpired.
   if (unrecoverable_error_detected_)
     return false;
 
   if (!data_type_manager_.get())
     return false;
 
   return data_type_manager_->state() == DataTypeManager::CONFIGURED;
 }