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

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2010 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 682 matching lines @@
   passphrase_required_for_decryption_ = for_decryption;
 
   if (!cached_passphrase_.value.empty()) {
     SetPassphrase(cached_passphrase_.value,
                   cached_passphrase_.is_explicit,
                   cached_passphrase_.is_creation);
     cached_passphrase_ = CachedPassphrase();
     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();
 }
 
 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();
+    // 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;
   }
 
   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 461 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;
 }