Index: net/proxy/proxy_resolver_factory_mojo.cc |
diff --git a/net/proxy/proxy_resolver_factory_mojo.cc b/net/proxy/proxy_resolver_factory_mojo.cc |
index c4b1ecaac4b747a6eafd40b717b6637c5346c3fd..187560595958470e9d8f7ae431cc8b9d68f7c581 100644 |
--- a/net/proxy/proxy_resolver_factory_mojo.cc |
+++ b/net/proxy/proxy_resolver_factory_mojo.cc |
@@ -22,7 +22,6 @@ |
#include "net/interfaces/host_resolver_service.mojom.h" |
#include "net/interfaces/proxy_resolver_service.mojom.h" |
#include "net/proxy/mojo_proxy_resolver_factory.h" |
-#include "net/proxy/mojo_proxy_type_converters.h" |
#include "net/proxy/proxy_info.h" |
#include "net/proxy/proxy_resolver.h" |
#include "net/proxy/proxy_resolver_error_observer.h" |
@@ -75,7 +74,7 @@ class ClientMixin : public ClientInterface { |
error_observer_->OnPACScriptError(line_number, message_str); |
} |
- void ResolveDns(interfaces::HostResolverRequestInfoPtr request_info, |
+ void ResolveDns(std::unique_ptr<HostResolver::RequestInfo> request_info, |
interfaces::HostResolverRequestClientPtr client) override { |
host_resolver_.Resolve(std::move(request_info), std::move(client)); |
} |
@@ -170,9 +169,7 @@ class ProxyResolverMojo::Job |
void OnConnectionError(); |
// Overridden from interfaces::ProxyResolverRequestClient: |
- void ReportResult( |
- int32_t error, |
- mojo::Array<interfaces::ProxyServerPtr> proxy_servers) override; |
+ void ReportResult(int32_t error, const net::ProxyInfo& proxy_info) override; |
ProxyResolverMojo* resolver_; |
const GURL url_; |
@@ -227,14 +224,13 @@ void ProxyResolverMojo::Job::OnConnectionError() { |
resolver_->RemoveJob(this); |
} |
-void ProxyResolverMojo::Job::ReportResult( |
- int32_t error, |
- mojo::Array<interfaces::ProxyServerPtr> proxy_servers) { |
+void ProxyResolverMojo::Job::ReportResult(int32_t error, |
+ const ProxyInfo& proxy_info) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
DVLOG(1) << "ProxyResolverMojo::Job::ReportResult: " << error; |
if (error == OK) { |
- *results_ = proxy_servers.To<ProxyInfo>(); |
+ *results_ = proxy_info; |
DVLOG(1) << "Servers: " << results_->ToPacString(); |
} |