| Index: chrome/browser/sync/glue/data_type_manager.h
|
| diff --git a/chrome/browser/sync/glue/data_type_manager.h b/chrome/browser/sync/glue/data_type_manager.h
|
| index cc7e8862b6e5eef4ed9513cfa45cff63bab842c1..fa4194b161bbb7c3c24e7df34e097f2a38f4f5b6 100644
|
| --- a/chrome/browser/sync/glue/data_type_manager.h
|
| +++ b/chrome/browser/sync/glue/data_type_manager.h
|
| @@ -59,14 +59,14 @@ class DataTypeManager {
|
| TypeSet requested_types);
|
| ConfigureResult(ConfigureStatus status,
|
| TypeSet requested_types,
|
| - const std::list<SyncError>& failed_data_types,
|
| + const std::list<csync::SyncError>& failed_data_types,
|
| syncable::ModelTypeSet waiting_to_start);
|
| ~ConfigureResult();
|
| ConfigureStatus status;
|
| TypeSet requested_types;
|
|
|
| // These types encountered a failure in association.
|
| - std::list<SyncError> failed_data_types;
|
| + std::list<csync::SyncError> failed_data_types;
|
|
|
| // List of types that failed to start association with in our alloted
|
| // time period(see kDataTypeLoadWaitTimeInSeconds). We move
|
|
|