chrome/browser/sync/api/fake_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/sync/api/fake_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 browser_tests 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

« chrome/browser/extensions/settings/settings_apitest.cc ('K') | « chrome/browser/sync/api/fake_syncable_service.h ('k') | chrome/browser/sync/api/syncable_service.h » ('j') | chrome/browser/sync/api/syncable_service_mock.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/api/fake_syncable_service.cc

diff --git a/chrome/browser/sync/api/fake_syncable_service.cc b/chrome/browser/sync/api/fake_syncable_service.cc

index 9823dbd1b551481c8e88b1efb3d24f268d058ccf..2f7d94807a909cf7fc25da065ee59cc69fe05a7f 100644

--- a/chrome/browser/sync/api/fake_syncable_service.cc

+++ b/chrome/browser/sync/api/fake_syncable_service.cc

@@ -30,8 +30,8 @@ bool FakeSyncableService::syncing() const {

SyncError FakeSyncableService::MergeDataAndStartSyncing(

syncable::ModelType type,

const SyncDataList& initial_sync_data,

- SyncChangeProcessor* sync_processor) {

- sync_processor_.reset(sync_processor);

+ scoped_ptr<SyncChangeProcessor> sync_processor) {

+ sync_processor_ = sync_processor.Pass();

type_ = type;

if (!merge_data_and_start_syncing_error_.IsSet()) {

syncing_ = true;

@@ -41,6 +41,7 @@ SyncError FakeSyncableService::MergeDataAndStartSyncing(

void FakeSyncableService::StopSyncing(syncable::ModelType type) {

syncing_ = false;

+ sync_processor_.reset();

}

SyncDataList FakeSyncableService::GetAllSyncData(