| Index: chrome/browser/sync/profile_sync_components_factory_mock.cc
|
| diff --git a/chrome/browser/sync/profile_sync_components_factory_mock.cc b/chrome/browser/sync/profile_sync_components_factory_mock.cc
|
| index 30f57a02bc40e267b14243d3b6432255af87156b..ade594c25cb07fc8df924b783a9abf8b1bf7e3e4 100644
|
| --- a/chrome/browser/sync/profile_sync_components_factory_mock.cc
|
| +++ b/chrome/browser/sync/profile_sync_components_factory_mock.cc
|
| @@ -7,7 +7,6 @@
|
| #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 "content/public/browser/browser_thread.h"
|
| #include "sync/api/attachments/attachment_store.h"
|
| #include "sync/internal_api/public/attachments/attachment_service_impl.h"
|
|
|
| @@ -45,10 +44,10 @@ ProfileSyncComponentsFactoryMock::CreateAttachmentService(
|
| return syncer::AttachmentServiceImpl::CreateForTest();
|
| }
|
|
|
| -ProfileSyncComponentsFactory::SyncComponents
|
| +sync_driver::SyncApiComponentFactory::SyncComponents
|
| ProfileSyncComponentsFactoryMock::MakeSyncComponents() {
|
| - return SyncComponents(model_associator_.release(),
|
| - change_processor_.release());
|
| + return sync_driver::SyncApiComponentFactory::SyncComponents(
|
| + model_associator_.release(), change_processor_.release());
|
| }
|
|
|
| scoped_ptr<sync_driver::LocalDeviceInfoProvider>
|
|
|