| 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
|
| similarity index 76%
|
| rename from components/sync_driver/frontend_data_type_controller_mock.h
|
| rename to components/sync/driver/frontend_data_type_controller_mock.h
|
| index f2c00f7b65cafa634cc9ee194996f247a4e1b9a7..c6512ff4f5790ce90b10775492e94d16068b9621 100644
|
| --- a/components/sync_driver/frontend_data_type_controller_mock.h
|
| +++ b/components/sync/driver/frontend_data_type_controller_mock.h
|
| @@ -8,7 +8,7 @@
|
| #include <string>
|
|
|
| #include "components/sync/api/sync_error.h"
|
| -#include "components/sync_driver/frontend_data_type_controller.h"
|
| +#include "components/sync/driver/frontend_data_type_controller.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| namespace browser_sync {
|
| @@ -18,8 +18,7 @@ class FrontendDataTypeControllerMock : public FrontendDataTypeController {
|
| FrontendDataTypeControllerMock();
|
|
|
| // DataTypeController mocks.
|
| - MOCK_METHOD1(StartAssociating,
|
| - void(const StartCallback& start_callback));
|
| + MOCK_METHOD1(StartAssociating, void(const StartCallback& start_callback));
|
| MOCK_METHOD1(LoadModels, void(const ModelLoadCallback& model_load_callback));
|
|
|
| MOCK_METHOD0(Stop, void());
|
| @@ -28,15 +27,15 @@ class FrontendDataTypeControllerMock : public FrontendDataTypeController {
|
| MOCK_CONST_METHOD0(name, std::string());
|
| MOCK_CONST_METHOD0(model_safe_group, syncer::ModelSafeGroup());
|
| MOCK_CONST_METHOD0(state, State());
|
| - MOCK_METHOD2(OnUnrecoverableError, void(const tracked_objects::Location&,
|
| - const std::string&));
|
| + MOCK_METHOD2(OnUnrecoverableError,
|
| + void(const tracked_objects::Location&, const std::string&));
|
|
|
| // FrontendDataTypeController mocks.
|
| MOCK_METHOD0(StartModels, bool());
|
| MOCK_METHOD0(Associate, void());
|
| MOCK_METHOD0(CreateSyncComponents, void());
|
| - MOCK_METHOD2(StartFailed, void(ConfigureResult result,
|
| - const syncer::SyncError& error));
|
| + MOCK_METHOD2(StartFailed,
|
| + void(ConfigureResult result, const syncer::SyncError& error));
|
| MOCK_METHOD1(FinishStart, void(ConfigureResult result));
|
| MOCK_METHOD0(CleanUpState, void());
|
| MOCK_CONST_METHOD0(model_associator, sync_driver::AssociatorInterface*());
|
| @@ -45,8 +44,8 @@ class FrontendDataTypeControllerMock : public FrontendDataTypeController {
|
| 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_METHOD2(RecordUnrecoverableError,
|
| + void(const tracked_objects::Location&, const std::string&));
|
| MOCK_METHOD1(RecordAssociationTime, void(base::TimeDelta time));
|
| MOCK_METHOD1(RecordStartFailure, void(ConfigureResult result));
|
|
|
|
|