Change IPEndpoint::address() to return a net::IPAddress

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 263 matching lines @@
              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() == ADDRESS_FAMILY_IPV4)) {
         have_ipv4 = true;
-        (*hosts)[DnsHostsKey(localname, ADDRESS_FAMILY_IPV4)] = ipe.address();
+        (*hosts)[DnsHostsKey(localname, ADDRESS_FAMILY_IPV4)] =
+            ipe.address_number();
       } else if (!have_ipv6 && (ipe.GetFamily() == ADDRESS_FAMILY_IPV6)) {
         have_ipv6 = true;
-        (*hosts)[DnsHostsKey(localname, ADDRESS_FAMILY_IPV6)] = ipe.address();
+        (*hosts)[DnsHostsKey(localname, ADDRESS_FAMILY_IPV6)] =
+            ipe.address_number();
       }
     }
   }
   return HOSTS_PARSE_WIN_OK;
 }
 
 // Watches a single registry key for changes.
 class RegistryWatcher : public base::NonThreadSafe {
  public:
   typedef base::Callback<void(bool succeeded)> CallbackType;
@@ skipping 208 matching lines @@
     if (adapter->IfType == IF_TYPE_SOFTWARE_LOOPBACK)
       continue;
 
     for (const IP_ADAPTER_DNS_SERVER_ADDRESS* address =
              adapter->FirstDnsServerAddress;
          address != NULL;
          address = address->Next) {
       IPEndPoint ipe;
       if (ipe.FromSockAddr(address->Address.lpSockaddr,
                            address->Address.iSockaddrLength)) {
-        if (IsStatelessDiscoveryAddress(ipe.address()))
+        if (IsStatelessDiscoveryAddress(ipe.address_number()))
           continue;
         // Override unset port.
         if (!ipe.port())
-          ipe = IPEndPoint(ipe.address(), dns_protocol::kDefaultPort);
+          ipe = IPEndPoint(ipe.address_number(), dns_protocol::kDefaultPort);
         config->nameservers.push_back(ipe);
       } else {
         return CONFIG_PARSE_WIN_BAD_ADDRESS;
       }
     }
 
     // IP_ADAPTER_ADDRESSES in Vista+ has a search list at |FirstDnsSuffix|,
     // but it came up empty in all trials.
     // |DnsSuffix| stores the effective connection-specific suffix, which is
     // obtained via DHCP (regkey: Tcpip\Parameters\Interfaces\{XXX}\DhcpDomain)
@@ skipping 247 matching lines @@
 }
 
 }  // namespace internal
 
 // static
 scoped_ptr<DnsConfigService> DnsConfigService::CreateSystemService() {
   return scoped_ptr<DnsConfigService>(new internal::DnsConfigServiceWin());
 }
 
 }  // namespace net