| 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 "net/proxy/proxy_service_mojo.h" | 5 #include "net/proxy/proxy_service_mojo.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
| 12 #include "base/threading/thread_task_runner_handle.h" | 12 #include "base/threading/thread_task_runner_handle.h" |
| 13 #include "net/dns/mojo_host_resolver_impl.h" | 13 #include "net/dns/mojo_host_resolver_impl.h" |
| 14 #include "net/interfaces/proxy_resolver_service.mojom.h" | 14 #include "net/interfaces/proxy_resolver_service.mojom.h" |
| 15 #include "net/proxy/mojo_proxy_resolver_factory.h" | 15 #include "net/proxy/mojo_proxy_resolver_factory.h" |
| 16 #include "net/proxy/network_delegate_error_observer.h" | 16 #include "net/proxy/network_delegate_error_observer.h" |
| 17 #include "net/proxy/proxy_resolver_factory.h" | 17 #include "net/proxy/proxy_resolver_factory.h" |
| 18 #include "net/proxy/proxy_resolver_factory_mojo.h" | 18 #include "net/proxy/proxy_resolver_factory_mojo.h" |
| 19 #include "net/proxy/proxy_resolver_v8_tracing.h" | |
| 20 #include "net/proxy/proxy_service.h" | 19 #include "net/proxy/proxy_service.h" |
| 21 | 20 |
| 22 namespace net { | 21 namespace net { |
| 23 | 22 |
| 24 std::unique_ptr<ProxyService> CreateProxyServiceUsingMojoFactory( | 23 std::unique_ptr<ProxyService> CreateProxyServiceUsingMojoFactory( |
| 25 MojoProxyResolverFactory* mojo_proxy_factory, | 24 MojoProxyResolverFactory* mojo_proxy_factory, |
| 26 std::unique_ptr<ProxyConfigService> proxy_config_service, | 25 std::unique_ptr<ProxyConfigService> proxy_config_service, |
| 27 ProxyScriptFetcher* proxy_script_fetcher, | 26 ProxyScriptFetcher* proxy_script_fetcher, |
| 28 std::unique_ptr<DhcpProxyScriptFetcher> dhcp_proxy_script_fetcher, | 27 std::unique_ptr<DhcpProxyScriptFetcher> dhcp_proxy_script_fetcher, |
| 29 HostResolver* host_resolver, | 28 HostResolver* host_resolver, |
| (...skipping 14 matching lines...) Expand all Loading... |
| 44 net_log)); | 43 net_log)); |
| 45 | 44 |
| 46 // Configure fetchers to use for PAC script downloads and auto-detect. | 45 // Configure fetchers to use for PAC script downloads and auto-detect. |
| 47 proxy_service->SetProxyScriptFetchers(proxy_script_fetcher, | 46 proxy_service->SetProxyScriptFetchers(proxy_script_fetcher, |
| 48 std::move(dhcp_proxy_script_fetcher)); | 47 std::move(dhcp_proxy_script_fetcher)); |
| 49 | 48 |
| 50 return proxy_service; | 49 return proxy_service; |
| 51 } | 50 } |
| 52 | 51 |
| 53 } // namespace net | 52 } // namespace net |
| OLD | NEW |