Reimplements net::AddressList without struct addrinfo.

net/proxy/proxy_resolver_js_bindings.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/proxy/proxy_resolver_js_bindings.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "net/base/address_list.h"
 #include "net/base/host_cache.h"
 #include "net/base/host_resolver.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/base/net_util.h"
-#include "net/base/sys_addrinfo.h"
 #include "net/proxy/proxy_resolver_error_observer.h"
 #include "net/proxy/proxy_resolver_request_context.h"
 #include "net/proxy/sync_host_resolver.h"
 
 namespace net {
 
 namespace {
 
 // TTL for the per-request DNS cache. Applies to both successful and failed
 // DNS resolutions.
@@ skipping 172 matching lines @@
     HostResolver::RequestInfo info(HostPortPair(host, 80));
     info.set_address_family(ADDRESS_FAMILY_IPV4);
     AddressList address_list;
 
     int result = DnsResolveHelper(info, &address_list);
     if (result != OK)
       return false;
 
     // There may be multiple results; we will just use the first one.
     // This returns empty string on failure.
-    *first_ip_address = net::NetAddressToString(address_list.head());
+    *first_ip_address = address_list.front().ToStringWithoutPort();
     if (first_ip_address->empty())
       return false;
 
     return true;
   }
 
   bool DnsResolveExImpl(const std::string& host,
                         std::string* ip_address_list) {
     // Do a sync resolve of the hostname (port doesn't matter).
     HostResolver::RequestInfo info(HostPortPair(host, 80));
     AddressList address_list;
     int result = DnsResolveHelper(info, &address_list);
 
     if (result != OK)
       return false;
 
     // Stringify all of the addresses in the address list, separated
     // by semicolons.
     std::string address_list_str;
-    const struct addrinfo* current_address = address_list.head();
-    while (current_address) {
+    for (AddressList::const_iterator iter = address_list.begin();
+         iter != address_list.end(); ++iter) {
       if (!address_list_str.empty())
         address_list_str += ";";
-      const std::string address_string = NetAddressToString(current_address);
+      const std::string address_string = iter->ToStringWithoutPort();
       if (address_string.empty())
         return false;
       address_list_str += address_string;
-      current_address = current_address->ai_next;
     }
 
     *ip_address_list = address_list_str;
     return true;
   }
 
   // Helper to execute a synchronous DNS resolve, using the per-request
   // DNS cache if there is one.
   int DnsResolveHelper(const HostResolver::RequestInfo& info,
                        AddressList* address_list) {
@@ skipping 69 matching lines @@
 
 // static
 ProxyResolverJSBindings* ProxyResolverJSBindings::CreateDefault(
     SyncHostResolver* host_resolver,
     NetLog* net_log,
     ProxyResolverErrorObserver* error_observer) {
   return new DefaultJSBindings(host_resolver, net_log, error_observer);
 }
 
 }  // namespace net