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 "base/logging.h" | 7 #include "base/logging.h" |
8 #include "net/dns/host_resolver_mojo.h" | 8 #include "net/dns/mojo_host_resolver_impl.h" |
9 #include "net/interfaces/proxy_resolver_service.mojom.h" | 9 #include "net/interfaces/proxy_resolver_service.mojom.h" |
10 #include "net/proxy/in_process_mojo_proxy_resolver_factory.h" | 10 #include "net/proxy/in_process_mojo_proxy_resolver_factory.h" |
| 11 #include "net/proxy/mojo_proxy_resolver_factory.h" |
11 #include "net/proxy/mojo_proxy_resolver_impl.h" | 12 #include "net/proxy/mojo_proxy_resolver_impl.h" |
12 #include "net/proxy/proxy_resolver_factory.h" | 13 #include "net/proxy/proxy_resolver_factory.h" |
13 #include "net/proxy/proxy_resolver_mojo.h" | 14 #include "net/proxy/proxy_resolver_mojo.h" |
14 #include "net/proxy/proxy_resolver_v8_tracing.h" | 15 #include "net/proxy/proxy_resolver_v8_tracing.h" |
15 #include "net/proxy/proxy_service.h" | 16 #include "net/proxy/proxy_service.h" |
16 | 17 |
17 namespace net { | 18 namespace net { |
18 | 19 |
19 ProxyService* CreateProxyServiceUsingMojoFactory( | 20 ProxyService* CreateProxyServiceUsingMojoFactory( |
20 interfaces::ProxyResolverFactory* mojo_proxy_factory, | 21 MojoProxyResolverFactory* mojo_proxy_factory, |
21 ProxyConfigService* proxy_config_service, | 22 ProxyConfigService* proxy_config_service, |
22 ProxyScriptFetcher* proxy_script_fetcher, | 23 ProxyScriptFetcher* proxy_script_fetcher, |
23 DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher, | 24 DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher, |
24 HostResolver* host_resolver, | 25 HostResolver* host_resolver, |
25 NetLog* net_log, | 26 NetLog* net_log, |
26 NetworkDelegate* network_delegate) { | 27 NetworkDelegate* network_delegate) { |
27 DCHECK(proxy_config_service); | 28 DCHECK(proxy_config_service); |
28 DCHECK(proxy_script_fetcher); | 29 DCHECK(proxy_script_fetcher); |
29 DCHECK(dhcp_proxy_script_fetcher); | 30 DCHECK(dhcp_proxy_script_fetcher); |
30 DCHECK(host_resolver); | 31 DCHECK(host_resolver); |
(...skipping 17 matching lines...) Expand all Loading... |
48 HostResolver* host_resolver, | 49 HostResolver* host_resolver, |
49 NetLog* net_log, | 50 NetLog* net_log, |
50 NetworkDelegate* network_delegate) { | 51 NetworkDelegate* network_delegate) { |
51 return CreateProxyServiceUsingMojoFactory( | 52 return CreateProxyServiceUsingMojoFactory( |
52 InProcessMojoProxyResolverFactory::GetInstance(), proxy_config_service, | 53 InProcessMojoProxyResolverFactory::GetInstance(), proxy_config_service, |
53 proxy_script_fetcher, dhcp_proxy_script_fetcher, host_resolver, net_log, | 54 proxy_script_fetcher, dhcp_proxy_script_fetcher, host_resolver, net_log, |
54 network_delegate); | 55 network_delegate); |
55 } | 56 } |
56 | 57 |
57 } // namespace net | 58 } // namespace net |
OLD | NEW |