From 3f98fd98f1cff6aa30fddf33a4db91e4dc3d86af Mon Sep 17 00:00:00 2001 From: "zea@chromium.org" Date: Sat, 17 Nov 2012 15:54:29 +0000 Subject: [Sync] Have MergeDataAndStartSyncing return a SyncMergeResult This will allow us to track merge statistics for datatypes. For now none of the datatypes fill the SyncMergeResult with anything other than an error. BUG=158576 TBR=stevet@chromium.org Review URL: https://chromiumcodereview.appspot.com/11365241 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168446 0039d316-1c4b-4281-b951-d872f2087c98 --- sync/api/fake_syncable_service.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sync/api/fake_syncable_service.h') diff --git a/sync/api/fake_syncable_service.h b/sync/api/fake_syncable_service.h index 5a501ae..3d77a80 100644 --- a/sync/api/fake_syncable_service.h +++ b/sync/api/fake_syncable_service.h @@ -27,7 +27,7 @@ class FakeSyncableService : public SyncableService { bool syncing() const; // SyncableService implementation. - virtual SyncError MergeDataAndStartSyncing( + virtual SyncMergeResult MergeDataAndStartSyncing( ModelType type, const SyncDataList& initial_sync_data, scoped_ptr sync_processor, -- cgit v1.1