| Index: components/sync_driver/data_type_manager.h
|
| diff --git a/components/sync_driver/data_type_manager.h b/components/sync_driver/data_type_manager.h
|
| index ecb3f0cb461fd266b479daa92676c432fa11f133..6ea5254c5beae7c1ef5ab072937ff480190cf315 100644
|
| --- a/components/sync_driver/data_type_manager.h
|
| +++ b/components/sync_driver/data_type_manager.h
|
| @@ -37,8 +37,7 @@ class DataTypeManager {
|
| // this.
|
| enum ConfigureStatus {
|
| UNKNOWN = -1,
|
| - OK, // Configuration finished without error.
|
| - PARTIAL_SUCCESS, // Some data types had an error while starting up.
|
| + OK, // Configuration finished some or all types.
|
| ABORTED, // Start was aborted by calling Stop() before
|
| // all types were started.
|
| UNRECOVERABLE_ERROR // We got an unrecoverable error during startup.
|
| @@ -49,28 +48,10 @@ class DataTypeManager {
|
| ConfigureResult();
|
| ConfigureResult(ConfigureStatus status,
|
| syncer::ModelTypeSet requested_types);
|
| - ConfigureResult(ConfigureStatus status,
|
| - syncer::ModelTypeSet requested_types,
|
| - std::map<syncer::ModelType, syncer::SyncError>
|
| - failed_data_types,
|
| - syncer::ModelTypeSet unfinished_data_types,
|
| - syncer::ModelTypeSet needs_crypto);
|
| ~ConfigureResult();
|
| +
|
| ConfigureStatus status;
|
| syncer::ModelTypeSet requested_types;
|
| -
|
| - // These types encountered a failure in association.
|
| - std::map<syncer::ModelType, syncer::SyncError> failed_data_types;
|
| -
|
| - // List of types that failed to finish loading/associating within our
|
| - // alloted time period(see |kAssociationTimeOutInSeconds|). We move
|
| - // forward here and allow these types to continue to load/associate in
|
| - // the background.
|
| - syncer::ModelTypeSet unfinished_data_types;
|
| -
|
| - // Those types that are unable to start due to the cryptographer not being
|
| - // ready.
|
| - syncer::ModelTypeSet needs_crypto;
|
| };
|
|
|
| virtual ~DataTypeManager() {}
|
|
|