Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2136)

Unified Diff: chrome/browser/sync/api/syncable_service_mock.h

Issue 7497014: Revert 94128 - [Sync] Refactor sync datatype error handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 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/sync/api/syncable_service.h ('k') | chrome/browser/sync/backend_migrator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/api/syncable_service_mock.h
===================================================================
--- chrome/browser/sync/api/syncable_service_mock.h (revision 94142)
+++ chrome/browser/sync/api/syncable_service_mock.h (working copy)
@@ -16,15 +16,13 @@
SyncableServiceMock();
virtual ~SyncableServiceMock();
- MOCK_METHOD3(MergeDataAndStartSyncing,
- SyncError(syncable::ModelType,
- const SyncDataList&,
- SyncChangeProcessor* sync_processor));
+ MOCK_METHOD3(MergeDataAndStartSyncing, bool(
+ syncable::ModelType, const SyncDataList&,
+ SyncChangeProcessor* sync_processor));
MOCK_METHOD1(StopSyncing, void(syncable::ModelType));
- MOCK_CONST_METHOD1(GetAllSyncData, SyncDataList(syncable::ModelType type));
+ MOCK_CONST_METHOD1(GetAllSyncData, SyncDataList(syncable::ModelType));
MOCK_METHOD2(ProcessSyncChanges,
- SyncError(const tracked_objects::Location&,
- const SyncChangeList&));
+ void(const tracked_objects::Location&, const SyncChangeList&));
};
#endif // CHROME_BROWSER_SYNC_API_SYNCABLE_SERVICE_MOCK_H_
« no previous file with comments | « chrome/browser/sync/api/syncable_service.h ('k') | chrome/browser/sync/backend_migrator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698