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

net/base/ip_endpoint_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/base/ip_endpoint.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <winsock2.h>
@@ skipping 63 matching lines @@
   }
 };
 
 TEST_F(IPEndPointTest, Constructor) {
   IPEndPoint endpoint;
   EXPECT_EQ(0, endpoint.port());
 
   for (uint16_t index = 0; index < test_count; ++index) {
     IPEndPoint endpoint(tests[index].ip_address, 80);
     EXPECT_EQ(80, endpoint.port());
-    EXPECT_EQ(tests[index].ip_address, endpoint.address());
+    EXPECT_EQ(tests[index].ip_address, endpoint.address_number());
   }
 }
 
 TEST_F(IPEndPointTest, Assignment) {
   for (uint16_t index = 0; index < test_count; ++index) {
     IPEndPoint src(tests[index].ip_address, index);
     IPEndPoint dest = src;
 
     EXPECT_EQ(src.port(), dest.port());
-    EXPECT_EQ(src.address(), dest.address());
+    EXPECT_EQ(src.address_number(), dest.address_number());
   }
 }
 
 TEST_F(IPEndPointTest, Copy) {
   for (uint16_t index = 0; index < test_count; ++index) {
     IPEndPoint src(tests[index].ip_address, index);
     IPEndPoint dest(src);
 
     EXPECT_EQ(src.port(), dest.port());
-    EXPECT_EQ(src.address(), dest.address());
+    EXPECT_EQ(src.address_number(), dest.address_number());
   }
 }
 
 TEST_F(IPEndPointTest, ToFromSockAddr) {
   for (uint16_t index = 0; index < test_count; ++index) {
     IPEndPoint ip_endpoint(tests[index].ip_address, index);
 
     // Convert to a sockaddr.
     SockaddrStorage storage;
     EXPECT_TRUE(ip_endpoint.ToSockAddr(storage.addr, &storage.addr_len));
 
     // Basic verification.
     socklen_t expected_size = tests[index].ipv6 ?
         sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in);
     EXPECT_EQ(expected_size, storage.addr_len);
     EXPECT_EQ(ip_endpoint.port(), GetPortFromSockaddr(storage.addr,
                                                       storage.addr_len));
 
     // And convert back to an IPEndPoint.
     IPEndPoint ip_endpoint2;
     EXPECT_TRUE(ip_endpoint2.FromSockAddr(storage.addr, storage.addr_len));
     EXPECT_EQ(ip_endpoint.port(), ip_endpoint2.port());
-    EXPECT_EQ(ip_endpoint.address(), ip_endpoint2.address());
+    EXPECT_EQ(ip_endpoint.address_number(), ip_endpoint2.address_number());
   }
 }
 
 TEST_F(IPEndPointTest, ToSockAddrBufTooSmall) {
   for (uint16_t index = 0; index < test_count; ++index) {
     IPEndPoint ip_endpoint(tests[index].ip_address, index);
 
     SockaddrStorage storage;
     storage.addr_len = index;  // size is too small!
     EXPECT_FALSE(ip_endpoint.ToSockAddr(storage.addr, &storage.addr_len));
@@ skipping 58 matching lines @@
     IPEndPoint endpoint(tests[index].ip_address, port);
     const std::string result = endpoint.ToString();
     EXPECT_EQ(tests[index].host_normalized + ":" + base::UintToString(port),
               result);
   }
 }
 
 }  // namespace
 
 }  // namespace net