| Index: components/sync/driver/sync_api_component_factory_mock.cc
|
| diff --git a/components/sync_driver/sync_api_component_factory_mock.cc b/components/sync/driver/sync_api_component_factory_mock.cc
|
| similarity index 78%
|
| rename from components/sync_driver/sync_api_component_factory_mock.cc
|
| rename to components/sync/driver/sync_api_component_factory_mock.cc
|
| index 89509865f1b67dcd460f7e95303138e55b18bc08..f11cf13968d43614cb975fbff37fd2b3817dcdf7 100644
|
| --- a/components/sync_driver/sync_api_component_factory_mock.cc
|
| +++ b/components/sync/driver/sync_api_component_factory_mock.cc
|
| @@ -2,15 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "components/sync_driver/sync_api_component_factory_mock.h"
|
| +#include "components/sync/driver/sync_api_component_factory_mock.h"
|
|
|
| #include <utility>
|
|
|
| #include "components/sync/api/attachments/attachment_store.h"
|
| #include "components/sync/core/attachments/attachment_service_impl.h"
|
| -#include "components/sync_driver/change_processor.h"
|
| -#include "components/sync_driver/local_device_info_provider_mock.h"
|
| -#include "components/sync_driver/model_associator.h"
|
| +#include "components/sync/driver/change_processor.h"
|
| +#include "components/sync/driver/local_device_info_provider_mock.h"
|
| +#include "components/sync/driver/model_associator.h"
|
|
|
| using sync_driver::AssociatorInterface;
|
| using sync_driver::ChangeProcessor;
|
| @@ -19,19 +19,17 @@ using testing::InvokeWithoutArgs;
|
| using testing::Return;
|
|
|
| SyncApiComponentFactoryMock::SyncApiComponentFactoryMock()
|
| - : local_device_(new sync_driver::LocalDeviceInfoProviderMock()) {
|
| -}
|
| + : local_device_(new sync_driver::LocalDeviceInfoProviderMock()) {}
|
|
|
| SyncApiComponentFactoryMock::SyncApiComponentFactoryMock(
|
| - AssociatorInterface* model_associator, ChangeProcessor* change_processor)
|
| + AssociatorInterface* model_associator,
|
| + ChangeProcessor* change_processor)
|
| : model_associator_(model_associator),
|
| change_processor_(change_processor),
|
| local_device_(new sync_driver::LocalDeviceInfoProviderMock()) {
|
| - ON_CALL(*this, CreateBookmarkSyncComponents(_, _)).
|
| - WillByDefault(
|
| - InvokeWithoutArgs(
|
| - this,
|
| - &SyncApiComponentFactoryMock::MakeSyncComponents));
|
| + ON_CALL(*this, CreateBookmarkSyncComponents(_, _))
|
| + .WillByDefault(InvokeWithoutArgs(
|
| + this, &SyncApiComponentFactoryMock::MakeSyncComponents));
|
| }
|
|
|
| SyncApiComponentFactoryMock::~SyncApiComponentFactoryMock() {}
|
|
|