| 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
|
| similarity index 77%
|
| rename from components/sync_driver/change_processor_mock.h
|
| rename to components/sync/driver/change_processor_mock.h
|
| index 981d3f788cc8ba167f90064f8b4b4f72b0a8af2d..14813a95db7058b5c6e015af3e4346d8aafe7d64 100644
|
| --- a/components/sync_driver/change_processor_mock.h
|
| +++ b/components/sync/driver/change_processor_mock.h
|
| @@ -12,7 +12,7 @@
|
| #include "components/sync/base/model_type.h"
|
| #include "components/sync/base/unrecoverable_error_handler.h"
|
| #include "components/sync/core/data_type_error_handler.h"
|
| -#include "components/sync_driver/change_processor.h"
|
| +#include "components/sync/driver/change_processor.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| namespace sync_driver {
|
| @@ -29,14 +29,14 @@ class ChangeProcessorMock : public ChangeProcessor,
|
| MOCK_METHOD0(CommitChangesFromSyncModel, void());
|
| MOCK_METHOD0(StartImpl, void());
|
| MOCK_CONST_METHOD0(IsRunning, bool());
|
| - MOCK_METHOD2(OnUnrecoverableError, void(const tracked_objects::Location&,
|
| - const std::string&));
|
| + MOCK_METHOD2(OnUnrecoverableError,
|
| + void(const tracked_objects::Location&, const std::string&));
|
| MOCK_METHOD1(OnSingleDataTypeUnrecoverableError,
|
| void(const syncer::SyncError&));
|
| MOCK_METHOD3(CreateAndUploadError,
|
| - syncer::SyncError(const tracked_objects::Location&,
|
| - const std::string&,
|
| - syncer::ModelType));
|
| + syncer::SyncError(const tracked_objects::Location&,
|
| + const std::string&,
|
| + syncer::ModelType));
|
| };
|
|
|
| } // namespace sync_driver
|
|
|