components/autofill/core/browser/webdata/autocomplete_syncable_service.cc - Issue 1859453002: components/autofill: scoped_ptr -> unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/autofill/core/browser/webdata/autocomplete_syncable_service.cc

Issue 1859453002: components/autofill: scoped_ptr -> unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Comments addressed Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/autofill/core/browser/webdata/autocomplete_syncable_service.h ('k') | components/autofill/core/browser/webdata/autofill_data_type_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/autofill/core/browser/webdata/autocomplete_syncable_service.cc

diff --git a/components/autofill/core/browser/webdata/autocomplete_syncable_service.cc b/components/autofill/core/browser/webdata/autocomplete_syncable_service.cc

index ac8f216da3b4bfbb8374e6b8a1865ece57086090..08c44577d8f3464bd8f1910f3500af3ee6004965 100644

--- a/components/autofill/core/browser/webdata/autocomplete_syncable_service.cc

+++ b/components/autofill/core/browser/webdata/autocomplete_syncable_service.cc

@@ -101,8 +101,8 @@ void AutocompleteSyncableService::InjectStartSyncFlare(

syncer::SyncMergeResult AutocompleteSyncableService::MergeDataAndStartSyncing(

syncer::ModelType type,

const syncer::SyncDataList& initial_sync_data,

- scoped_ptr<syncer::SyncChangeProcessor> sync_processor,

- scoped_ptr<syncer::SyncErrorFactory> error_handler) {

+ std::unique_ptr<syncer::SyncChangeProcessor> sync_processor,

+ std::unique_ptr<syncer::SyncErrorFactory> error_handler) {

DCHECK(CalledOnValidThread());

DCHECK(!sync_processor_);

DCHECK(sync_processor);

@@ -203,7 +203,7 @@ syncer::SyncError AutocompleteSyncableService::ProcessSyncChanges(

// Data is loaded only if we get new ADD/UPDATE change.

std::vector<AutofillEntry> entries;

- scoped_ptr<AutocompleteEntryMap> db_entries;

+ std::unique_ptr<AutocompleteEntryMap> db_entries;

std::vector<AutofillEntry> new_entries;

syncer::SyncError list_processing_error;