| Index: content/utility/utility_service_factory.cc
|
| diff --git a/content/utility/utility_service_factory.cc b/content/utility/utility_service_factory.cc
|
| index 73c2cf8e242ec6c5af2eb1b5ce7287bfc60aa711..734fdebd587cd6bff7c43b0644918fc0daa12f29 100644
|
| --- a/content/utility/utility_service_factory.cc
|
| +++ b/content/utility/utility_service_factory.cc
|
| @@ -34,7 +34,8 @@ std::unique_ptr<service_manager::Service> CreateDataDecoderService() {
|
|
|
| } // namespace
|
|
|
| -UtilityServiceFactory::UtilityServiceFactory() {}
|
| +UtilityServiceFactory::UtilityServiceFactory()
|
| + : network_registry_(base::MakeUnique<service_manager::BinderRegistry>()) {}
|
|
|
| UtilityServiceFactory::~UtilityServiceFactory() {}
|
|
|
| @@ -59,8 +60,11 @@ void UtilityServiceFactory::RegisterServices(ServiceMap* services) {
|
|
|
| if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kEnableNetworkService)) {
|
| + GetContentClient()->utility()->RegisterNetworkBinders(
|
| + network_registry_.get());
|
| ServiceInfo network_info;
|
| - network_info.factory = base::Bind(&NetworkService::CreateNetworkService);
|
| + network_info.factory = base::Bind(
|
| + &UtilityServiceFactory::CreateNetworkService, base::Unretained(this));
|
| network_info.task_runner = ChildProcess::current()->io_task_runner();
|
| services->insert(
|
| std::make_pair(content::mojom::kNetworkServiceName, network_info));
|
| @@ -78,4 +82,9 @@ void UtilityServiceFactory::OnLoadFailed() {
|
| utility_thread->ReleaseProcessIfNeeded();
|
| }
|
|
|
| +std::unique_ptr<service_manager::Service>
|
| +UtilityServiceFactory::CreateNetworkService() {
|
| + return base::MakeUnique<NetworkService>(std::move(network_registry_));
|
| +}
|
| +
|
| } // namespace content
|
|
|