| 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
|
| index 03e04e1f362ae7b80e3504d89edacaf91ed0af26..189b4576e99e2447100eeb033d25916059b96fac 100644
|
| --- a/components/sync/driver/sync_api_component_factory_mock.cc
|
| +++ b/components/sync/driver/sync_api_component_factory_mock.cc
|
| @@ -27,9 +27,6 @@ SyncApiComponentFactoryMock::SyncApiComponentFactoryMock(
|
| : model_associator_(model_associator),
|
| change_processor_(change_processor),
|
| local_device_(new sync_driver::LocalDeviceInfoProviderMock()) {
|
| - ON_CALL(*this, CreateBookmarkSyncComponents(_, _))
|
| - .WillByDefault(InvokeWithoutArgs(
|
| - this, &SyncApiComponentFactoryMock::MakeSyncComponents));
|
| }
|
|
|
| SyncApiComponentFactoryMock::~SyncApiComponentFactoryMock() {}
|
| @@ -45,6 +42,13 @@ SyncApiComponentFactoryMock::CreateAttachmentService(
|
| }
|
|
|
| sync_driver::SyncApiComponentFactory::SyncComponents
|
| +SyncApiComponentFactoryMock::CreateBookmarkSyncComponents(
|
| + sync_driver::SyncService* sync_service,
|
| + std::unique_ptr<syncer::DataTypeErrorHandler> error_handler) {
|
| + return MakeSyncComponents();
|
| +}
|
| +
|
| +sync_driver::SyncApiComponentFactory::SyncComponents
|
| SyncApiComponentFactoryMock::MakeSyncComponents() {
|
| return sync_driver::SyncApiComponentFactory::SyncComponents(
|
| model_associator_.release(), change_processor_.release());
|
|
|