diff options
Diffstat (limited to 'sync/api/fake_syncable_service.h')
| -rw-r--r-- | sync/api/fake_syncable_service.h | 2 |
1 files changed, 1 insertions, 1 deletions
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<SyncChangeProcessor> sync_processor, |