| 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 fa4194b161bbb7c3c24e7df34e097f2a38f4f5b6..1cee31d21d846a5b4b587ac3d3d9aa0e574963ca 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<csync::SyncError>& failed_data_types,
|
| + const std::list<syncer::SyncError>& failed_data_types,
|
| syncable::ModelTypeSet waiting_to_start);
|
| ~ConfigureResult();
|
| ConfigureStatus status;
|
| TypeSet requested_types;
|
|
|
| // These types encountered a failure in association.
|
| - std::list<csync::SyncError> failed_data_types;
|
| + std::list<syncer::SyncError> failed_data_types;
|
|
|
| // List of types that failed to start association with in our alloted
|
| // time period(see kDataTypeLoadWaitTimeInSeconds). We move
|
| @@ -94,10 +94,10 @@ class DataTypeManager {
|
| // progress. Configuration will be complete only when the
|
| // desired_types supplied in the last call to Configure is achieved.
|
| virtual void Configure(TypeSet desired_types,
|
| - csync::ConfigureReason reason) = 0;
|
| + syncer::ConfigureReason reason) = 0;
|
|
|
| virtual void ConfigureWithoutNigori(TypeSet desired_types,
|
| - csync::ConfigureReason reason) = 0;
|
| + syncer::ConfigureReason reason) = 0;
|
|
|
| // Synchronously stops all registered data types. If called after
|
| // Configure() is called but before it finishes, it will abort the
|
|
|