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

chrome/browser/sync/sync_setup_flow.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/sync_setup_flow.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 316 matching lines @@
     }
   }
 
   service_->OnUserChoseDatatypes(configuration.sync_everything,
                                  configuration.data_types);
 
   // See if we are done configuring (if we don't need a passphrase, and don't
   // need to hang around waiting for encryption to happen, just exit). This call
   // to IsPassphraseRequiredForDecryption() takes into account the data types
   // we just enabled/disabled.
-  if (!service_->IsPassphraseRequiredForDecryption()) {
+  if (!service_->IsPassphraseRequiredForDecryption() &&
+      !service_->encryption_pending()) {
     Advance(SyncSetupWizard::DONE);
   } else if (!set_new_decryption_passphrase) {
     // We need a passphrase, but the user did not provide one, so transition
     // directly to ENTER_PASSPHRASE (otherwise we'll have to wait until
     // the sync engine generates another OnPassphraseRequired() at the end of
     // the sync cycle which can take a long time).
     Advance(SyncSetupWizard::ENTER_PASSPHRASE);
   }
 }
 
@@ skipping 144 matching lines @@
     }
     case SyncSetupWizard::DONE:
     case SyncSetupWizard::ABORT:
       flow_handler_->ShowSetupDone(
           UTF16ToWide(service_->GetAuthenticatedUsername()));
       break;
     default:
       NOTREACHED() << "Invalid advance state: " << state;
   }
 }