| Index: chrome/browser/sync/sync_setup_flow.cc
|
| diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc
|
| index f52ac2e4fbc102bed5cc1d6da1183ba0bb4025ed..e83183122a0d0984bc06b0abf6acce58beaa5b39 100644
|
| --- a/chrome/browser/sync/sync_setup_flow.cc
|
| +++ b/chrome/browser/sync/sync_setup_flow.cc
|
| @@ -334,7 +334,8 @@ void SyncSetupFlow::OnUserConfigured(const SyncConfiguration& configuration) {
|
| // 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
|
|
|