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/callback_helpers.h" |
7 #include "base/logging.h" | 8 #include "base/logging.h" |
8 #include "net/dns/host_resolver_mojo.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_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 namespace { | 19 namespace { |
19 | 20 |
20 class ProxyResolverFactoryForMojoResolver : public ProxyResolverFactory { | 21 class ProxyResolverFactoryForMojoResolver : public ProxyResolverFactory { |
21 public: | 22 public: |
22 ProxyResolverFactoryForMojoResolver( | 23 ProxyResolverFactoryForMojoResolver( |
23 MojoProxyResolverFactory* mojo_proxy_factory, | 24 MojoProxyResolverFactory* mojo_proxy_factory, |
24 HostResolver* host_resolver) | 25 HostResolver* host_resolver) |
25 : ProxyResolverFactory(true), | 26 : ProxyResolverFactory(true), |
26 mojo_proxy_factory_(mojo_proxy_factory), | 27 mojo_proxy_factory_(mojo_proxy_factory), |
27 host_resolver_(host_resolver) {} | 28 host_resolver_(host_resolver) {} |
28 | 29 |
29 // ProxyResolverFactory override. | 30 // ProxyResolverFactory override. |
30 scoped_ptr<ProxyResolver> CreateProxyResolver() override { | 31 scoped_ptr<ProxyResolver> CreateProxyResolver() override { |
| 32 interfaces::HostResolverPtr mojo_host_resolver_ptr; |
| 33 interfaces::ProxyResolverPtr mojo_proxy_resolver_ptr; |
| 34 auto host_resolver_request = mojo::GetProxy(&mojo_host_resolver_ptr); |
| 35 scoped_ptr<base::ScopedClosureRunner> runner( |
| 36 mojo_proxy_factory_->Create(mojo::GetProxy(&mojo_proxy_resolver_ptr), |
| 37 mojo_host_resolver_ptr.Pass())); |
31 return make_scoped_ptr( | 38 return make_scoped_ptr( |
32 new ProxyResolverMojo(mojo_proxy_factory_, host_resolver_)); | 39 new ProxyResolverMojo(mojo_proxy_resolver_ptr.Pass(), host_resolver_, |
| 40 host_resolver_request.Pass(), runner.Pass())); |
33 } | 41 } |
34 | 42 |
35 private: | 43 private: |
36 MojoProxyResolverFactory* const mojo_proxy_factory_; | 44 MojoProxyResolverFactory* const mojo_proxy_factory_; |
37 HostResolver* const host_resolver_; | 45 HostResolver* const host_resolver_; |
38 | 46 |
39 DISALLOW_COPY_AND_ASSIGN(ProxyResolverFactoryForMojoResolver); | 47 DISALLOW_COPY_AND_ASSIGN(ProxyResolverFactoryForMojoResolver); |
40 }; | 48 }; |
41 | 49 |
42 } // namespace | 50 } // namespace |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 HostResolver* host_resolver, | 82 HostResolver* host_resolver, |
75 NetLog* net_log, | 83 NetLog* net_log, |
76 NetworkDelegate* network_delegate) { | 84 NetworkDelegate* network_delegate) { |
77 return CreateProxyServiceUsingMojoFactory( | 85 return CreateProxyServiceUsingMojoFactory( |
78 InProcessMojoProxyResolverFactory::GetInstance(), proxy_config_service, | 86 InProcessMojoProxyResolverFactory::GetInstance(), proxy_config_service, |
79 proxy_script_fetcher, dhcp_proxy_script_fetcher, host_resolver, net_log, | 87 proxy_script_fetcher, dhcp_proxy_script_fetcher, host_resolver, net_log, |
80 network_delegate); | 88 network_delegate); |
81 } | 89 } |
82 | 90 |
83 } // namespace net | 91 } // namespace net |
OLD | NEW |