| Index: chrome/browser/chromeos/printing/printers_sync_bridge.h
|
| diff --git a/chrome/browser/chromeos/printing/printers_sync_bridge.h b/chrome/browser/chromeos/printing/printers_sync_bridge.h
|
| index 971b86c0ca07f7266680106eaf1e40955cc240b4..d51b56e4bc702ddc816e6faf6aeff44bda46e6d3 100644
|
| --- a/chrome/browser/chromeos/printing/printers_sync_bridge.h
|
| +++ b/chrome/browser/chromeos/printing/printers_sync_bridge.h
|
| @@ -35,7 +35,7 @@ class PrintersSyncBridge : 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;
|
|
|