Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Unified Diff: net/socket/tcp_server_socket_unittest.cc

Issue 1565303002: Change IPEndpoint::address() to return a net::IPAddress (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Android Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/socket/tcp_server_socket_unittest.cc
diff --git a/net/socket/tcp_server_socket_unittest.cc b/net/socket/tcp_server_socket_unittest.cc
index 133c807318895817ed37b9ad236c134f81ff2052..354d5e8c00c5e19d3a658d9c361eccdcd2c02e9d 100644
--- a/net/socket/tcp_server_socket_unittest.cc
+++ b/net/socket/tcp_server_socket_unittest.cc
@@ -92,8 +92,8 @@ TEST_F(TCPServerSocketTest, Accept) {
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());
}
@@ -119,8 +119,8 @@ TEST_F(TCPServerSocketTest, AcceptAsync) {
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.
@@ -158,10 +158,10 @@ TEST_F(TCPServerSocketTest, Accept2Connections) {
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) {
@@ -185,8 +185,8 @@ TEST_F(TCPServerSocketTest, AcceptIPv6) {
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());
}
@@ -207,8 +207,8 @@ TEST_F(TCPServerSocketTest, AcceptIO) {
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());

Powered by Google App Engine
This is Rietveld 408576698