Index: net/proxy/proxy_service_mojo.cc |
diff --git a/net/proxy/proxy_service_mojo.cc b/net/proxy/proxy_service_mojo.cc |
index b714f03efcb5a1f572a11ea3625daf5c6a2f9997..6fa2cb6e30499e1d9f35e47cfc011e57d5702f11 100644 |
--- a/net/proxy/proxy_service_mojo.cc |
+++ b/net/proxy/proxy_service_mojo.cc |
@@ -4,8 +4,9 @@ |
#include "net/proxy/proxy_service_mojo.h" |
+#include "base/callback_helpers.h" |
#include "base/logging.h" |
-#include "net/dns/host_resolver_mojo.h" |
+#include "net/dns/mojo_host_resolver_impl.h" |
#include "net/interfaces/proxy_resolver_service.mojom.h" |
#include "net/proxy/in_process_mojo_proxy_resolver_factory.h" |
#include "net/proxy/mojo_proxy_resolver_impl.h" |
@@ -28,8 +29,15 @@ class ProxyResolverFactoryForMojoResolver : public ProxyResolverFactory { |
// ProxyResolverFactory override. |
scoped_ptr<ProxyResolver> CreateProxyResolver() override { |
+ interfaces::HostResolverPtr mojo_host_resolver_ptr; |
+ interfaces::ProxyResolverPtr mojo_proxy_resolver_ptr; |
+ auto host_resolver_request = mojo::GetProxy(&mojo_host_resolver_ptr); |
+ scoped_ptr<base::ScopedClosureRunner> runner( |
+ mojo_proxy_factory_->Create(mojo::GetProxy(&mojo_proxy_resolver_ptr), |
+ mojo_host_resolver_ptr.Pass())); |
return make_scoped_ptr( |
- new ProxyResolverMojo(mojo_proxy_factory_, host_resolver_)); |
+ new ProxyResolverMojo(mojo_proxy_resolver_ptr.Pass(), host_resolver_, |
+ host_resolver_request.Pass(), runner.Pass())); |
} |
private: |