Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Side by Side Diff: net/proxy/proxy_service_mojo.cc

Issue 1017453005: Add support for ProxyResolverErrorObserver to ProxyResolverMojo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/proxy/proxy_resolver_mojo_unittest.cc ('k') | net/proxy/proxy_service_mojo_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/message_loop/message_loop_proxy.h"
8 #include "net/dns/mojo_host_resolver_impl.h" 9 #include "net/dns/mojo_host_resolver_impl.h"
9 #include "net/interfaces/proxy_resolver_service.mojom.h" 10 #include "net/interfaces/proxy_resolver_service.mojom.h"
10 #include "net/proxy/in_process_mojo_proxy_resolver_factory.h" 11 #include "net/proxy/in_process_mojo_proxy_resolver_factory.h"
11 #include "net/proxy/mojo_proxy_resolver_factory.h" 12 #include "net/proxy/mojo_proxy_resolver_factory.h"
12 #include "net/proxy/mojo_proxy_resolver_impl.h" 13 #include "net/proxy/mojo_proxy_resolver_impl.h"
14 #include "net/proxy/network_delegate_error_observer.h"
13 #include "net/proxy/proxy_resolver_factory.h" 15 #include "net/proxy/proxy_resolver_factory.h"
14 #include "net/proxy/proxy_resolver_mojo.h" 16 #include "net/proxy/proxy_resolver_mojo.h"
15 #include "net/proxy/proxy_resolver_v8_tracing.h" 17 #include "net/proxy/proxy_resolver_v8_tracing.h"
16 #include "net/proxy/proxy_service.h" 18 #include "net/proxy/proxy_service.h"
17 19
18 namespace net { 20 namespace net {
19 21
20 ProxyService* CreateProxyServiceUsingMojoFactory( 22 ProxyService* CreateProxyServiceUsingMojoFactory(
21 MojoProxyResolverFactory* mojo_proxy_factory, 23 MojoProxyResolverFactory* mojo_proxy_factory,
22 ProxyConfigService* proxy_config_service, 24 ProxyConfigService* proxy_config_service,
23 ProxyScriptFetcher* proxy_script_fetcher, 25 ProxyScriptFetcher* proxy_script_fetcher,
24 DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher, 26 DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher,
25 HostResolver* host_resolver, 27 HostResolver* host_resolver,
26 NetLog* net_log, 28 NetLog* net_log,
27 NetworkDelegate* network_delegate) { 29 NetworkDelegate* network_delegate) {
28 DCHECK(proxy_config_service); 30 DCHECK(proxy_config_service);
29 DCHECK(proxy_script_fetcher); 31 DCHECK(proxy_script_fetcher);
30 DCHECK(dhcp_proxy_script_fetcher); 32 DCHECK(dhcp_proxy_script_fetcher);
31 DCHECK(host_resolver); 33 DCHECK(host_resolver);
32 34
33 ProxyService* proxy_service = new ProxyService( 35 ProxyService* proxy_service = new ProxyService(
34 proxy_config_service, make_scoped_ptr(new ProxyResolverFactoryMojo( 36 proxy_config_service,
35 mojo_proxy_factory, host_resolver)), 37 make_scoped_ptr(new ProxyResolverFactoryMojo(
38 mojo_proxy_factory, host_resolver,
39 base::Bind(&NetworkDelegateErrorObserver::Create, network_delegate,
40 base::MessageLoopProxy::current()))),
36 net_log); 41 net_log);
37 42
38 // Configure fetchers to use for PAC script downloads and auto-detect. 43 // Configure fetchers to use for PAC script downloads and auto-detect.
39 proxy_service->SetProxyScriptFetchers(proxy_script_fetcher, 44 proxy_service->SetProxyScriptFetchers(proxy_script_fetcher,
40 dhcp_proxy_script_fetcher); 45 dhcp_proxy_script_fetcher);
41 46
42 return proxy_service; 47 return proxy_service;
43 } 48 }
44 49
45 ProxyService* CreateProxyServiceUsingMojoInProcess( 50 ProxyService* CreateProxyServiceUsingMojoInProcess(
46 ProxyConfigService* proxy_config_service, 51 ProxyConfigService* proxy_config_service,
47 ProxyScriptFetcher* proxy_script_fetcher, 52 ProxyScriptFetcher* proxy_script_fetcher,
48 DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher, 53 DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher,
49 HostResolver* host_resolver, 54 HostResolver* host_resolver,
50 NetLog* net_log, 55 NetLog* net_log,
51 NetworkDelegate* network_delegate) { 56 NetworkDelegate* network_delegate) {
52 return CreateProxyServiceUsingMojoFactory( 57 return CreateProxyServiceUsingMojoFactory(
53 InProcessMojoProxyResolverFactory::GetInstance(), proxy_config_service, 58 InProcessMojoProxyResolverFactory::GetInstance(), proxy_config_service,
54 proxy_script_fetcher, dhcp_proxy_script_fetcher, host_resolver, net_log, 59 proxy_script_fetcher, dhcp_proxy_script_fetcher, host_resolver, net_log,
55 network_delegate); 60 network_delegate);
56 } 61 }
57 62
58 } // namespace net 63 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/proxy_resolver_mojo_unittest.cc ('k') | net/proxy/proxy_service_mojo_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698