chrome/browser/webdata/autocomplete_syncable_service.cc - Issue 9749012: [Sync] Have SyncableService's take ownership of their SyncChangeProcessor.

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: chrome/browser/webdata/autocomplete_syncable_service.cc

Issue 9749012: [Sync] Have SyncableService's take ownership of their SyncChangeProcessor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix merge conflict Created 8 years, 9 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 | « chrome/browser/webdata/autocomplete_syncable_service.h ('k') | chrome/browser/webdata/autofill_profile_syncable_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/webdata/autocomplete_syncable_service.cc

diff --git a/chrome/browser/webdata/autocomplete_syncable_service.cc b/chrome/browser/webdata/autocomplete_syncable_service.cc

index af1cde14a5b5d40e0d27e42a3d6dcf4f89693d82..3b3ecb1b2cb64812d766542376557fc7bcef1cc1 100644

--- a/chrome/browser/webdata/autocomplete_syncable_service.cc

+++ b/chrome/browser/webdata/autocomplete_syncable_service.cc

@@ -79,9 +79,10 @@ AutocompleteSyncableService::AutocompleteSyncableService()

SyncError AutocompleteSyncableService::MergeDataAndStartSyncing(

syncable::ModelType type,

const SyncDataList& initial_sync_data,

- SyncChangeProcessor* sync_processor) {

+ scoped_ptr<SyncChangeProcessor> sync_processor) {

DCHECK(CalledOnValidThread());

DCHECK(!sync_processor_.get());

+ DCHECK(sync_processor.get());

VLOG(1) << "Associating Autocomplete: MergeDataAndStartSyncing";

std::vector<AutofillEntry> entries;

@@ -97,7 +98,7 @@ SyncError AutocompleteSyncableService::MergeDataAndStartSyncing(

new_db_entries[it->key()] = std::make_pair(SyncChange::ACTION_ADD, it);

}

- sync_processor_.reset(sync_processor);

+ sync_processor_ = sync_processor.Pass();

std::vector<AutofillEntry> new_synced_entries;

// Go through and check for all the entries that sync already knows about.