commit 98acb9b5250fac2902aff41afa71496da5cf26cd
author martijn <martijn@martijnc.be> Wed Jan 27 07:14:07 2016
committer Commit bot <commit-bot@chromium.org> Wed Jan 27 07:14:58 2016
tree 1a70d9dda19a59065a90676b74df0183cf93b286
parent 8d602e01c880ab6ca1e70b53aa1881fcc43d7627

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

This CL is part of the net::IPAddressNumber migration[1].

IPEndpoint::address() currently returns a net::IPAddressNumber but we need it to return a net::IPAddress.

BUG=496258
TBR=scheib

[1] https://code.google.com/p/chromium/issues/detail?id=496258#c10

Review URL: https://codereview.chromium.org/1565303002

Cr-Commit-Position: refs/heads/master@{#371750}

net/base/ip_endpoint.cc

diff --git a/net/base/ip_endpoint.cc b/net/base/ip_endpoint.cc
index c88ae2e..df0cb56 100644
--- a/net/base/ip_endpoint.cc
+++ b/net/base/ip_endpoint.cc
@@ -89,8 +89,7 @@
 }
 
 IPEndPoint::IPEndPoint(const IPAddress& address, uint16_t port)
-    : address_(address.bytes()), port_(port) {
-}
+    : address_(address), port_(port) {}
 
 IPEndPoint::IPEndPoint(const IPEndPoint& endpoint) {
   address_ = endpoint.address_;
@@ -98,7 +97,7 @@
 }
 
 AddressFamily IPEndPoint::GetFamily() const {
-  return GetAddressFamily(address_);
+  return GetAddressFamily(address_.bytes());
 }
 
 int IPEndPoint::GetSockAddrFamily() const {
@@ -126,7 +125,7 @@
       memset(addr, 0, sizeof(struct sockaddr_in));
       addr->sin_family = AF_INET;
       addr->sin_port = base::HostToNet16(port_);
-      memcpy(&addr->sin_addr, &address_[0], kIPv4AddressSize);
+      memcpy(&addr->sin_addr, &address_.bytes()[0], kIPv4AddressSize);
       break;
     }
     case kIPv6AddressSize: {
@@ -138,7 +137,7 @@
       memset(addr6, 0, sizeof(struct sockaddr_in6));
       addr6->sin6_family = AF_INET6;
       addr6->sin6_port = base::HostToNet16(port_);
-      memcpy(&addr6->sin6_addr, &address_[0], kIPv6AddressSize);
+      memcpy(&addr6->sin6_addr, &address_.bytes()[0], kIPv6AddressSize);
       break;
     }
     default:
@@ -159,17 +158,17 @@
     return false;
   }
 
-  address_.assign(address, address + address_len);
+  address_ = net::IPAddress(address, address_len);
   port_ = port;
   return true;
 }
 
 std::string IPEndPoint::ToString() const {
-  return IPAddressToStringWithPort(address_, port_);
+  return IPAddressToStringWithPort(address_.bytes(), port_);
 }
 
 std::string IPEndPoint::ToStringWithoutPort() const {
-  return IPAddressToString(address_);
+  return address_.ToString();
 }
 
 bool IPEndPoint::operator<(const IPEndPoint& other) const {