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

net/base/ip_endpoint.cc

Index: net/base/ip_endpoint.cc
diff --git a/net/base/ip_endpoint.cc b/net/base/ip_endpoint.cc
index c88ae2ec723efa062e7722f39b0c6ebbe8ee6677..ab2969b6f0e967d5fc6784c33a7acc9924af833e 100644
--- a/net/base/ip_endpoint.cc
+++ b/net/base/ip_endpoint.cc
@@ -89,8 +89,7 @@ IPEndPoint::IPEndPoint(const IPAddressNumber& address, uint16_t port)
 }
 
 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 @@ IPEndPoint::IPEndPoint(const IPEndPoint& endpoint) {
 }
 
 AddressFamily IPEndPoint::GetFamily() const {
-  return GetAddressFamily(address_);
+  return GetAddressFamily(address_.bytes());
 }
 
 int IPEndPoint::GetSockAddrFamily() const {
@@ -126,7 +125,7 @@ bool IPEndPoint::ToSockAddr(struct sockaddr* address,
       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 @@ bool IPEndPoint::ToSockAddr(struct sockaddr* address,
       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,18 @@ bool IPEndPoint::FromSockAddr(const struct sockaddr* sock_addr,
     return false;
   }
 
-  address_.assign(address, address + address_len);
+  std::vector<uint8_t> ip_address(address, address + address_len);
+  address_ = net::IPAddress(ip_address);

[eroman, 2016/01/13 23:19:42]

There is already a constructor for this:
   address_ = net::IPAddress(address, address_len);

[martijnc, 2016/01/14 22:48:16]

Done.

   port_ = port;
   return true;
 }
 
 std::string IPEndPoint::ToString() const {
-  return IPAddressToStringWithPort(address_, port_);
+  return IPAddressToStringWithPort(address_.bytes(), port_);

[martijnc, 2016/01/13 22:49:31]

Would it be a good idea to add a IPAddress::ToStringWithPort(), that (for now)
would just forward the call to IPAddressToStringWithPort() (in a different CL)?

[eroman, 2016/01/13 23:19:42]

Is the pattern used in several other places? If it is just here I wouldn't worry
about it.

[martijnc, 2016/01/14 22:48:16]

No, limited usage. I'll skip this.

 }
 
 std::string IPEndPoint::ToStringWithoutPort() const {
-  return IPAddressToString(address_);
+  return address_.ToString();
 }
 
 bool IPEndPoint::operator<(const IPEndPoint& other) const {