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

net/socket/tcp_client_socket_libevent.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 "net/socket/tcp_client_socket.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <sys/socket.h>
@@ skipping 163 matching lines @@
     // Cannot bind the socket if we are already bound connected or
     // connecting.
     return ERR_UNEXPECTED;
   }
 
   SockaddrStorage storage;
   if (!address.ToSockAddr(storage.addr, &storage.addr_len))
     return ERR_INVALID_ARGUMENT;
 
   // Create |bound_socket_| and try to bind it to |address|.
-  int error = CreateSocket(address.GetFamily(), &bound_socket_);
+  int error = CreateSocket(address.GetSockAddrFamily(), &bound_socket_);
   if (error)
     return MapSystemError(error);
 
   if (HANDLE_EINTR(bind(bound_socket_, storage.addr, storage.addr_len))) {
     error = errno;
     if (HANDLE_EINTR(close(bound_socket_)) < 0)
       PLOG(ERROR) << "close";
     bound_socket_ = kInvalidSocket;
     return MapSystemError(error);
   }
@@ skipping 76 matching lines @@
                       CreateNetLogIPEndPointCallback(&endpoint));
 
   next_connect_state_ = CONNECT_STATE_CONNECT_COMPLETE;
 
   if (bound_socket_ != kInvalidSocket) {
     DCHECK(bind_address_.get());
     socket_ = bound_socket_;
     bound_socket_ = kInvalidSocket;
   } else {
     // Create a non-blocking socket.
-    connect_os_error_ = CreateSocket(endpoint.GetFamily(), &socket_);
+    connect_os_error_ = CreateSocket(endpoint.GetSockAddrFamily(), &socket_);
     if (connect_os_error_)
       return MapSystemError(connect_os_error_);
 
     if (bind_address_.get()) {
       SockaddrStorage storage;
       if (!bind_address_->ToSockAddr(storage.addr, &storage.addr_len))
         return ERR_INVALID_ARGUMENT;
       if (HANDLE_EINTR(bind(socket_, storage.addr, storage.addr_len)))
         return MapSystemError(errno);
     }
@@ skipping 491 matching lines @@
 
 NextProto TCPClientSocketLibevent::GetNegotiatedProtocol() const {
   return kProtoUnknown;
 }
 
 bool TCPClientSocketLibevent::GetSSLInfo(SSLInfo* ssl_info) {
   return false;
 }
 
 }  // namespace net