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

net/dns/dns_config_service_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/dns_config_service_win.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 244 matching lines @@
 
     for (const IP_ADAPTER_UNICAST_ADDRESS* address =
              adapter->FirstUnicastAddress;
          address != NULL;
          address = address->Next) {
       IPEndPoint ipe;
       if (!ipe.FromSockAddr(address->Address.lpSockaddr,
                             address->Address.iSockaddrLength)) {
         return HOSTS_PARSE_WIN_BAD_ADDRESS;
       }
-      if (!have_ipv4 && (ipe.GetFamily() == AF_INET)) {
+      if (!have_ipv4 && (ipe.GetFamily() == ADDRESS_FAMILY_IPV4)) {
         have_ipv4 = true;
         (*hosts)[DnsHostsKey(localname, ADDRESS_FAMILY_IPV4)] = ipe.address();
-      } else if (!have_ipv6 && (ipe.GetFamily() == AF_INET6)) {
+      } else if (!have_ipv6 && (ipe.GetFamily() == ADDRESS_FAMILY_IPV6)) {
         have_ipv6 = true;
         (*hosts)[DnsHostsKey(localname, ADDRESS_FAMILY_IPV6)] = ipe.address();
       }
     }
   }
   return HOSTS_PARSE_WIN_OK;
 }
 
 // Watches a single registry key for changes.
 class RegistryWatcher : public base::win::ObjectWatcher::Delegate,
@@ skipping 417 matching lines @@
 }
 
 }  // namespace internal
 
 // static
 scoped_ptr<DnsConfigService> DnsConfigService::CreateSystemService() {
   return scoped_ptr<DnsConfigService>(new internal::DnsConfigServiceWin());
 }
 
 }  // namespace net