[Sync] Support receiving early passphrase required information in Sync UI.

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index ebeca38389ea2888a94c24c97b46995224d16a30..932bff99286d521cdcefcd3c48f43cb1b3b12ad9 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -778,16 +778,13 @@ void ProfileSyncService::OnPassphraseAccepted() {
 
   if (data_type_manager_.get()) {
     // Unblock the data type manager if necessary.
+    // This will always trigger a SYNC_CONFIGURE_DONE on completion, which will
+    // step the UI wizard into DONE state (even if no datatypes have changed).
     data_type_manager_->Configure(types,
                                   sync_api::CONFIGURE_REASON_RECONFIGURATION);
   }
 
   NotifyObservers();
-
-  // TODO(tim): We shouldn't call this if !HasSyncSetupCompleted and the user
-  // isn't actually at the ENTER_PASSPHRASE screen.  It results in a
-  // LOG(WARNING) currently.
-  wizard_.Step(SyncSetupWizard::DONE);
 }
 
 void ProfileSyncService::OnEncryptionComplete(
@@ -1189,6 +1186,8 @@ void ProfileSyncService::SetPassphrase(const std::string& passphrase,
                                        bool is_explicit,
                                        bool is_creation) {
   if (ShouldPushChanges() || IsPassphraseRequired()) {
+    VLOG(1) << "Setting " << (is_explicit ? "explicit" : "implicit")
+            << " passphrase " << (is_creation ? " for creation" : "");
     backend_->SetPassphrase(passphrase, is_explicit);
   } else {
     if (is_explicit) {