Change IPEndpoint::address() to return a net::IPAddress

content/renderer/p2p/ipc_socket_factory.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 "content/renderer/p2p/ipc_socket_factory.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 545 matching lines @@
 
   SignalAddressReady(this, local_address_);
   if (IsTcpClientSocket(type_)) {
     // If remote address is unresolved, set resolved remote IP address received
     // in the callback. This address will be used while sending the packets
     // over the network.
     if (remote_address_.IsUnresolvedIP()) {
       rtc::SocketAddress jingle_socket_address;
       // |remote_address| could be unresolved if the connection is behind a
       // proxy.
-      if (!remote_address.address().empty() &&
-          jingle_glue::IPEndPointToSocketAddress(
-              remote_address, &jingle_socket_address)) {
+      if (!remote_address.address_number().empty() &&
+          jingle_glue::IPEndPointToSocketAddress(remote_address,
+                                                 &jingle_socket_address)) {
         // Set only the IP address.
         remote_address_.SetResolvedIP(jingle_socket_address.ipaddr());
       }
     }
 
     // SignalConnect after updating the |remote_address_| so that the listener
     // can get the resolved remote address.
     SignalConnect(this);
   }
 }
@@ skipping 61 matching lines @@
   }
 }
 
 void IpcPacketSocket::OnDataReceived(const net::IPEndPoint& address,
                                      const std::vector<char>& data,
                                      const base::TimeTicks& timestamp) {
   DCHECK_EQ(base::MessageLoop::current(), message_loop_);
 
   rtc::SocketAddress address_lj;
 
-  if (address.address().empty()) {
+  if (address.address_number().empty()) {
     DCHECK(IsTcpClientSocket(type_));
     // |address| could be empty for TCP connections behind a proxy.
     address_lj = remote_address_;
   } else {
     if (!jingle_glue::IPEndPointToSocketAddress(address, &address_lj)) {
       // We should always be able to convert address here because we
       // don't expect IPv6 address on IPv4 connections.
       NOTREACHED();
       return;
     }
@@ skipping 140 matching lines @@
 }
 
 rtc::AsyncResolverInterface*
 IpcPacketSocketFactory::CreateAsyncResolver() {
   scoped_ptr<AsyncAddressResolverImpl> resolver(
     new AsyncAddressResolverImpl(socket_dispatcher_));
   return resolver.release();
 }
 
 }  // namespace content