Reimplements net::AddressList without struct addrinfo.

net/base/host_port_pair.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/base/host_port_pair.h"
 
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "googleurl/src/gurl.h"
+#include "net/base/ip_endpoint.h"
 #include "net/base/net_util.h"

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

Can this be deleted now?

[szym, 2012/05/04 02:38:29]

Yes!

-#include "net/base/sys_addrinfo.h"
 
 namespace net {
 
 HostPortPair::HostPortPair() : port_(0) {}
 HostPortPair::HostPortPair(const std::string& in_host, uint16 in_port)
     : host_(in_host), port_(in_port) {}
 
 // static
 HostPortPair HostPortPair::FromURL(const GURL& url) {
   return HostPortPair(url.HostNoBrackets(), url.EffectiveIntPort());
 }
 
 // static
-HostPortPair HostPortPair::FromAddrInfo(const struct addrinfo* ai) {
-  return HostPortPair(NetAddressToString(ai),
-                      GetPortFromSockaddr(ai->ai_addr, ai->ai_addrlen));
+HostPortPair HostPortPair::FromIPEndPoint(const IPEndPoint& ipe) {
+  return HostPortPair(ipe.ToStringWithoutPort(), ipe.port());
 }
 
 HostPortPair HostPortPair::FromString(const std::string& str) {
   std::vector<std::string> key_port;
   base::SplitString(str, ':', &key_port);
   if (key_port.size() != 2)
     return HostPortPair();
   int port;
   if (!base::StringToInt(key_port[1], &port))
     return HostPortPair();
@@ skipping 12 matching lines @@
   // Check to see if the host is an IPv6 address.  If so, added brackets.
   if (host_.find(':') != std::string::npos) {
     DCHECK_NE(host_[0], '[');
     return base::StringPrintf("[%s]", host_.c_str());
   }
 
   return host_;
 }
 
 }  // namespace net