| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/utility/utility_service_factory.h" | 5 #include "content/utility/utility_service_factory.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "content/child/child_process.h" | 9 #include "content/child/child_process.h" |
| 10 #include "content/network/network_service.h" | 10 #include "content/network/network_service_impl.h" |
| 11 #include "content/public/common/content_client.h" | 11 #include "content/public/common/content_client.h" |
| 12 #include "content/public/common/content_features.h" | 12 #include "content/public/common/content_features.h" |
| 13 #include "content/public/common/content_switches.h" | 13 #include "content/public/common/content_switches.h" |
| 14 #include "content/public/common/service_names.mojom.h" | 14 #include "content/public/common/service_names.mojom.h" |
| 15 #include "content/public/utility/content_utility_client.h" | 15 #include "content/public/utility/content_utility_client.h" |
| 16 #include "content/public/utility/utility_thread.h" | 16 #include "content/public/utility/utility_thread.h" |
| 17 #include "content/utility/utility_thread_impl.h" | 17 #include "content/utility/utility_thread_impl.h" |
| 18 #include "ppapi/features/features.h" | 18 #include "ppapi/features/features.h" |
| 19 #include "services/data_decoder/data_decoder_service.h" | 19 #include "services/data_decoder/data_decoder_service.h" |
| 20 #include "services/data_decoder/public/interfaces/constants.mojom.h" | 20 #include "services/data_decoder/public/interfaces/constants.mojom.h" |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 | 127 |
| 128 void UtilityServiceFactory::OnLoadFailed() { | 128 void UtilityServiceFactory::OnLoadFailed() { |
| 129 UtilityThreadImpl* utility_thread = | 129 UtilityThreadImpl* utility_thread = |
| 130 static_cast<UtilityThreadImpl*>(UtilityThread::Get()); | 130 static_cast<UtilityThreadImpl*>(UtilityThread::Get()); |
| 131 utility_thread->Shutdown(); | 131 utility_thread->Shutdown(); |
| 132 utility_thread->ReleaseProcess(); | 132 utility_thread->ReleaseProcess(); |
| 133 } | 133 } |
| 134 | 134 |
| 135 std::unique_ptr<service_manager::Service> | 135 std::unique_ptr<service_manager::Service> |
| 136 UtilityServiceFactory::CreateNetworkService() { | 136 UtilityServiceFactory::CreateNetworkService() { |
| 137 return base::MakeUnique<NetworkService>(std::move(network_registry_)); | 137 return base::MakeUnique<NetworkServiceImpl>(std::move(network_registry_)); |
| 138 } | 138 } |
| 139 | 139 |
| 140 } // namespace content | 140 } // namespace content |
| OLD | NEW |