Reimplements net::AddressList without struct addrinfo.

chrome/browser/ui/webui/net_internals/net_internals_ui.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 "chrome/browser/ui/webui/net_internals/net_internals_ui.h"
 
 #include <algorithm>
 #include <list>
 #include <string>
 #include <utility>
@@ skipping 40 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "grit/generated_resources.h"
 #include "grit/net_internals_resources.h"
 #include "net/base/escape.h"
 #include "net/base/host_cache.h"
 #include "net/base/host_resolver.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
-#include "net/base/sys_addrinfo.h"
 #include "net/base/transport_security_state.h"
 #include "net/base/x509_cert_types.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties.h"
 #include "net/http/http_stream_factory.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
@@ skipping 874 matching lines @@
     entry_dict->SetInteger("address_family",
         static_cast<int>(key.address_family));
     entry_dict->SetString("expiration",
                           net::NetLog::TickCountToString(it.expiration()));
 
     if (entry.error != net::OK) {
       entry_dict->SetInteger("error", entry.error);
     } else {
       // Append all of the resolved addresses.
       ListValue* address_list = new ListValue();
-      const struct addrinfo* current_address = entry.addrlist.head();
-      while (current_address) {
-        address_list->Append(Value::CreateStringValue(
-            net::NetAddressToStringWithPort(current_address)));
-        current_address = current_address->ai_next;
+      for (net::AddressList::const_iterator addr_it = entry.addrlist.begin();

[eroman, 2012/05/04 01:08:41]

[optional] style nit: For vectors I actually much prefer the  pattern:

for (size_t i = 0; i < entry.addrlist.size(); ++i) {
  ...
}

You are well within your rights to do either way, just saying since I find the
iterator approach less readable.

+           addr_it != entry.addrlist.end(); ++addr_it) {
+        address_list->Append(
+            Value::CreateStringValue(addr_it->ToStringWithoutPort()));
       }
       entry_dict->Set("addresses", address_list);
     }
 
     entry_list->Append(entry_dict);
   }
 
   cache_info_dict->Set("entries", entry_list);
   dict->Set("cache", cache_info_dict);
 
@@ skipping 703 matching lines @@
 }
 
 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui)
     : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new NetInternalsMessageHandler());
 
   // Set up the chrome://net-internals/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   ChromeURLDataManager::AddDataSource(profile, CreateNetInternalsHTMLSource());
 }