| Index: components/sync_driver/non_ui_data_type_controller_mock.h
|
| diff --git a/components/sync_driver/non_ui_data_type_controller_mock.h b/components/sync_driver/non_ui_data_type_controller_mock.h
|
| index 68f889fa4747333dcc68fc534a2f3b170427ec96..1369c336292964f64bd50a61314aea13e90ee1de 100644
|
| --- a/components/sync_driver/non_ui_data_type_controller_mock.h
|
| +++ b/components/sync_driver/non_ui_data_type_controller_mock.h
|
| @@ -37,16 +37,16 @@ class NonUIDataTypeControllerMock
|
| bool(const tracked_objects::Location&,
|
| const base::Closure&));
|
| MOCK_METHOD3(StartDone,
|
| - void(DataTypeController::StartResult result,
|
| + void(DataTypeController::ConfigureResult result,
|
| const syncer::SyncMergeResult& local_merge_result,
|
| const syncer::SyncMergeResult& syncer_merge_result));
|
| MOCK_METHOD4(StartDoneImpl,
|
| - void(DataTypeController::StartResult result,
|
| + void(DataTypeController::ConfigureResult result,
|
| DataTypeController::State new_state,
|
| const syncer::SyncMergeResult& local_merge_result,
|
| const syncer::SyncMergeResult& syncer_merge_result));
|
| MOCK_METHOD1(RecordAssociationTime, void(base::TimeDelta time));
|
| - MOCK_METHOD1(RecordStartFailure, void(StartResult result));
|
| + MOCK_METHOD1(RecordStartFailure, void(ConfigureResult result));
|
|
|
| protected:
|
| virtual ~NonUIDataTypeControllerMock();
|
|
|