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

net/socket/tcp_server_socket_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/socket/tcp_server_socket.h"
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
@@ skipping 74 matching lines @@
   TestCompletionCallback accept_callback;
   scoped_ptr<StreamSocket> accepted_socket;
   int result = socket_.Accept(&accepted_socket, accept_callback.callback());
   if (result == ERR_IO_PENDING)
     result = accept_callback.WaitForResult();
   ASSERT_EQ(OK, result);
 
   ASSERT_TRUE(accepted_socket.get() != NULL);
 
   // Both sockets should be on the loopback network interface.
-  EXPECT_EQ(GetPeerAddress(accepted_socket.get()).address(),
-            local_address_.address());
+  EXPECT_EQ(GetPeerAddress(accepted_socket.get()).address_number(),
+            local_address_.address_number());
 
   EXPECT_EQ(OK, connect_callback.WaitForResult());
 }
 
 // Test Accept() callback.
 TEST_F(TCPServerSocketTest, AcceptAsync) {
   ASSERT_NO_FATAL_FAILURE(SetUpIPv4());
 
   TestCompletionCallback accept_callback;
   scoped_ptr<StreamSocket> accepted_socket;
 
   ASSERT_EQ(ERR_IO_PENDING,
             socket_.Accept(&accepted_socket, accept_callback.callback()));
 
   TestCompletionCallback connect_callback;
   TCPClientSocket connecting_socket(local_address_list(),
                                     NULL, NetLog::Source());
   connecting_socket.Connect(connect_callback.callback());
 
   EXPECT_EQ(OK, connect_callback.WaitForResult());
   EXPECT_EQ(OK, accept_callback.WaitForResult());
 
   EXPECT_TRUE(accepted_socket != NULL);
 
   // Both sockets should be on the loopback network interface.
-  EXPECT_EQ(GetPeerAddress(accepted_socket.get()).address(),
-            local_address_.address());
+  EXPECT_EQ(GetPeerAddress(accepted_socket.get()).address_number(),
+            local_address_.address_number());
 }
 
 // Accept two connections simultaneously.
 TEST_F(TCPServerSocketTest, Accept2Connections) {
   ASSERT_NO_FATAL_FAILURE(SetUpIPv4());
 
   TestCompletionCallback accept_callback;
   scoped_ptr<StreamSocket> accepted_socket;
 
   ASSERT_EQ(ERR_IO_PENDING,
@@ skipping 17 matching lines @@
   if (result == ERR_IO_PENDING)
     result = accept_callback2.WaitForResult();
   ASSERT_EQ(OK, result);
 
   EXPECT_EQ(OK, connect_callback.WaitForResult());
 
   EXPECT_TRUE(accepted_socket != NULL);
   EXPECT_TRUE(accepted_socket2 != NULL);
   EXPECT_NE(accepted_socket.get(), accepted_socket2.get());
 
-  EXPECT_EQ(GetPeerAddress(accepted_socket.get()).address(),
-            local_address_.address());
-  EXPECT_EQ(GetPeerAddress(accepted_socket2.get()).address(),
-            local_address_.address());
+  EXPECT_EQ(GetPeerAddress(accepted_socket.get()).address_number(),
+            local_address_.address_number());
+  EXPECT_EQ(GetPeerAddress(accepted_socket2.get()).address_number(),
+            local_address_.address_number());
 }
 
 TEST_F(TCPServerSocketTest, AcceptIPv6) {
   bool initialized = false;
   ASSERT_NO_FATAL_FAILURE(SetUpIPv6(&initialized));
   if (!initialized)
     return;
 
   TestCompletionCallback connect_callback;
   TCPClientSocket connecting_socket(local_address_list(),
                                     NULL, NetLog::Source());
   connecting_socket.Connect(connect_callback.callback());
 
   TestCompletionCallback accept_callback;
   scoped_ptr<StreamSocket> accepted_socket;
   int result = socket_.Accept(&accepted_socket, accept_callback.callback());
   if (result == ERR_IO_PENDING)
     result = accept_callback.WaitForResult();
   ASSERT_EQ(OK, result);
 
   ASSERT_TRUE(accepted_socket.get() != NULL);
 
   // Both sockets should be on the loopback network interface.
-  EXPECT_EQ(GetPeerAddress(accepted_socket.get()).address(),
-            local_address_.address());
+  EXPECT_EQ(GetPeerAddress(accepted_socket.get()).address_number(),
+            local_address_.address_number());
 
   EXPECT_EQ(OK, connect_callback.WaitForResult());
 }
 
 TEST_F(TCPServerSocketTest, AcceptIO) {
   ASSERT_NO_FATAL_FAILURE(SetUpIPv4());
 
   TestCompletionCallback connect_callback;
   TCPClientSocket connecting_socket(local_address_list(),
                                     NULL, NetLog::Source());
   connecting_socket.Connect(connect_callback.callback());
 
   TestCompletionCallback accept_callback;
   scoped_ptr<StreamSocket> accepted_socket;
   int result = socket_.Accept(&accepted_socket, accept_callback.callback());
   ASSERT_EQ(OK, accept_callback.GetResult(result));
 
   ASSERT_TRUE(accepted_socket.get() != NULL);
 
   // Both sockets should be on the loopback network interface.
-  EXPECT_EQ(GetPeerAddress(accepted_socket.get()).address(),
-            local_address_.address());
+  EXPECT_EQ(GetPeerAddress(accepted_socket.get()).address_number(),
+            local_address_.address_number());
 
   EXPECT_EQ(OK, connect_callback.WaitForResult());
 
   const std::string message("test message");
   std::vector<char> buffer(message.size());
 
   size_t bytes_written = 0;
   while (bytes_written < message.size()) {
     scoped_refptr<IOBufferWithSize> write_buffer(
         new IOBufferWithSize(message.size() - bytes_written));
@@ skipping 22 matching lines @@
     bytes_read += read_result;
   }
 
   std::string received_message(buffer.begin(), buffer.end());
   ASSERT_EQ(message, received_message);
 }
 
 }  // namespace
 
 }  // namespace net