| Index: components/sync/api/stub_model_type_service.h
|
| diff --git a/components/sync/api/stub_model_type_service.h b/components/sync/api/stub_model_type_service.h
|
| index f8c10f1c83f452058c2781184fc65c903bc761ce..931c0bb72390e8fea738bb2ed2110a0c5a57d59e 100644
|
| --- a/components/sync/api/stub_model_type_service.h
|
| +++ b/components/sync/api/stub_model_type_service.h
|
| @@ -10,7 +10,7 @@
|
|
|
| #include "components/sync/api/model_type_service.h"
|
|
|
| -namespace syncer_v2 {
|
| +namespace syncer {
|
|
|
| // A non-functional implementation of ModelTypeService for
|
| // testing purposes.
|
| @@ -22,10 +22,10 @@ class StubModelTypeService : public ModelTypeService {
|
| ~StubModelTypeService() override;
|
|
|
| std::unique_ptr<MetadataChangeList> CreateMetadataChangeList() override;
|
| - syncer::SyncError MergeSyncData(
|
| + SyncError MergeSyncData(
|
| std::unique_ptr<MetadataChangeList> metadata_change_list,
|
| EntityDataMap entity_data_map) override;
|
| - syncer::SyncError ApplySyncChanges(
|
| + SyncError ApplySyncChanges(
|
| std::unique_ptr<MetadataChangeList> metadata_change_list,
|
| EntityChangeList entity_changes) override;
|
| void GetData(StorageKeyList storage_keys, DataCallback callback) override;
|
| @@ -37,6 +37,6 @@ class StubModelTypeService : public ModelTypeService {
|
| bool HasChangeProcessor() const;
|
| };
|
|
|
| -} // namespace syncer_v2
|
| +} // namespace syncer
|
|
|
| #endif // COMPONENTS_SYNC_API_STUB_MODEL_TYPE_SERVICE_H_
|
|
|