| 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 490140b7d6d0002397797783f62b383481e75fb7..effba20a03447eb2215f9c54d3f846236b8364a0 100644
|
| --- a/chrome/browser/sync/failed_datatypes_handler.cc
|
| +++ b/chrome/browser/sync/failed_datatypes_handler.cc
|
| @@ -15,9 +15,9 @@ FailedDatatypesHandler::FailedDatatypesHandler(ProfileSyncService* service)
|
| FailedDatatypesHandler::~FailedDatatypesHandler() {
|
| }
|
|
|
| -syncable::ModelTypeSet GetTypesFromErrorsList(
|
| +syncer::ModelTypeSet GetTypesFromErrorsList(
|
| const std::vector<syncer::SyncError>& errors) {
|
| - syncable::ModelTypeSet result;
|
| + syncer::ModelTypeSet result;
|
| for (std::vector<syncer::SyncError>::const_iterator it = errors.begin();
|
| it != errors.end(); ++it) {
|
| DCHECK(!result.Has(it->type()));
|
| @@ -26,8 +26,8 @@ syncable::ModelTypeSet GetTypesFromErrorsList(
|
| return result;
|
| }
|
|
|
| -syncable::ModelTypeSet FailedDatatypesHandler::GetFailedTypes() const {
|
| - syncable::ModelTypeSet result = GetTypesFromErrorsList(startup_errors_);
|
| +syncer::ModelTypeSet FailedDatatypesHandler::GetFailedTypes() const {
|
| + syncer::ModelTypeSet result = GetTypesFromErrorsList(startup_errors_);
|
| result.PutAll(GetTypesFromErrorsList(runtime_errors_));
|
| return result;
|
| }
|
| @@ -35,7 +35,7 @@ syncable::ModelTypeSet FailedDatatypesHandler::GetFailedTypes() const {
|
| bool FailedDatatypesHandler::UpdateFailedDatatypes(
|
| const std::list<syncer::SyncError>& errors,
|
| FailureType failure_type) {
|
| - const syncable::ModelTypeSet types = GetFailedTypes();
|
| + const syncer::ModelTypeSet types = GetFailedTypes();
|
| if (failure_type == RUNTIME) {
|
| runtime_errors_.insert(runtime_errors_.end(),
|
| errors.begin(),
|
|
|