Chromium Code Reviews| OLD | NEW |
|---|---|
| (Empty) | |
| 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 | |
| 3 // found in the LICENSE file. | |
| 4 | |
| 5 #include "net/proxy/proxy_service_mojo.h" | |
| 6 | |
| 7 #include "base/logging.h" | |
| 8 #include "net/dns/host_resolver_mojo.h" | |
| 9 #include "net/interfaces/proxy_resolver_service.mojom.h" | |
| 10 #include "net/proxy/in_process_mojo_proxy_resolver_factory.h" | |
| 11 #include "net/proxy/mojo_proxy_resolver_impl.h" | |
| 12 #include "net/proxy/proxy_resolver_mojo.h" | |
| 13 #include "net/proxy/proxy_resolver_v8_tracing.h" | |
| 14 #include "net/proxy/proxy_service.h" | |
| 15 | |
| 16 namespace net { | |
| 17 | |
| 18 // static | |
|
Sam McNally
2015/03/02 03:26:24
These aren't really static.
Anand Mistry (off Chromium)
2015/03/03 02:54:43
Removed.
| |
| 19 ProxyService* CreateProxyServiceUsingMojoFactory( | |
| 20 MojoProxyResolverFactory* mojo_proxy_factory, | |
| 21 ProxyConfigService* proxy_config_service, | |
| 22 ProxyScriptFetcher* proxy_script_fetcher, | |
| 23 DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher, | |
| 24 HostResolver* host_resolver, | |
| 25 NetLog* net_log, | |
| 26 NetworkDelegate* network_delegate) { | |
| 27 DCHECK(proxy_config_service); | |
| 28 DCHECK(proxy_script_fetcher); | |
| 29 DCHECK(dhcp_proxy_script_fetcher); | |
| 30 DCHECK(host_resolver); | |
| 31 | |
| 32 ProxyResolverMojo* proxy_resolver = | |
| 33 new ProxyResolverMojo(mojo_proxy_factory, host_resolver); | |
| 34 | |
| 35 ProxyService* proxy_service = | |
| 36 new ProxyService(proxy_config_service, proxy_resolver, net_log); | |
| 37 | |
| 38 // Configure fetchers to use for PAC script downloads and auto-detect. | |
| 39 proxy_service->SetProxyScriptFetchers(proxy_script_fetcher, | |
| 40 dhcp_proxy_script_fetcher); | |
| 41 | |
| 42 return proxy_service; | |
| 43 } | |
| 44 | |
| 45 // static | |
| 46 ProxyService* CreateProxyServiceUsingMojoInProcess( | |
| 47 ProxyConfigService* proxy_config_service, | |
| 48 ProxyScriptFetcher* proxy_script_fetcher, | |
| 49 DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher, | |
| 50 HostResolver* host_resolver, | |
| 51 NetLog* net_log, | |
| 52 NetworkDelegate* network_delegate) { | |
| 53 return CreateProxyServiceUsingMojoFactory( | |
| 54 InProcessMojoProxyResolverFactory::GetInstance(), proxy_config_service, | |
| 55 proxy_script_fetcher, dhcp_proxy_script_fetcher, host_resolver, net_log, | |
| 56 network_delegate); | |
| 57 } | |
| 58 | |
| 59 } // namespace net | |
| OLD | NEW |