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

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 42 matching lines @@
               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() == ADDRESS_FAMILY_IPV4) {
-          ipe = IPEndPoint(ConvertIPv4NumberToIPv6Number(ipe.address()),
+          ipe = IPEndPoint(ConvertIPv4NumberToIPv6Number(ipe.address().bytes()),
                            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 35 matching lines @@
       if (success_) {
         list.reserve(output_buffer_->iAddressCount);
         for (int i = 0; i < output_buffer_->iAddressCount; ++i) {
           IPEndPoint ipe;
           bool result =
               ipe.FromSockAddr(output_buffer_->Address[i].lpSockaddr,
                                output_buffer_->Address[i].iSockaddrLength);
           DCHECK(result) << "Unable to roundtrip between IPEndPoint and "
                          << "SOCKET_ADDRESS!";
           // Unmap V4MAPPED IPv6 addresses so that Happy Eyeballs works.
-          if (IsIPv4Mapped(ipe.address())) {
-            ipe = IPEndPoint(ConvertIPv4MappedToIPv4(ipe.address()),
-                                                     ipe.port());
+          if (IsIPv4Mapped(ipe.address().bytes())) {
+            ipe = IPEndPoint(ConvertIPv4MappedToIPv4(ipe.address().bytes()),
+                             ipe.port());
           }
           list.push_back(ipe);
         }
       }
       callback_.Run(success_, list);
     }
 
     const CallbackType callback_;
     const size_t buffer_size_;
     scoped_ptr<SOCKET_ADDRESS_LIST, base::FreeDeleter> input_buffer_;
@@ skipping 61 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