Index: components/history/core/browser/typed_url_sync_bridge.h |
diff --git a/components/history/core/browser/typed_url_sync_bridge.h b/components/history/core/browser/typed_url_sync_bridge.h |
index 281e673aaaa56857028a4c5adfbe17e116f92224..ea648f82d5e8568fe78803c537e5b38652a50c88 100644 |
--- a/components/history/core/browser/typed_url_sync_bridge.h |
+++ b/components/history/core/browser/typed_url_sync_bridge.h |
@@ -29,7 +29,7 @@ class TypedURLSyncBridge : public syncer::ModelTypeSyncBridge, |
override; |
base::Optional<syncer::ModelError> MergeSyncData( |
std::unique_ptr<syncer::MetadataChangeList> metadata_change_list, |
- syncer::EntityDataMap entity_data_map) override; |
+ syncer::EntityChangeList entity_data) override; |
base::Optional<syncer::ModelError> ApplySyncChanges( |
std::unique_ptr<syncer::MetadataChangeList> metadata_change_list, |
syncer::EntityChangeList entity_changes) override; |