summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/glue/shared_change_processor_mock.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/sync/glue/shared_change_processor_mock.h')
-rw-r--r--chrome/browser/sync/glue/shared_change_processor_mock.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/sync/glue/shared_change_processor_mock.h b/chrome/browser/sync/glue/shared_change_processor_mock.h
index e19c19f..f0b05ca 100644
--- a/chrome/browser/sync/glue/shared_change_processor_mock.h
+++ b/chrome/browser/sync/glue/shared_change_processor_mock.h
@@ -16,11 +16,12 @@ class SharedChangeProcessorMock : public SharedChangeProcessor {
public:
SharedChangeProcessorMock();
- MOCK_METHOD4(Connect, base::WeakPtr<syncer::SyncableService>(
+ MOCK_METHOD5(Connect, base::WeakPtr<syncer::SyncableService>(
ProfileSyncComponentsFactory*,
ProfileSyncService*,
DataTypeErrorHandler*,
- syncer::ModelType));
+ syncer::ModelType,
+ const base::WeakPtr<syncer::SyncMergeResult>&));
MOCK_METHOD0(Disconnect, bool());
MOCK_METHOD2(ProcessSyncChanges,
syncer::SyncError(const tracked_objects::Location&,