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

net/dns/address_sorter_posix_unittest.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_posix.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "net/base/net_errors.h"
@@ skipping 55 matching lines @@
     NOTIMPLEMENTED();
     return ERR_NOT_IMPLEMENTED;
   }
   NetworkChangeNotifier::NetworkHandle GetBoundNetwork() const override {
     return NetworkChangeNotifier::kInvalidNetworkHandle;
   }
 
   int Connect(const IPEndPoint& remote) override {
     if (connected_)
       return ERR_UNEXPECTED;
-    AddressMapping::const_iterator it = mapping_->find(remote.address());
+    AddressMapping::const_iterator it = mapping_->find(remote.address_number());
     if (it == mapping_->end())
       return ERR_FAILED;
     connected_ = true;
     local_endpoint_ = IPEndPoint(it->second, 39874 /* arbitrary port */);
     return OK;
   }
 
   const BoundNetLog& NetLog() const override { return net_log_; }
 
  private:
@@ skipping 85 matching lines @@
 
     AddressList result;
     TestCompletionCallback callback;
     sorter_.Sort(list, base::Bind(&OnSortComplete, &result,
                                   callback.callback()));
     callback.WaitForResult();
 
     for (size_t i = 0; (i < result.size()) || (order[i] >= 0); ++i) {
       IPEndPoint expected = order[i] >= 0 ? list[order[i]] : IPEndPoint();
       IPEndPoint actual = i < result.size() ? result[i] : IPEndPoint();
-      EXPECT_TRUE(expected.address() == actual.address()) <<
-          "Address out of order at position " << i << "\n" <<
-          "  Actual: " << actual.ToStringWithoutPort() << "\n" <<
-          "Expected: " << expected.ToStringWithoutPort();
+      EXPECT_TRUE(expected.address_number() == actual.address_number())
+          << "Address out of order at position " << i << "\n"
+          << "  Actual: " << actual.ToStringWithoutPort() << "\n"
+          << "Expected: " << expected.ToStringWithoutPort();
     }
   }
 
   TestSocketFactory socket_factory_;
   AddressSorterPosix sorter_;
 };
 
 // Rule 1: Avoid unusable destinations.
 TEST_F(AddressSorterPosixTest, Rule1) {
   AddMapping("10.0.0.231", "10.0.0.1");
@@ skipping 126 matching lines @@
   AddMapping("4000::1", "4000::10");  // global unicast
   AddMapping("ff32::2", "fe81::20");  // deprecated link-local multicast
   GetSourceInfo("fe81::20")->deprecated = true;
   const char* const addresses[] = { "ff3e::1", "ff32::2", "4000::1", "ff32::1",
                                     "::1", "8.0.0.1", NULL };
   const int order[] = { 4, 3, 0, 2, 1, -1 };
   Verify(addresses, order);
 }
 
 }  // namespace net