| 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
|
| index 92a54b80f769b659412471f9e2221099ea0f4b3b..3fa30fe8077d4a8769ce4b20122ed6244d706aa6 100644
|
| --- a/components/sync/driver/data_type_manager_mock.h
|
| +++ b/components/sync/driver/data_type_manager_mock.h
|
| @@ -9,18 +9,17 @@
|
| #include "components/sync/driver/data_type_manager.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| -namespace sync_driver {
|
| +namespace syncer {
|
|
|
| class DataTypeManagerMock : public DataTypeManager {
|
| public:
|
| DataTypeManagerMock();
|
| virtual ~DataTypeManagerMock();
|
|
|
| - MOCK_METHOD2(Configure, void(syncer::ModelTypeSet, syncer::ConfigureReason));
|
| - MOCK_METHOD1(ReenableType, void(syncer::ModelType));
|
| + MOCK_METHOD2(Configure, void(ModelTypeSet, ConfigureReason));
|
| + MOCK_METHOD1(ReenableType, void(ModelType));
|
| MOCK_METHOD0(ResetDataTypeErrors, void());
|
| - MOCK_METHOD2(PurgeForMigration,
|
| - void(syncer::ModelTypeSet, syncer::ConfigureReason));
|
| + MOCK_METHOD2(PurgeForMigration, void(ModelTypeSet, ConfigureReason));
|
| MOCK_METHOD0(Stop, void());
|
| MOCK_METHOD0(controllers, const DataTypeController::TypeMap&());
|
| MOCK_CONST_METHOD0(state, State());
|
| @@ -29,6 +28,6 @@ class DataTypeManagerMock : public DataTypeManager {
|
| DataTypeManager::ConfigureResult result_;
|
| };
|
|
|
| -} // namespace sync_driver
|
| +} // namespace syncer
|
|
|
| #endif // COMPONENTS_SYNC_DRIVER_DATA_TYPE_MANAGER_MOCK_H__
|
|
|