| Index: chrome/browser/sync/glue/generic_change_processor.cc
|
| diff --git a/chrome/browser/sync/glue/generic_change_processor.cc b/chrome/browser/sync/glue/generic_change_processor.cc
|
| index b49ac1ccdb90c633f368d5b69072d282c60aeedb..d9fa42ab20b4b49297d2aade2c70bbcb42e4842e 100644
|
| --- a/chrome/browser/sync/glue/generic_change_processor.cc
|
| +++ b/chrome/browser/sync/glue/generic_change_processor.cc
|
| @@ -252,9 +252,8 @@ bool GenericChangeProcessor::CryptoReadyIfNecessary(syncable::ModelType type) {
|
| DCHECK_NE(type, syncable::UNSPECIFIED);
|
| // We only access the cryptographer while holding a transaction.
|
| sync_api::ReadTransaction trans(FROM_HERE, share_handle());
|
| - const syncable::ModelTypeSet& encrypted_types =
|
| - GetEncryptedTypes(&trans);
|
| - return encrypted_types.count(type) == 0 ||
|
| + const syncable::ModelEnumSet encrypted_types = GetEncryptedTypes(&trans);
|
| + return !encrypted_types.Has(type) ||
|
| trans.GetCryptographer()->is_ready();
|
| }
|
|
|
|
|