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 61c1fb54e8dec839847ea5b5e696a2e98032bb3c..7f6e354aa21131c1b0bf6e85842192361b773900 100644 |
--- a/chrome/browser/sync/sync_setup_flow.cc |
+++ b/chrome/browser/sync/sync_setup_flow.cc |
@@ -271,10 +271,14 @@ void SyncSetupFlow::OnUserConfigured(const SyncConfiguration& configuration) { |
!configuration.use_secondary_passphrase || |
configuration.secondary_passphrase.length() > 0); |
- if (configuration.use_secondary_passphrase && |
- !service_->IsUsingSecondaryPassphrase()) { |
- service_->SetPassphrase(configuration.secondary_passphrase, true, true); |
- tried_creating_explicit_passphrase_ = true; |
+ if (configuration.use_secondary_passphrase) { |
+ if (!service_->IsUsingSecondaryPassphrase()) { |
+ service_->SetPassphrase(configuration.secondary_passphrase, true, true); |
+ tried_creating_explicit_passphrase_ = true; |
+ } else { |
+ service_->SetPassphrase(configuration.secondary_passphrase, true, false); |
+ tried_setting_explicit_passphrase_ = true; |
+ } |
} |
service_->OnUserChoseDatatypes(configuration.sync_everything, |