Index: components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc |
diff --git a/components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc b/components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc |
index ae584e788fc4d43a017bacb694f674a0638a91e7..ba38cba197f2ef4861c9c1c573606093ef3b6e38 100644 |
--- a/components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc |
+++ b/components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc |
@@ -190,12 +190,11 @@ AutofillWalletSyncableService::AutofillWalletSyncableService( |
AutofillWalletSyncableService::~AutofillWalletSyncableService() { |
} |
-syncer::SyncMergeResult |
-AutofillWalletSyncableService::MergeDataAndStartSyncing( |
+syncer::SyncMergeResult AutofillWalletSyncableService::MergeDataAndStartSyncing( |
syncer::ModelType type, |
const syncer::SyncDataList& initial_sync_data, |
- scoped_ptr<syncer::SyncChangeProcessor> sync_processor, |
- scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) { |
+ std::unique_ptr<syncer::SyncChangeProcessor> sync_processor, |
+ std::unique_ptr<syncer::SyncErrorFactory> sync_error_factory) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
sync_processor_ = std::move(sync_processor); |
return SetSyncData(initial_sync_data); |