| Index: components/sync/driver/data_type_manager_mock.h
|
| diff --git a/components/sync_driver/data_type_manager_mock.h b/components/sync/driver/data_type_manager_mock.h
|
| similarity index 84%
|
| rename from components/sync_driver/data_type_manager_mock.h
|
| rename to components/sync/driver/data_type_manager_mock.h
|
| index 11a37dbd4428ab80e735a12456b9731828e19000..92a54b80f769b659412471f9e2221099ea0f4b3b 100644
|
| --- a/components/sync_driver/data_type_manager_mock.h
|
| +++ b/components/sync/driver/data_type_manager_mock.h
|
| @@ -6,7 +6,7 @@
|
| #define COMPONENTS_SYNC_DRIVER_DATA_TYPE_MANAGER_MOCK_H__
|
|
|
| #include "components/sync/api/sync_error.h"
|
| -#include "components/sync_driver/data_type_manager.h"
|
| +#include "components/sync/driver/data_type_manager.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| namespace sync_driver {
|
| @@ -19,8 +19,8 @@ class DataTypeManagerMock : public DataTypeManager {
|
| MOCK_METHOD2(Configure, void(syncer::ModelTypeSet, syncer::ConfigureReason));
|
| MOCK_METHOD1(ReenableType, void(syncer::ModelType));
|
| MOCK_METHOD0(ResetDataTypeErrors, void());
|
| - MOCK_METHOD2(PurgeForMigration, void(syncer::ModelTypeSet,
|
| - syncer::ConfigureReason));
|
| + MOCK_METHOD2(PurgeForMigration,
|
| + void(syncer::ModelTypeSet, syncer::ConfigureReason));
|
| MOCK_METHOD0(Stop, void());
|
| MOCK_METHOD0(controllers, const DataTypeController::TypeMap&());
|
| MOCK_CONST_METHOD0(state, State());
|
|
|