| Index: net/proxy/mojo_proxy_type_converters.cc
|
| diff --git a/net/proxy/mojo_proxy_type_converters.cc b/net/proxy/mojo_proxy_type_converters.cc
|
| index bfaae12570288396497e9db4d6e561052b363004..00aed7ab682bd6c3cc942beaf24d70cb1c409c90 100644
|
| --- a/net/proxy/mojo_proxy_type_converters.cc
|
| +++ b/net/proxy/mojo_proxy_type_converters.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/logging.h"
|
| #include "net/base/host_port_pair.h"
|
| +#include "net/proxy/proxy_info.h"
|
| #include "net/proxy/proxy_server.h"
|
|
|
| namespace net {
|
| @@ -80,4 +81,17 @@ TypeConverter<net::ProxyServer, net::interfaces::ProxyServerPtr>::Convert(
|
| net::HostPortPair(obj->host, obj->port));
|
| }
|
|
|
| +// static
|
| +net::ProxyInfo
|
| +TypeConverter<net::ProxyInfo, mojo::Array<net::interfaces::ProxyServerPtr>>::
|
| + Convert(const mojo::Array<net::interfaces::ProxyServerPtr>& obj) {
|
| + net::ProxyList proxy_list;
|
| + for (size_t i = 0; i < obj.size(); i++) {
|
| + proxy_list.AddProxyServer(obj[i].To<net::ProxyServer>());
|
| + }
|
| + net::ProxyInfo info;
|
| + info.UseProxyList(proxy_list);
|
| + return info;
|
| +}
|
| +
|
| } // namespace mojo
|
|
|