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

net/dns/address_sorter_win.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/dns/address_sorter.h"
 
 #include <winsock2.h>
 
 #include <algorithm>
 
@@ skipping 40 matching lines @@
           output_buffer_(reinterpret_cast<SOCKET_ADDRESS_LIST*>(
               malloc(buffer_size_))),
           success_(false) {
       input_buffer_->iAddressCount = list.size();
       SOCKADDR_STORAGE* storage = reinterpret_cast<SOCKADDR_STORAGE*>(
           input_buffer_->Address + input_buffer_->iAddressCount);
 
       for (size_t i = 0; i < list.size(); ++i) {
         IPEndPoint ipe = list[i];
         // Addresses must be sockaddr_in6.
-        if (ipe.GetFamily() == AF_INET) {
+        if (ipe.GetFamily() == ADDRESS_FAMILY_IPV4) {
           ipe = IPEndPoint(ConvertIPv4NumberToIPv6Number(ipe.address()),
                            ipe.port());
         }
 
         struct sockaddr* addr = reinterpret_cast<struct sockaddr*>(storage + i);
         socklen_t addr_len = sizeof(SOCKADDR_STORAGE);
         bool result = ipe.ToSockAddr(addr, &addr_len);
         DCHECK(result);
         input_buffer_->Address[i].lpSockaddr = addr;
         input_buffer_->Address[i].iSockaddrLength = addr_len;
@@ skipping 86 matching lines @@
   AddressSorterWinXP() {}
   virtual ~AddressSorterWinXP() {}
 
   // AddressSorter:
   virtual void Sort(const AddressList& list,
                     const CallbackType& callback) const OVERRIDE {
     AddressList list_ipv4;
     AddressList list_ipv6;
     for (size_t i = 0; i < list.size(); ++i) {
       const IPEndPoint& ipe = list[i];
-      if (ipe.GetFamily() == AF_INET) {
+      if (ipe.GetFamily() == ADDRESS_FAMILY_IPV4) {
         list_ipv4.push_back(ipe);
       } else {
         list_ipv6.push_back(ipe);
       }
     }
     if (!list_ipv6.empty()) {
       sorter_.Sort(list_ipv6, base::Bind(&MergeResults, callback, list_ipv4));
     } else {
       NOTREACHED() << "Should not be called with IPv4-only addresses.";
       callback.Run(true, list);
@@ skipping 10 matching lines @@
 
 // static
 scoped_ptr<AddressSorter> AddressSorter::CreateAddressSorter() {
   if (base::win::GetVersion() < base::win::VERSION_VISTA)
     return scoped_ptr<AddressSorter>(new AddressSorterWinXP());
   return scoped_ptr<AddressSorter>(new AddressSorterWin());
 }
 
 }  // namespace net