| Index: components/autofill/core/browser/webdata/autocomplete_sync_bridge.h
|
| diff --git a/components/autofill/core/browser/webdata/autocomplete_sync_bridge.h b/components/autofill/core/browser/webdata/autocomplete_sync_bridge.h
|
| index 8bf3460d79554dc957fcb8274265c455c4523eb1..951ba9054b895f09f02d31d074b993a3c37c065a 100644
|
| --- a/components/autofill/core/browser/webdata/autocomplete_sync_bridge.h
|
| +++ b/components/autofill/core/browser/webdata/autocomplete_sync_bridge.h
|
| @@ -14,12 +14,9 @@
|
| #include "components/autofill/core/browser/webdata/autofill_change.h"
|
| #include "components/autofill/core/browser/webdata/autofill_webdata_service_observer.h"
|
| #include "components/sync/model/metadata_change_list.h"
|
| +#include "components/sync/model/model_error.h"
|
| #include "components/sync/model/model_type_sync_bridge.h"
|
|
|
| -namespace syncer {
|
| -class SyncError;
|
| -}
|
| -
|
| namespace autofill {
|
|
|
| class AutofillTable;
|
| @@ -46,10 +43,10 @@ class AutocompleteSyncBridge : public base::SupportsUserData::Data,
|
| // syncer::ModelTypeService implementation.
|
| std::unique_ptr<syncer::MetadataChangeList> CreateMetadataChangeList()
|
| override;
|
| - syncer::SyncError MergeSyncData(
|
| + syncer::ModelError MergeSyncData(
|
| std::unique_ptr<syncer::MetadataChangeList> metadata_change_list,
|
| syncer::EntityDataMap entity_data_map) override;
|
| - syncer::SyncError ApplySyncChanges(
|
| + syncer::ModelError ApplySyncChanges(
|
| std::unique_ptr<syncer::MetadataChangeList> metadata_change_list,
|
| syncer::EntityChangeList entity_changes) override;
|
| void GetData(StorageKeyList storage_keys, DataCallback callback) override;
|
|
|