net/socket/tcp_server_socket_unittest.cc - Issue 1376473003: Notify NQE of TCP RTT values

Unified Diff: net/socket/tcp_server_socket_unittest.cc

Issue 1376473003: Notify NQE of TCP RTT values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed rsleevi comments Created 4 years, 10 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..1df8e21f5f0686cb279ce8c8b67b091567375c72 100644

--- a/net/socket/tcp_server_socket_unittest.cc

+++ b/net/socket/tcp_server_socket_unittest.cc

@@ -78,8 +78,8 @@ TEST_F(TCPServerSocketTest, Accept) {

ASSERT_NO_FATAL_FAILURE(SetUpIPv4());

TestCompletionCallback connect_callback;

- TCPClientSocket connecting_socket(local_address_list(),

- NULL, NetLog::Source());

+ TCPClientSocket connecting_socket(local_address_list(), NULL, NULL,

+ NetLog::Source());

connecting_socket.Connect(connect_callback.callback());

TestCompletionCallback accept_callback;

@@ -109,8 +109,8 @@ TEST_F(TCPServerSocketTest, AcceptAsync) {

socket_.Accept(&accepted_socket, accept_callback.callback()));

TestCompletionCallback connect_callback;

- TCPClientSocket connecting_socket(local_address_list(),

- NULL, NetLog::Source());

+ TCPClientSocket connecting_socket(local_address_list(), NULL, NULL,

+ NetLog::Source());

connecting_socket.Connect(connect_callback.callback());

EXPECT_EQ(OK, connect_callback.WaitForResult());

@@ -134,13 +134,13 @@ TEST_F(TCPServerSocketTest, Accept2Connections) {

socket_.Accept(&accepted_socket, accept_callback.callback()));

TestCompletionCallback connect_callback;

- TCPClientSocket connecting_socket(local_address_list(),

- NULL, NetLog::Source());

+ TCPClientSocket connecting_socket(local_address_list(), NULL, NULL,

+ NetLog::Source());

connecting_socket.Connect(connect_callback.callback());

TestCompletionCallback connect_callback2;

- TCPClientSocket connecting_socket2(local_address_list(),

- NULL, NetLog::Source());

+ TCPClientSocket connecting_socket2(local_address_list(), NULL, NULL,

+ NetLog::Source());

connecting_socket2.Connect(connect_callback2.callback());

EXPECT_EQ(OK, accept_callback.WaitForResult());

@@ -171,8 +171,8 @@ TEST_F(TCPServerSocketTest, AcceptIPv6) {

return;

TestCompletionCallback connect_callback;

- TCPClientSocket connecting_socket(local_address_list(),

- NULL, NetLog::Source());

+ TCPClientSocket connecting_socket(local_address_list(), NULL, NULL,

+ NetLog::Source());

connecting_socket.Connect(connect_callback.callback());

TestCompletionCallback accept_callback;

@@ -195,8 +195,8 @@ TEST_F(TCPServerSocketTest, AcceptIO) {

ASSERT_NO_FATAL_FAILURE(SetUpIPv4());

TestCompletionCallback connect_callback;

- TCPClientSocket connecting_socket(local_address_list(),

- NULL, NetLog::Source());

+ TCPClientSocket connecting_socket(local_address_list(), NULL, NULL,

+ NetLog::Source());

connecting_socket.Connect(connect_callback.callback());

TestCompletionCallback accept_callback;

« net/base/socket_performance_watcher_factory.h ('K') | « net/socket/tcp_server_socket.cc ('k') | net/socket/tcp_socket_posix.h » ('j') | net/socket/tcp_socket_posix.cc » ('J')