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

Unified Diff: net/proxy/proxy_resolver_factory_mojo.cc

Issue 2083463002: Replace //net TypeConverters with StructTraits. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@type-converter-cleanup--gurl
Patch Set: rebase Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
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 0a14cac3589f0f8f233072c232874c610e66c3d7..ceddef64065f44f21359f257d7483669ab6d1b21 100644
--- a/net/proxy/proxy_resolver_factory_mojo.cc
+++ b/net/proxy/proxy_resolver_factory_mojo.cc
@@ -26,7 +26,6 @@
#include "net/log/net_log_event_type.h"
#include "net/log/net_log_with_source.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"
@@ -82,7 +81,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));
}
@@ -177,9 +176,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_;
@@ -234,14 +231,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();
}

Powered by Google App Engine
This is Rietveld 408576698