chrome/browser/extensions/test_extension_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/extensions/test_extension_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

Index: chrome/browser/extensions/test_extension_service.cc

diff --git a/chrome/browser/extensions/test_extension_service.cc b/chrome/browser/extensions/test_extension_service.cc

index 7ae9135218d189043578fbd39b86b4e4bdbf442a..47111c764c163ee8b53dd36cdc60bcbb80caca32 100644

--- a/chrome/browser/extensions/test_extension_service.cc

+++ b/chrome/browser/extensions/test_extension_service.cc

@@ -68,7 +68,7 @@ void TestExtensionService::CheckForUpdatesSoon() {

SyncError TestExtensionService::MergeDataAndStartSyncing(

syncable::ModelType type,

const SyncDataList& initial_sync_data,

- SyncChangeProcessor* sync_processor) {

+ scoped_ptr<SyncChangeProcessor> sync_processor) {

ADD_FAILURE();

return SyncError();

}

« no previous file with comments | « chrome/browser/extensions/test_extension_service.h ('k') | chrome/browser/prefs/pref_model_associator.h » ('j') | no next file with comments »