[Sync] Only step to done in wizard if encryption is complete.

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 9cbb4df057af99e1ca562bad4cce61a0084c61b5..ac8a84ff472080c02374d16eefcd2ff3072f328c 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -817,10 +817,11 @@ void ProfileSyncService::ResolvePassphraseRequired() {
                                   sync_api::CONFIGURE_REASON_RECONFIGURATION);
   }
 
-  // No encryption is pending, our passphrase has been accepted, so tell the
+  // If No encryption is pending and our passphrase has been accepted, tell the
   // wizard we're done (no need to hang around waiting for the sync to
-  // complete).
-  if (WizardIsVisible())
+  // complete). If encryption is pending, its successful completion will trigger
+  // the done step.
+  if (WizardIsVisible() && !encryption_pending())
     wizard_.Step(SyncSetupWizard::DONE);
 
   NotifyObservers();