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

content/browser/renderer_host/p2p/socket_host_tcp.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/browser/renderer_host/p2p/socket_host_tcp.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/location.h"
@@ skipping 79 matching lines @@
 
   net::HostPortPair dest_host_port_pair;
   // If there is a domain name, let's try it first, it's required by some proxy
   // to only take hostname for CONNECT. If it has been DNS resolved, the result
   // is likely cached and shouldn't cause 2nd DNS resolution in the case of
   // direct connect (i.e. no proxy).
   if (!remote_address.hostname.empty()) {
     dest_host_port_pair = net::HostPortPair(remote_address.hostname,
                                             remote_address.ip_address.port());
   } else {
-    DCHECK(!remote_address.ip_address.address().empty());
+    DCHECK(!remote_address.ip_address.address_number().empty());
     dest_host_port_pair = net::HostPortPair::FromIPEndPoint(
         remote_address.ip_address);
   }
 
   // TODO(mallinath) - We are ignoring local_address altogether. We should
   // find a way to inject this into ProxyResolvingClientSocket. This could be
   // a problem on multi-homed host.
 
   // The default SSLConfig is good enough for us for now.
   const net::SSLConfig ssl_config;
@@ skipping 78 matching lines @@
   context.transport_security_state =
       url_context_->GetURLRequestContext()->transport_security_state();
   DCHECK(context.transport_security_state);
 
   // Default ssl config.
   const net::SSLConfig ssl_config;
   net::HostPortPair dest_host_port_pair;
 
   // Calling net::HostPortPair::FromIPEndPoint will crash if the IP address is
   // empty.
-  if (!remote_address_.ip_address.address().empty()) {
+  if (!remote_address_.ip_address.address_number().empty()) {
       net::HostPortPair::FromIPEndPoint(remote_address_.ip_address);
   } else {
     dest_host_port_pair.set_port(remote_address_.ip_address.port());
   }
   if (!remote_address_.hostname.empty())
     dest_host_port_pair.set_host(remote_address_.hostname);
 
   net::ClientSocketFactory* socket_factory =
       net::ClientSocketFactory::GetDefaultFactory();
   DCHECK(socket_factory);
@@ skipping 59 matching lines @@
   // GetPeerAddress returns ERR_NAME_NOT_RESOLVED if the socket is connected
   // through a proxy.
   result = socket_->GetPeerAddress(&remote_address);
   if (result < 0 && result != net::ERR_NAME_NOT_RESOLVED) {
     LOG(ERROR) << "P2PSocketHostTcpBase::OnConnected: unable to get peer"
                << " address: " << result;
     OnError();
     return false;
   }
 
-  if (!remote_address.address().empty()) {
+  if (!remote_address.address_number().empty()) {
     VLOG(1) << "Remote address: " << remote_address.ToString();
-    if (remote_address_.ip_address.address().empty()) {
+    if (remote_address_.ip_address.address_number().empty()) {
       // Save |remote_address| if address is empty.
       remote_address_.ip_address = remote_address;
     }
   } else {
     VLOG(1) << "Remote address is unknown since connection is proxied";
   }
 
   // If we are not doing TLS, we are ready to send data now.
   // In case of TLS SignalConnect will be sent only after TLS handshake is
   // successful. So no buffering will be done at socket handlers if any
@@ skipping 341 matching lines @@
   } else {
     packet_size += kTurnChannelDataHeaderSize;
     // Calculate any padding if present.
     if (packet_size % 4)
       *pad_bytes = 4 - packet_size % 4;
   }
   return packet_size;
 }
 
 }  // namespace content