| Index: components/sync/driver/frontend_data_type_controller_mock.h
|
| diff --git a/components/sync/driver/frontend_data_type_controller_mock.h b/components/sync/driver/frontend_data_type_controller_mock.h
|
| index cdff9e7459d9403637ad380db0f4d8220f5da52b..f52dcb71518018785ac70ebeeaa31d644467578c 100644
|
| --- a/components/sync/driver/frontend_data_type_controller_mock.h
|
| +++ b/components/sync/driver/frontend_data_type_controller_mock.h
|
| @@ -11,7 +11,7 @@
|
| #include "components/sync/driver/frontend_data_type_controller.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| -namespace browser_sync {
|
| +namespace syncer {
|
|
|
| class FrontendDataTypeControllerMock : public FrontendDataTypeController {
|
| public:
|
| @@ -24,9 +24,9 @@ class FrontendDataTypeControllerMock : public FrontendDataTypeController {
|
|
|
| MOCK_METHOD0(Stop, void());
|
| MOCK_METHOD0(enabled, bool());
|
| - MOCK_CONST_METHOD0(type, syncer::ModelType());
|
| + MOCK_CONST_METHOD0(type, ModelType());
|
| MOCK_CONST_METHOD0(name, std::string());
|
| - MOCK_CONST_METHOD0(model_safe_group, syncer::ModelSafeGroup());
|
| + MOCK_CONST_METHOD0(model_safe_group, ModelSafeGroup());
|
| MOCK_CONST_METHOD0(state, State());
|
|
|
| // FrontendDataTypeController mocks.
|
| @@ -34,19 +34,17 @@ class FrontendDataTypeControllerMock : public FrontendDataTypeController {
|
| MOCK_METHOD0(Associate, void());
|
| MOCK_METHOD0(CreateSyncComponents, void());
|
| MOCK_METHOD2(StartFailed,
|
| - void(ConfigureResult result, const syncer::SyncError& error));
|
| + void(ConfigureResult result, const SyncError& error));
|
| MOCK_METHOD1(FinishStart, void(ConfigureResult result));
|
| MOCK_METHOD0(CleanUpState, void());
|
| - 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_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_METHOD1(RecordAssociationTime, void(base::TimeDelta time));
|
| MOCK_METHOD1(RecordStartFailure, void(ConfigureResult result));
|
| };
|
|
|
| -} // namespace browser_sync
|
| +} // namespace syncer
|
|
|
| #endif // COMPONENTS_SYNC_DRIVER_FRONTEND_DATA_TYPE_CONTROLLER_MOCK_H__
|
|
|