| Index: chrome/browser/sync/profile_sync_components_factory_impl.cc
|
| diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc
|
| index 44f5a5b662832cb99ec05b505c7ff85eed1e7566..d37af114dcf754d745eab2bf413ea5454a45a8a4 100644
|
| --- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
|
| +++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
|
| @@ -63,6 +63,9 @@
|
| #include "components/sync_driver/proxy_data_type_controller.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "extensions/browser/extension_system.h"
|
| +#include "sync/api/attachments/attachment_service.h"
|
| +#include "sync/api/attachments/fake_attachment_service.h"
|
| +#include "sync/api/attachments/fake_attachment_store.h"
|
| #include "sync/api/syncable_service.h"
|
|
|
| #if defined(ENABLE_EXTENSIONS)
|
| @@ -444,10 +447,19 @@ browser_sync::GenericChangeProcessor*
|
| const base::WeakPtr<syncer::SyncableService>& local_service,
|
| const base::WeakPtr<syncer::SyncMergeResult>& merge_result) {
|
| syncer::UserShare* user_share = profile_sync_service->GetUserShare();
|
| - return new GenericChangeProcessor(error_handler,
|
| - local_service,
|
| - merge_result,
|
| - user_share);
|
| + // TODO(maniscalco): Replace FakeAttachmentService with a real
|
| + // AttachmentService implementation once it has been implemented (bug 356359).
|
| + scoped_ptr<syncer::AttachmentStore> attachment_store(
|
| + new syncer::FakeAttachmentStore(
|
| + BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
|
| + scoped_ptr<syncer::AttachmentService> attachment_service(
|
| + new syncer::FakeAttachmentService(attachment_store.Pass()));
|
| + return new GenericChangeProcessor(
|
| + error_handler,
|
| + local_service,
|
| + merge_result,
|
| + user_share,
|
| + attachment_service.Pass());
|
| }
|
|
|
| browser_sync::SharedChangeProcessor* ProfileSyncComponentsFactoryImpl::
|
|
|