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

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 <algorithm>
 #include <cstddef>
 #include <map>
 #include <set>
@@ skipping 799 matching lines @@
   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).
     // This will be ignored, because we will already have transitioned to DONE
     // below.
     data_type_manager_->Configure(types,
                                   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();
 }
 
 void ProfileSyncService::OnEncryptionComplete(
     const syncable::ModelTypeSet& encrypted_types) {
   if (encryption_pending_) {
     syncable::ModelTypeSet registered_types;
     GetRegisteredDataTypes(&registered_types);
@@ skipping 688 matching lines @@
             << "Unrecoverable error.";
   } else {
     VLOG(0) << "ConfigureDataTypeManager not invoked because backend is not "
             << "initialized";
   }
 }
 
 const FailedDatatypesHandler& ProfileSyncService::failed_datatypes_handler() {
   return failed_datatypes_handler_;
 }