| Index: chrome/browser/sync/notifier/registration_manager.cc
|
| diff --git a/chrome/browser/sync/notifier/registration_manager.cc b/chrome/browser/sync/notifier/registration_manager.cc
|
| index 2ab8b6274cfedb1ad896e189df23f20b6f936e2e..d510012bcf3aeac32afcda72d2616c9ead28e3c6 100644
|
| --- a/chrome/browser/sync/notifier/registration_manager.cc
|
| +++ b/chrome/browser/sync/notifier/registration_manager.cc
|
| @@ -70,13 +70,13 @@ RegistrationManager::~RegistrationManager() {
|
| }
|
|
|
| void RegistrationManager::SetRegisteredTypes(
|
| - const syncable::ModelTypeSet& types) {
|
| + syncable::ModelEnumSet types) {
|
| DCHECK(non_thread_safe_.CalledOnValidThread());
|
|
|
| for (int i = syncable::FIRST_REAL_MODEL_TYPE;
|
| i < syncable::MODEL_TYPE_COUNT; ++i) {
|
| syncable::ModelType model_type = syncable::ModelTypeFromInt(i);
|
| - if (types.count(model_type) > 0) {
|
| + if (types.Has(model_type)) {
|
| if (!IsTypeRegistered(model_type)) {
|
| TryRegisterType(model_type, false /* is_retry */);
|
| }
|
| @@ -118,14 +118,14 @@ void RegistrationManager::DisableType(syncable::ModelType model_type) {
|
| status->Disable();
|
| }
|
|
|
| -syncable::ModelTypeSet RegistrationManager::GetRegisteredTypes() const {
|
| +syncable::ModelEnumSet RegistrationManager::GetRegisteredTypes() const {
|
| DCHECK(non_thread_safe_.CalledOnValidThread());
|
| - syncable::ModelTypeSet registered_types;
|
| + syncable::ModelEnumSet registered_types;
|
| for (int i = syncable::FIRST_REAL_MODEL_TYPE;
|
| i < syncable::MODEL_TYPE_COUNT; ++i) {
|
| syncable::ModelType model_type = syncable::ModelTypeFromInt(i);
|
| if (IsTypeRegistered(model_type)) {
|
| - registered_types.insert(model_type);
|
| + registered_types.Put(model_type);
|
| }
|
| }
|
| return registered_types;
|
|
|