fixed issue 128383 - replace GetPeerAddress(AddressList* address) with GetPeerAddress(IPEndPoint* address)

R=szym@chromium.org
BUG=128383
TEST=try bot


Review URL: https://chromiumcodereview.appspot.com/10491007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141125 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 19 insertions, 21 deletions

diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_server.cc b/content/browser/renderer_host/p2p/socket_host_tcp_server.cc
index e5d3401..ed92b4d 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp_server.cc
+++ b/content/browser/renderer_host/p2p/socket_host_tcp_server.cc
@@ -94,13 +94,12 @@ void P2PSocketHostTcpServer::HandleAcceptResult(int result) {
     return;
   }
 
-  net::AddressList addr_list;
-  if (accept_socket_->GetPeerAddress(&addr_list) != net::OK) {
+  net::IPEndPoint address;
+  if (accept_socket_->GetPeerAddress(&address) != net::OK) {
     LOG(ERROR) << "Failed to get address of an accepted socket.";
     accept_socket_.reset();
     return;
   }
-  const net::IPEndPoint& address = addr_list.front();
   AcceptedSocketsMap::iterator it = accepted_sockets_.find(address);
   if (it != accepted_sockets_.end())
     delete it->second;
diff --git a/content/browser/renderer_host/p2p/socket_host_test_utils.h b/content/browser/renderer_host/p2p/socket_host_test_utils.h
index 03822ff..9c50cfd 100644
--- a/content/browser/renderer_host/p2p/socket_host_test_utils.h
+++ b/content/browser/renderer_host/p2p/socket_host_test_utils.h
@@ -66,7 +66,7 @@ class FakeSocket : public net::StreamSocket {
   virtual void Disconnect() OVERRIDE;
   virtual bool IsConnected() const OVERRIDE;
   virtual bool IsConnectedAndIdle() const OVERRIDE;
-  virtual int GetPeerAddress(net::AddressList* address) const OVERRIDE;
+  virtual int GetPeerAddress(net::IPEndPoint* address) const OVERRIDE;
   virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE;
   virtual const net::BoundNetLog& NetLog() const OVERRIDE;
   virtual void SetSubresourceSpeculation() OVERRIDE;
@@ -180,9 +180,8 @@ bool FakeSocket::IsConnectedAndIdle() const {
   return false;
 }
 
-int FakeSocket::GetPeerAddress(net::AddressList* address) const {
-  *address = net::AddressList::CreateFromIPAddress(peer_address_.address(),
-                                                   peer_address_.port());
+int FakeSocket::GetPeerAddress(net::IPEndPoint* address) const {
+  *address = peer_address_;
   return net::OK;
 }
 
diff --git a/content/browser/renderer_host/pepper_tcp_server_socket.cc b/content/browser/renderer_host/pepper_tcp_server_socket.cc
index 15a39c4..cf21497 100644
--- a/content/browser/renderer_host/pepper_tcp_server_socket.cc
+++ b/content/browser/renderer_host/pepper_tcp_server_socket.cc
@@ -126,19 +126,19 @@ void PepperTCPServerSocket::OnAcceptCompleted(
   } else {
     scoped_ptr<net::StreamSocket> socket(socket_buffer_.release());
 
-    net::IPEndPoint ip_end_point;
-    net::AddressList address_list;
+    net::IPEndPoint ip_end_point_local;
+    net::IPEndPoint ip_end_point_remote;
     PP_NetAddress_Private local_addr =
         NetAddressPrivateImpl::kInvalidNetAddress;
     PP_NetAddress_Private remote_addr =
         NetAddressPrivateImpl::kInvalidNetAddress;
 
-    if (socket->GetLocalAddress(&ip_end_point) != net::OK ||
-        !NetAddressPrivateImpl::IPEndPointToNetAddress(ip_end_point,
+    if (socket->GetLocalAddress(&ip_end_point_local) != net::OK ||
+        !NetAddressPrivateImpl::IPEndPointToNetAddress(ip_end_point_local,
                                                        &local_addr) ||
-        socket->GetPeerAddress(&address_list) != net::OK ||
-        !NetAddressPrivateImpl::AddressListToNetAddress(address_list,
-                                                        &remote_addr)) {
+        socket->GetPeerAddress(&ip_end_point_remote) != net::OK ||
+        !NetAddressPrivateImpl::IPEndPointToNetAddress(ip_end_point_remote,
+                                                       &remote_addr)) {
       SendAcceptACKError();
     } else {
       uint32 accepted_socket_id =
diff --git a/content/browser/renderer_host/pepper_tcp_socket.cc b/content/browser/renderer_host/pepper_tcp_socket.cc
index d6007f5..232dbc0 100644
--- a/content/browser/renderer_host/pepper_tcp_socket.cc
+++ b/content/browser/renderer_host/pepper_tcp_socket.cc
@@ -317,19 +317,19 @@ void PepperTCPSocket::OnConnectCompleted(int result) {
     SendConnectACKError();
     connection_state_ = BEFORE_CONNECT;
   } else {
-    net::IPEndPoint ip_end_point;
-    net::AddressList address_list;
+    net::IPEndPoint ip_end_point_local;
+    net::IPEndPoint ip_end_point_remote;
     PP_NetAddress_Private local_addr =
         NetAddressPrivateImpl::kInvalidNetAddress;
     PP_NetAddress_Private remote_addr =
         NetAddressPrivateImpl::kInvalidNetAddress;
 
-    if (socket_->GetLocalAddress(&ip_end_point) != net::OK ||
-        !NetAddressPrivateImpl::IPEndPointToNetAddress(ip_end_point,
+    if (socket_->GetLocalAddress(&ip_end_point_local) != net::OK ||
+        !NetAddressPrivateImpl::IPEndPointToNetAddress(ip_end_point_local,
                                                        &local_addr) ||
-        socket_->GetPeerAddress(&address_list) != net::OK ||
-        !NetAddressPrivateImpl::AddressListToNetAddress(address_list,
-                                                        &remote_addr)) {
+        socket_->GetPeerAddress(&ip_end_point_remote) != net::OK ||
+        !NetAddressPrivateImpl::IPEndPointToNetAddress(ip_end_point_remote,
+                                                       &remote_addr)) {
       SendConnectACKError();
       connection_state_ = BEFORE_CONNECT;
     } else {