| 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 4ed6798eee03f56a30af7e1f644d5761f3ffd321..4785e71d9758304f9b5f74d5154e6bfcc2a63178 100644
|
| --- a/chrome/browser/sync/failed_datatypes_handler.cc
|
| +++ b/chrome/browser/sync/failed_datatypes_handler.cc
|
| @@ -16,9 +16,9 @@ FailedDatatypesHandler::~FailedDatatypesHandler() {
|
| }
|
|
|
| syncable::ModelTypeSet GetTypesFromErrorsList(
|
| - const std::list<SyncError>& errors) {
|
| + const std::list<csync::SyncError>& errors) {
|
| syncable::ModelTypeSet result;
|
| - for (std::list<SyncError>::const_iterator it = errors.begin();
|
| + for (std::list<csync::SyncError>::const_iterator it = errors.begin();
|
| it != errors.end(); ++it) {
|
| DCHECK(!result.Has(it->type()));
|
| result.Put(it->type());
|
| @@ -33,7 +33,7 @@ syncable::ModelTypeSet FailedDatatypesHandler::GetFailedTypes() const {
|
| }
|
|
|
| bool FailedDatatypesHandler::UpdateFailedDatatypes(
|
| - const std::list<SyncError>& errors,
|
| + const std::list<csync::SyncError>& errors,
|
| FailureType failure_type) {
|
| const syncable::ModelTypeSet types = GetFailedTypes();
|
| if (failure_type == RUNTIME) {
|
| @@ -56,9 +56,10 @@ void FailedDatatypesHandler::OnUserChoseDatatypes() {
|
| runtime_errors_.clear();
|
| }
|
|
|
| -std::string GetErrorStringFromErrors(const std::list<SyncError>& errors) {
|
| +std::string GetErrorStringFromErrors(
|
| + const std::list<csync::SyncError>& errors) {
|
| std::string message;
|
| - for (std::list<SyncError>::const_iterator it = errors.begin();
|
| + for (std::list<csync::SyncError>::const_iterator it = errors.begin();
|
| it != errors.end(); ++it) {
|
| if (it != errors.begin()) {
|
| message += ", ";
|
|
|