Chromium Code Reviews| Index: chromeos/dbus/services/proxy_resolution_service_provider.cc |
| diff --git a/chromeos/dbus/services/proxy_resolution_service_provider.cc b/chromeos/dbus/services/proxy_resolution_service_provider.cc |
| index 64bcd47884bc015156467a7596ea297458d41465..87279d6057c2a286d989e84a219181d0e8464d4d 100644 |
| --- a/chromeos/dbus/services/proxy_resolution_service_provider.cc |
| +++ b/chromeos/dbus/services/proxy_resolution_service_provider.cc |
| @@ -16,6 +16,7 @@ |
| #include "net/base/net_errors.h" |
| #include "net/log/net_log_with_source.h" |
| #include "net/proxy/proxy_info.h" |
| +#include "net/proxy/proxy_service.h" |
| #include "net/url_request/url_request_context.h" |
| #include "net/url_request/url_request_context_getter.h" |
| #include "third_party/cros_system_api/dbus/service_constants.h" |
| @@ -198,9 +199,9 @@ void ProxyResolutionServiceProvider::ResolveProxyOnNetworkThread( |
| VLOG(1) << "Starting network proxy resolution for " |
| << request_ptr->source_url; |
| - const int result = |
| - delegate_->ResolveProxy(proxy_service, GURL(request_ptr->source_url), |
| - &request_ptr->proxy_info, callback); |
| + const int result = proxy_service->ResolveProxy( |
|
James Cook
2017/03/31 17:33:10
optional: net::Error (or do we prefer int for erro
Daniel Erat
2017/03/31 17:46:37
i was actually confused about this too. net::Proxy
|
| + GURL(request_ptr->source_url), std::string(), &request_ptr->proxy_info, |
| + callback, nullptr, nullptr, net::NetLogWithSource()); |
| if (result != net::ERR_IO_PENDING) { |
| VLOG(1) << "Network proxy resolution completed synchronously."; |
| callback.Run(result); |