| 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_
|
|
|