| Index: chrome/browser/sync/glue/shared_change_processor_mock.h
|
| diff --git a/chrome/browser/sync/glue/shared_change_processor_mock.h b/chrome/browser/sync/glue/shared_change_processor_mock.h
|
| index acc655f69383d24863ed4c370dcd729c2491607c..0fb0887166179e06905e0c08fac621f157ff12f6 100644
|
| --- a/chrome/browser/sync/glue/shared_change_processor_mock.h
|
| +++ b/chrome/browser/sync/glue/shared_change_processor_mock.h
|
| @@ -17,17 +17,17 @@ class SharedChangeProcessorMock : public SharedChangeProcessor {
|
| public:
|
| SharedChangeProcessorMock();
|
|
|
| - MOCK_METHOD4(Connect, base::WeakPtr<SyncableService>(
|
| + MOCK_METHOD4(Connect, base::WeakPtr<csync::SyncableService>(
|
| ProfileSyncComponentsFactory*,
|
| ProfileSyncService*,
|
| DataTypeErrorHandler*,
|
| syncable::ModelType));
|
| MOCK_METHOD0(Disconnect, bool());
|
| MOCK_METHOD2(ProcessSyncChanges,
|
| - SyncError(const tracked_objects::Location&,
|
| - const SyncChangeList&));
|
| + csync::SyncError(const tracked_objects::Location&,
|
| + const csync::SyncChangeList&));
|
| MOCK_METHOD1(GetSyncData,
|
| - SyncError(SyncDataList*));
|
| + csync::SyncError(csync::SyncDataList*));
|
| MOCK_METHOD1(SyncModelHasUserCreatedNodes,
|
| bool(bool*));
|
| MOCK_METHOD0(CryptoReadyIfNecessary, bool());
|
|
|