| Index: chrome/browser/sync/glue/theme_model_associator.cc
|
| diff --git a/chrome/browser/sync/glue/theme_model_associator.cc b/chrome/browser/sync/glue/theme_model_associator.cc
|
| index e4100411ea22c34f56c654a746522765cff3c1b2..689ca9a6f7ae853de6ab6f19390308aae960ebbc 100644
|
| --- a/chrome/browser/sync/glue/theme_model_associator.cc
|
| +++ b/chrome/browser/sync/glue/theme_model_associator.cc
|
| @@ -103,9 +103,9 @@ bool ThemeModelAssociator::SyncModelHasUserCreatedNodes(bool* has_nodes) {
|
| bool ThemeModelAssociator::CryptoReadyIfNecessary() {
|
| // We only access the cryptographer while holding a transaction.
|
| sync_api::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());
|
| - syncable::ModelTypeSet encrypted_types;
|
| - encrypted_types = sync_api::GetEncryptedTypes(&trans);
|
| - return encrypted_types.count(syncable::THEMES) == 0 ||
|
| + syncable::ModelEnumSet encrypted_types =
|
| + sync_api::GetEncryptedTypes(&trans);
|
| + return !encrypted_types.Has(syncable::THEMES) ||
|
| sync_service_->IsCryptographerReady(&trans);
|
| }
|
|
|
|
|