Reimplements net::AddressList without struct addrinfo.

net/ftp/ftp_network_transaction.cc

Index: net/ftp/ftp_network_transaction.cc
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc
index 322764f6fec318f71e682deb03f82053e94bafb3..c57bf8b8442edf90ef904d4747240a324448d570 100644
--- a/net/ftp/ftp_network_transaction.cc
+++ b/net/ftp/ftp_network_transaction.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -654,7 +654,7 @@ int FtpNetworkTransaction::DoCtrlConnectComplete(int result) {
     AddressList address;
     result = ctrl_socket_->GetPeerAddress(&address);
     if (result == OK) {
-      response_.socket_address = HostPortPair::FromAddrInfo(address.head());
+      response_.socket_address = HostPortPair::FromIPEndPoint(address[0]);

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

Here for instance code assumes that on success AddressList is non-empty, which I
believe is a correct assumption and what code should be doing. It is interesting
though that other places have conditionals to check for .empty().

I guess this case is irrelevant once you convert GetPeerAddress -->
GetPeerIPEndpoint anyway, just using it as an example :)

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

Both HostResolverImpl and its tests assume that OK implies non empty result.
I'll leave the "if (empty())" cleanup for the next CL.
Yes, although I think GetPeerAddress will keep its name. The updated API would
match GetLocalAddress(IPEndPoint*).

       next_state_ = STATE_CTRL_READ;
     }
   }
@@ -1194,7 +1194,8 @@ int FtpNetworkTransaction::DoDataConnect() {
   int rv = ctrl_socket_->GetPeerAddress(&data_address);
   if (rv != OK)
     return Stop(rv);
-  data_address.SetPort(data_connection_port_);
+  data_address = AddressList::CreateFromIPAddress(

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

This is a bit awkward. How about just calling the set port directly, or setting
port on front()?

I guess doesn't really matter since GetPeerAddress() should be going away.

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

The awkwardness comes from the immutability of IPEndPoint. I considered adding
IPEndPoint::set_port, but there are only 2 places that would use it
(HostResolverImpl and here).
It will still be:
IPEndPoint(endpoint.address(), data_connection_port_);

[eroman, 2012/05/04 04:20:22]

Ah. In that case I agree this is fine; no point changing the immutability at
this time. (Although if it complicates other stuff, seems like adding a simple
set_port() method wouldn't be a big deal).

+      data_address[0].address(), data_connection_port_);
   data_socket_.reset(socket_factory_->CreateTransportClientSocket(
         data_address, net_log_.net_log(), net_log_.source()));
   return data_socket_->Connect(io_callback_);