Index: chrome/browser/sync/glue/session_model_associator.cc |
diff --git a/chrome/browser/sync/glue/session_model_associator.cc b/chrome/browser/sync/glue/session_model_associator.cc |
index 44c0727dd94fc058ecafb0b3533ea1d757c882bc..8d6f54e95e5e2b7920cbea7ed3ac6213f3d4d60c 100644 |
--- a/chrome/browser/sync/glue/session_model_associator.cc |
+++ b/chrome/browser/sync/glue/session_model_associator.cc |
@@ -1247,9 +1247,9 @@ void SessionModelAssociator::PopulateSessionSpecificsTab( |
bool SessionModelAssociator::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(SESSIONS) == 0 || |
+ const syncable::ModelEnumSet encrypted_types = |
+ sync_api::GetEncryptedTypes(&trans); |
+ return !encrypted_types.Has(SESSIONS) || |
sync_service_->IsCryptographerReady(&trans); |
} |