| Index: chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h
|
| diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h b/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h
|
| index ddf914c35e9b0c6223a3ad5849f51b51da1af0b6..d49eee5be5b7a68809c5ccb74ea195c03de982da 100644
|
| --- a/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h
|
| +++ b/chrome/browser/sync/glue/non_frontend_data_type_controller_mock.h
|
| @@ -39,11 +39,11 @@ class NonFrontendDataTypeControllerMock : public NonFrontendDataTypeController {
|
| MOCK_METHOD0(CreateSyncComponents,
|
| ProfileSyncComponentsFactory::SyncComponents());
|
| 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));
|
| @@ -53,7 +53,7 @@ class NonFrontendDataTypeControllerMock : public NonFrontendDataTypeController {
|
| MOCK_METHOD2(RecordUnrecoverableError, void(const tracked_objects::Location&,
|
| const std::string&));
|
| MOCK_METHOD1(RecordAssociationTime, void(base::TimeDelta time));
|
| - MOCK_METHOD1(RecordStartFailure, void(StartResult result));
|
| + MOCK_METHOD1(RecordStartFailure, void(ConfigureResult result));
|
|
|
| protected:
|
| virtual ~NonFrontendDataTypeControllerMock();
|
|
|