| Index: chrome/browser/sync/glue/frontend_data_type_controller_mock.h
|
| diff --git a/chrome/browser/sync/glue/frontend_data_type_controller_mock.h b/chrome/browser/sync/glue/frontend_data_type_controller_mock.h
|
| index f1cfef19acb3f0664ad7507f7c9e544046b82398..6f7434a39abda7b78bf1acc8f13cb8c330a01913 100644
|
| --- a/chrome/browser/sync/glue/frontend_data_type_controller_mock.h
|
| +++ b/chrome/browser/sync/glue/frontend_data_type_controller_mock.h
|
| @@ -38,10 +38,12 @@ class FrontendDataTypeControllerMock : public FrontendDataTypeController {
|
| const syncer::SyncError& error));
|
| MOCK_METHOD1(FinishStart, void(StartResult result));
|
| MOCK_METHOD0(CleanUpState, void());
|
| - MOCK_CONST_METHOD0(model_associator, AssociatorInterface*());
|
| - MOCK_METHOD1(set_model_associator, void(AssociatorInterface* associator));
|
| - MOCK_CONST_METHOD0(change_processor, ChangeProcessor*());
|
| - MOCK_METHOD1(set_change_processor, void(ChangeProcessor* processor));
|
| + MOCK_CONST_METHOD0(model_associator, sync_driver::AssociatorInterface*());
|
| + MOCK_METHOD1(set_model_associator,
|
| + void(sync_driver::AssociatorInterface* associator));
|
| + MOCK_CONST_METHOD0(change_processor, sync_driver::ChangeProcessor*());
|
| + MOCK_METHOD1(set_change_processor,
|
| + void(sync_driver::ChangeProcessor* processor));
|
| MOCK_METHOD2(RecordUnrecoverableError, void(const tracked_objects::Location&,
|
| const std::string&));
|
| MOCK_METHOD1(RecordAssociationTime, void(base::TimeDelta time));
|
|
|