Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1485)

Unified Diff: chrome/browser/sync/glue/generic_change_processor.cc

Issue 8851006: [Sync] Replace all instances of ModelTypeSet with ModelEnumSet (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup pass #2 Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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();
}
« no previous file with comments | « chrome/browser/sync/glue/data_type_manager_mock.cc ('k') | chrome/browser/sync/glue/session_model_associator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698