| Index: components/sync/driver/change_processor_mock.h
|
| diff --git a/components/sync/driver/change_processor_mock.h b/components/sync/driver/change_processor_mock.h
|
| index 9373538664e3506c0144bdfa8c8d290605c58c3e..68fccf6c9a0db996cf75967e2e2d95ac3bcca427 100644
|
| --- a/components/sync/driver/change_processor_mock.h
|
| +++ b/components/sync/driver/change_processor_mock.h
|
| @@ -16,16 +16,16 @@
|
| #include "components/sync/driver/change_processor.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| -namespace sync_driver {
|
| +namespace syncer {
|
|
|
| class ChangeProcessorMock : public ChangeProcessor {
|
| public:
|
| ChangeProcessorMock();
|
| virtual ~ChangeProcessorMock();
|
| MOCK_METHOD3(ApplyChangesFromSyncModel,
|
| - void(const syncer::BaseTransaction*,
|
| + void(const BaseTransaction*,
|
| int64_t,
|
| - const syncer::ImmutableChangeRecordList&));
|
| + const ImmutableChangeRecordList&));
|
| MOCK_METHOD0(CommitChangesFromSyncModel, void());
|
| MOCK_METHOD0(StartImpl, void());
|
| MOCK_CONST_METHOD0(IsRunning, bool());
|
| @@ -33,6 +33,6 @@ class ChangeProcessorMock : public ChangeProcessor {
|
| void(const tracked_objects::Location&, const std::string&));
|
| };
|
|
|
| -} // namespace sync_driver
|
| +} // namespace syncer
|
|
|
| #endif // COMPONENTS_SYNC_DRIVER_CHANGE_PROCESSOR_MOCK_H_
|
|
|