Chromium Code Reviews| Index: chrome/browser/sync/glue/sync_backend_host_impl.cc |
| diff --git a/chrome/browser/sync/glue/sync_backend_host_impl.cc b/chrome/browser/sync/glue/sync_backend_host_impl.cc |
| index f9e7ff4905d7c95ca1fe2c3644753022853f570a..ab4d357ce23b561c1bccdbf3075688196a3442d7 100644 |
| --- a/chrome/browser/sync/glue/sync_backend_host_impl.cc |
| +++ b/chrome/browser/sync/glue/sync_backend_host_impl.cc |
| @@ -20,6 +20,7 @@ |
| #include "content/public/browser/notification_source.h" |
| #include "sync/internal_api/public/base_transaction.h" |
| #include "sync/internal_api/public/http_bridge.h" |
| +#include "sync/internal_api/public/http_post_provider_factory.h" |
| #include "sync/internal_api/public/internal_components_factory.h" |
| #include "sync/internal_api/public/internal_components_factory_impl.h" |
| #include "sync/internal_api/public/sync_manager.h" |
| @@ -78,7 +79,8 @@ void SyncBackendHostImpl::Initialize( |
| scoped_ptr<syncer::SyncManagerFactory> sync_manager_factory, |
| scoped_ptr<syncer::UnrecoverableErrorHandler> unrecoverable_error_handler, |
| syncer::ReportUnrecoverableErrorFunction |
| - report_unrecoverable_error_function) { |
| + report_unrecoverable_error_function, |
| + scoped_ptr<syncer::HttpPostProviderFactory> http_post_provider_factory) { |
| registrar_.reset(new browser_sync::SyncBackendRegistrar(name_, |
| profile_, |
| sync_thread.Pass())); |
| @@ -107,6 +109,9 @@ void SyncBackendHostImpl::Initialize( |
| InternalComponentsFactory::FORCE_ENABLE_PRE_COMMIT_UPDATE_AVOIDANCE; |
| } |
| + http_post_provider_factory->RegisterCancelationSignal( |
|
rlarocque
2013/11/22 18:30:56
Since you are using a factory now, you could proba
pval...(no longer on Chromium)
2013/11/23 02:28:39
Done. I think this is close.
|
| + core_->GetRequestContextCancelationSignal()); |
| + |
| scoped_ptr<DoInitializeOptions> init_opts(new DoInitializeOptions( |
| registrar_->sync_thread()->message_loop(), |
| registrar_.get(), |
| @@ -115,11 +120,7 @@ void SyncBackendHostImpl::Initialize( |
| extensions_activity_monitor_.GetExtensionsActivity(), |
| event_handler, |
| sync_service_url, |
| - scoped_ptr<syncer::HttpPostProviderFactory>( |
| - new syncer::HttpBridgeFactory( |
| - make_scoped_refptr(profile_->GetRequestContext()), |
| - NetworkTimeTracker::BuildNotifierUpdateCallback(), |
| - core_->GetRequestContextCancelationSignal())), |
| + http_post_provider_factory.Pass(), |
| credentials, |
| invalidator_->GetInvalidatorClientId(), |
| sync_manager_factory.Pass(), |