| 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
|
| similarity index 85%
|
| rename from components/sync_driver/non_ui_data_type_controller_mock.h
|
| rename to components/sync/driver/non_ui_data_type_controller_mock.h
|
| index 1bbc194852ff2d4a94eb2b6683708452c4598594..1ff24ec865d446b40051393710ff9dc4a30554f9 100644
|
| --- a/components/sync_driver/non_ui_data_type_controller_mock.h
|
| +++ b/components/sync/driver/non_ui_data_type_controller_mock.h
|
| @@ -8,19 +8,17 @@
|
| #include <string>
|
|
|
| #include "components/sync/api/sync_error.h"
|
| -#include "components/sync_driver/non_ui_data_type_controller.h"
|
| +#include "components/sync/driver/non_ui_data_type_controller.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| namespace sync_driver {
|
|
|
| -class NonUIDataTypeControllerMock
|
| - : public NonUIDataTypeController {
|
| +class NonUIDataTypeControllerMock : public NonUIDataTypeController {
|
| public:
|
| NonUIDataTypeControllerMock();
|
|
|
| // 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());
|
| MOCK_CONST_METHOD0(type, syncer::ModelType());
|
| @@ -34,8 +32,7 @@ class NonUIDataTypeControllerMock
|
| MOCK_METHOD0(StartModels, bool());
|
| MOCK_METHOD0(StopModels, void());
|
| MOCK_METHOD2(PostTaskOnBackendThread,
|
| - bool(const tracked_objects::Location&,
|
| - const base::Closure&));
|
| + bool(const tracked_objects::Location&, const base::Closure&));
|
| MOCK_METHOD3(StartDone,
|
| void(DataTypeController::ConfigureResult result,
|
| const syncer::SyncMergeResult& local_merge_result,
|
|
|