| 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 8230ce96c11912a24bd9a7cb17de81e3ea2e3c16..63e0139f8324af934a07937ad18526f7eb2d9301 100644
|
| --- a/chrome/browser/sync/sync_setup_flow.cc
|
| +++ b/chrome/browser/sync/sync_setup_flow.cc
|
| @@ -273,6 +273,13 @@ void SyncSetupFlow::OnUserConfigured(const SyncConfiguration& configuration) {
|
| !configuration.use_secondary_passphrase ||
|
| configuration.secondary_passphrase.length() > 0);
|
|
|
| + if (!configuration.gaia_passphrase.empty()) {
|
| + // Caller passed a gaia passphrase. This is illegal if we are currently
|
| + // using a secondary passphrase.
|
| + DCHECK(!service_->IsUsingSecondaryPassphrase());
|
| + service_->SetPassphrase(configuration.gaia_passphrase, false, false);
|
| + }
|
| +
|
| if (configuration.use_secondary_passphrase) {
|
| if (!service_->IsUsingSecondaryPassphrase()) {
|
| service_->SetPassphrase(configuration.secondary_passphrase, true, true);
|
|
|