Add IPAddress class as a replacement for the IPAddressNumber typedef.

net/base/ip_endpoint.h

 // 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.
 
 #ifndef NET_BASE_IP_ENDPOINT_H_
 #define NET_BASE_IP_ENDPOINT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "net/base/address_family.h"
+#include "net/base/ip_address.h"
 #include "net/base/ip_address_number.h"
 #include "net/base/net_export.h"
 #include "net/base/sys_addrinfo.h"
 
 struct sockaddr;
 
 namespace net {
 
 // An IPEndPoint represents the address of a transport endpoint:
 //  * IP address (either v4 or v6)
 //  * Port
 class NET_EXPORT IPEndPoint {
  public:
   IPEndPoint();
   ~IPEndPoint();
   IPEndPoint(const IPAddressNumber& address, uint16_t port);
+  IPEndPoint(const IPAddress& address, uint16_t port);
   IPEndPoint(const IPEndPoint& endpoint);
 
-  const IPAddressNumber& address() const { return address_; }
+  // TODO(Martijnc): Remove the old version when all consumers are moved to
+  // IPAddress. https://crbug.com/496258
+  const IPAddressNumber& address() const { return address_.ip_address_; }
+  const IPAddress& addressNew() const { return address_; }
   uint16_t port() const { return port_; }
 
   // Returns AddressFamily of the address.
   AddressFamily GetFamily() const;
 
   // Returns the sockaddr family of the address, AF_INET or AF_INET6.
   int GetSockAddrFamily() const;
 
   // Convert to a provided sockaddr struct.
   // |address| is the sockaddr to copy into.  Should be at least
@@ skipping 16 matching lines @@
   // valid.
   std::string ToString() const;
 
   // As above, but without port.
   std::string ToStringWithoutPort() const;
 
   bool operator<(const IPEndPoint& that) const;
   bool operator==(const IPEndPoint& that) const;
 
  private:
-  IPAddressNumber address_;
+  IPAddress address_;
   uint16_t port_;
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_IP_ENDPOINT_H_