| Index: chrome/browser/sync/failed_datatypes_handler.cc
|
| diff --git a/chrome/browser/sync/failed_datatypes_handler.cc b/chrome/browser/sync/failed_datatypes_handler.cc
|
| index d1feb347b0b2d6eda685bc146abeda80acf086b9..2bd586430d7fe473211f56483dab0a95f910cfa9 100644
|
| --- a/chrome/browser/sync/failed_datatypes_handler.cc
|
| +++ b/chrome/browser/sync/failed_datatypes_handler.cc
|
| @@ -15,23 +15,23 @@ FailedDatatypesHandler::FailedDatatypesHandler(ProfileSyncService* service)
|
| FailedDatatypesHandler::~FailedDatatypesHandler() {
|
| }
|
|
|
| -syncable::ModelTypeSet FailedDatatypesHandler::GetFailedTypes() const {
|
| - syncable::ModelTypeSet result;
|
| +syncable::ModelEnumSet FailedDatatypesHandler::GetFailedTypes() const {
|
| + syncable::ModelEnumSet result;
|
| for (std::list<SyncError>::const_iterator it = errors_.begin();
|
| it != errors_.end(); ++it) {
|
| - DCHECK(result.count(it->type()) == 0);
|
| - result.insert(it->type());
|
| + DCHECK(!result.Has(it->type()));
|
| + result.Put(it->type());
|
| }
|
| return result;
|
| }
|
|
|
| bool FailedDatatypesHandler::UpdateFailedDatatypes(
|
| DataTypeManager::ConfigureResult result) {
|
| - syncable::ModelTypeSet types = GetFailedTypes();
|
| + const syncable::ModelEnumSet types = GetFailedTypes();
|
| bool any_new_failed_types = false;
|
| for (std::list<SyncError>::iterator it = result.errors.begin();
|
| it != result.errors.end(); ++it) {
|
| - DCHECK(types.count(it->type()) == 0);
|
| + DCHECK(!types.Has(it->type()));
|
| any_new_failed_types = true;
|
| errors_.push_back(*it);
|
| }
|
|
|