| Index: components/sync_driver/non_ui_data_type_controller.h
|
| diff --git a/components/sync_driver/non_ui_data_type_controller.h b/components/sync_driver/non_ui_data_type_controller.h
|
| index 4143906ae15a4d81c5480e53922da5cd23dd7790..17a0dbe3e2541ff8ddf92868b2e410896681c05a 100644
|
| --- a/components/sync_driver/non_ui_data_type_controller.h
|
| +++ b/components/sync_driver/non_ui_data_type_controller.h
|
| @@ -77,13 +77,13 @@ class NonUIDataTypeController : public DataTypeController {
|
| // Start up complete, update the state and invoke the callback.
|
| // Note: this is performed on the datatype's thread.
|
| virtual void StartDone(
|
| - DataTypeController::StartResult start_result,
|
| + DataTypeController::ConfigureResult start_result,
|
| const syncer::SyncMergeResult& local_merge_result,
|
| const syncer::SyncMergeResult& syncer_merge_result);
|
|
|
| // UI thread implementation of StartDone.
|
| virtual void StartDoneImpl(
|
| - DataTypeController::StartResult start_result,
|
| + DataTypeController::ConfigureResult start_result,
|
| DataTypeController::State new_state,
|
| const syncer::SyncMergeResult& local_merge_result,
|
| const syncer::SyncMergeResult& syncer_merge_result);
|
| @@ -95,7 +95,7 @@ class NonUIDataTypeController : public DataTypeController {
|
| virtual void RecordAssociationTime(base::TimeDelta time);
|
|
|
| // Record causes of start failure.
|
| - virtual void RecordStartFailure(StartResult result);
|
| + virtual void RecordStartFailure(ConfigureResult result);
|
|
|
| // To allow unit tests to control thread interaction during non-ui startup
|
| // and shutdown, use a factory method to create the SharedChangeProcessor.
|
|
|