| 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 951ba9054b895f09f02d31d074b993a3c37c065a..7e4d972c087d7a958f05f292a6e3b5a8d19b078b 100644
|
| --- a/components/autofill/core/browser/webdata/autocomplete_sync_bridge.h
|
| +++ b/components/autofill/core/browser/webdata/autocomplete_sync_bridge.h
|
| @@ -8,6 +8,7 @@
|
| #include <memory>
|
| #include <string>
|
|
|
| +#include "base/optional.h"
|
| #include "base/scoped_observer.h"
|
| #include "base/supports_user_data.h"
|
| #include "base/threading/non_thread_safe.h"
|
| @@ -43,10 +44,10 @@ class AutocompleteSyncBridge : public base::SupportsUserData::Data,
|
| // syncer::ModelTypeService implementation.
|
| std::unique_ptr<syncer::MetadataChangeList> CreateMetadataChangeList()
|
| override;
|
| - syncer::ModelError MergeSyncData(
|
| + base::Optional<syncer::ModelError> MergeSyncData(
|
| std::unique_ptr<syncer::MetadataChangeList> metadata_change_list,
|
| syncer::EntityDataMap entity_data_map) override;
|
| - syncer::ModelError ApplySyncChanges(
|
| + base::Optional<syncer::ModelError> ApplySyncChanges(
|
| std::unique_ptr<syncer::MetadataChangeList> metadata_change_list,
|
| syncer::EntityChangeList entity_changes) override;
|
| void GetData(StorageKeyList storage_keys, DataCallback callback) override;
|
|
|