[net] Make IPEndPoint::GetFamily() return AddressFamily and add GetSockAddrFamily() to be used when…

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/net_export.h"
 #include "net/base/net_util.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();
   virtual ~IPEndPoint();
   IPEndPoint(const IPAddressNumber& address, int port);
   IPEndPoint(const IPEndPoint& endpoint);
 
   const IPAddressNumber& address() const { return address_; }
   int port() const { return port_; }
 
-  // Returns AF_INET or AF_INET6 depending on the type of the address.
-  int GetFamily() const;
+  // 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
   //    sizeof(struct sockaddr_storage) bytes.
   // |address_length| is an input/output parameter.  On input, it is the
   //    size of data in |address| available.  On output, it is the size of
   //    the address that was copied into |address|.
   // Returns true on success, false on failure.
   bool ToSockAddr(struct sockaddr* address, socklen_t* address_length) const
       WARN_UNUSED_RESULT;
@@ skipping 17 matching lines @@
   bool operator==(const IPEndPoint& that) const;
 
  private:
   IPAddressNumber address_;
   int port_;
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_IP_ENDPOINT_H_