| Index: chrome/browser/sync/glue/bookmark_model_associator.cc
|
| diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc
|
| index 8d3066a06e43eb8944e4813333b7e7eeb6c1bb29..03eb2a1c73214dc141728ded0b40af18a727e1a1 100644
|
| --- a/chrome/browser/sync/glue/bookmark_model_associator.cc
|
| +++ b/chrome/browser/sync/glue/bookmark_model_associator.cc
|
| @@ -616,9 +616,9 @@ bool BookmarkModelAssociator::LoadAssociations() {
|
| bool BookmarkModelAssociator::CryptoReadyIfNecessary() {
|
| // We only access the cryptographer while holding a transaction.
|
| sync_api::ReadTransaction trans(FROM_HERE, user_share_);
|
| - const syncable::ModelTypeSet& encrypted_types =
|
| + const syncable::ModelEnumSet encrypted_types =
|
| sync_api::GetEncryptedTypes(&trans);
|
| - return encrypted_types.count(syncable::BOOKMARKS) == 0 ||
|
| + return !encrypted_types.Has(syncable::BOOKMARKS) ||
|
| trans.GetCryptographer()->is_ready();
|
| }
|
|
|
|
|