| Index: components/sync/model/fake_model_type_sync_bridge.h
|
| diff --git a/components/sync/model/fake_model_type_sync_bridge.h b/components/sync/model/fake_model_type_sync_bridge.h
|
| index b6e1226abbfa36cbb059aeb41540b12c9c75eccc..e7d4e2b13bb19809057766d8c14d4d5343f9cbb3 100644
|
| --- a/components/sync/model/fake_model_type_sync_bridge.h
|
| +++ b/components/sync/model/fake_model_type_sync_bridge.h
|
| @@ -107,9 +107,6 @@ class FakeModelTypeSyncBridge : public ModelTypeSyncBridge {
|
| base::Optional<ModelError> MergeSyncData(
|
| std::unique_ptr<MetadataChangeList> metadata_change_list,
|
| EntityChangeList entity_data) override;
|
| - base::Optional<ModelError> MergeSyncData(
|
| - std::unique_ptr<MetadataChangeList> metadata_change_list,
|
| - EntityDataMap entity_data) override;
|
| base::Optional<ModelError> ApplySyncChanges(
|
| std::unique_ptr<MetadataChangeList> metadata_change_list,
|
| EntityChangeList entity_changes) override;
|
|
|