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

Unified Diff: net/socket/tcp_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_socket_unittest.cc
diff --git a/net/socket/tcp_socket_unittest.cc b/net/socket/tcp_socket_unittest.cc
index ade3ee7fd8d83ea6985cca84d40554cbaac2df5b..16a8747d3511cdf4a22bfad4705c582fe4023d34 100644
--- a/net/socket/tcp_socket_unittest.cc
+++ b/net/socket/tcp_socket_unittest.cc
@@ -28,8 +28,7 @@ const int kListenBacklog = 5;
class TCPSocketTest : public PlatformTest {
protected:
- TCPSocketTest() : socket_(NULL, NetLog::Source()) {
- }
+ TCPSocketTest() : socket_(NULL, NULL, NetLog::Source()) {}
void SetUpListenIPv4() {
IPEndPoint address;
@@ -76,8 +75,8 @@ class TCPSocketTest : public PlatformTest {
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());
@@ -104,8 +103,8 @@ TEST_F(TCPSocketTest, Accept) {
TestCompletionCallback connect_callback;
// TODO(yzshen): Switch to use TCPSocket when it supports client socket
// operations.
- 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;
@@ -164,13 +163,13 @@ TEST_F(TCPSocketTest, Accept2Connections) {
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());
@@ -204,8 +203,8 @@ TEST_F(TCPSocketTest, 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;
@@ -229,7 +228,7 @@ TEST_F(TCPSocketTest, ReadWrite) {
ASSERT_NO_FATAL_FAILURE(SetUpListenIPv4());
TestCompletionCallback connect_callback;
- TCPSocket connecting_socket(NULL, NetLog::Source());
+ TCPSocket connecting_socket(NULL, NULL, NetLog::Source());
int result = connecting_socket.Open(ADDRESS_FAMILY_IPV4);
ASSERT_EQ(OK, result);
connecting_socket.Connect(local_address_, connect_callback.callback());

Powered by Google App Engine
This is Rietveld 408576698