| Index: net/proxy/mojo_proxy_resolver_impl.cc
|
| diff --git a/net/proxy/mojo_proxy_resolver_impl.cc b/net/proxy/mojo_proxy_resolver_impl.cc
|
| index e72008b57f774fb4cb85b3294b232b52a6fd7471..62ee552ae6e3472c264aac1a23c436f1b9b637bb 100644
|
| --- a/net/proxy/mojo_proxy_resolver_impl.cc
|
| +++ b/net/proxy/mojo_proxy_resolver_impl.cc
|
| @@ -12,7 +12,6 @@
|
| #include "net/base/net_errors.h"
|
| #include "net/log/net_log.h"
|
| #include "net/proxy/mojo_proxy_resolver_v8_tracing_bindings.h"
|
| -#include "net/proxy/mojo_proxy_type_converters.h"
|
| #include "net/proxy/proxy_info.h"
|
| #include "net/proxy/proxy_resolver_script_data.h"
|
| #include "net/proxy/proxy_resolver_v8_tracing.h"
|
| @@ -102,12 +101,11 @@ void MojoProxyResolverImpl::Job::GetProxyDone(int error) {
|
| for (const auto& proxy : result_.proxy_list().GetAll()) {
|
| DVLOG(1) << proxy.ToURI();
|
| }
|
| - mojo::Array<interfaces::ProxyServerPtr> result;
|
| - if (error == OK) {
|
| - result = mojo::Array<interfaces::ProxyServerPtr>::From(
|
| - result_.proxy_list().GetAll());
|
| - }
|
| - client_->ReportResult(error, std::move(result));
|
| + if (error == OK)
|
| + client_->ReportResult(error, result_);
|
| + else
|
| + client_->ReportResult(error, ProxyInfo());
|
| +
|
| resolver_->DeleteJob(this);
|
| }
|
|
|
|
|