diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-14 12:12:37 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-05-14 12:12:37 +0100 |
| commit | 010d83a9304c5a91596085d917d248abff47903a (patch) | |
| tree | 41ef1a01862f352f9653c7a9cfa817abefe2cce2 /chrome/browser/sync/profile_sync_components_factory_impl.cc | |
| parent | 08c107de54178bb0990a09adec724924e8bc9486 (diff) | |
| download | chromium_org-010d83a9304c5a91596085d917d248abff47903a.tar.gz | |
Merge from Chromium at DEPS revision 269336
This commit was generated by merge_to_master.py.
Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
Diffstat (limited to 'chrome/browser/sync/profile_sync_components_factory_impl.cc')
| -rw-r--r-- | chrome/browser/sync/profile_sync_components_factory_impl.cc | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc index 8b255f7ff9..4ba88f48f0 100644 --- a/chrome/browser/sync/profile_sync_components_factory_impl.cc +++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc @@ -108,7 +108,6 @@ using browser_sync::DataTypeManagerImpl; using browser_sync::DataTypeManagerObserver; using browser_sync::ExtensionDataTypeController; using browser_sync::ExtensionSettingDataTypeController; -using browser_sync::GenericChangeProcessor; using browser_sync::PasswordDataTypeController; using browser_sync::ProxyDataTypeController; using browser_sync::SearchEngineDataTypeController; @@ -438,31 +437,6 @@ ProfileSyncComponentsFactoryImpl::CreateSyncBackendHost( return new browser_sync::SyncBackendHostImpl(name, profile, sync_prefs); } -browser_sync::GenericChangeProcessor* - ProfileSyncComponentsFactoryImpl::CreateGenericChangeProcessor( - ProfileSyncService* profile_sync_service, - browser_sync::DataTypeErrorHandler* error_handler, - const base::WeakPtr<syncer::SyncableService>& local_service, - const base::WeakPtr<syncer::SyncMergeResult>& merge_result) { - syncer::UserShare* user_share = profile_sync_service->GetUserShare(); - - scoped_ptr<syncer::AttachmentService> attachment_service( - // TODO(tim): Bug 339726. Remove merge_result->model_type hack! This - // method (CreateGenericChangeProcessor) will cease to exist in favor - // of a new SharedChangeProcessor::Connect, at which point we'll know - // the data type. - // TODO(maniscalco): Replace FakeAttachmentService with a real - // AttachmentService implementation once implemented (bug 356359). - new syncer::FakeAttachmentService( - CreateCustomAttachmentStoreForType(merge_result->model_type()))); - return new GenericChangeProcessor( - error_handler, - local_service, - merge_result, - user_share, - attachment_service.Pass()); -} - base::WeakPtr<syncer::SyncableService> ProfileSyncComponentsFactoryImpl:: GetSyncableServiceForType(syncer::ModelType type) { if (!profile_) { // For tests. |