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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/ssl_client_socket_unittest.cc

Issue 1376473003: Notify NQE of TCP RTT values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More plumbing 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
« net/socket/client_socket_factory.h ('K') | « net/socket/socks_client_socket_pool_unittest.cc ('k') | net/socket/tcp_client_socket.h » ('j') | net/socket/tcp_socket_posix.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_unittest.cc
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index ba92459763e5bd7483d319e36d3aca76b708bc13..e3469822d35203384c2f5a56e8b5abffb20f7d54 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -776,7 +776,7 @@ class SSLClientSocketTest : public PlatformTest {
bool CreateAndConnectSSLClientSocket(const SSLConfig& ssl_config,
int* result) {
scoped_ptr<StreamSocket> transport(
- new TCPClientSocket(addr_, &log_, NetLog::Source()));
+ new TCPClientSocket(addr_, NULL, &log_, NetLog::Source()));
int rv = callback_.GetResult(transport->Connect(callback_.callback()));
if (rv != OK) {
LOG(ERROR) << "Could not connect to SpawnedTestServer";
@@ -839,7 +839,7 @@ class SSLClientSocketCertRequestInfoTest : public SSLClientSocketTest {
TestCompletionCallback callback;
TestNetLog log;
scoped_ptr<StreamSocket> transport(
- new TCPClientSocket(addr, &log, NetLog::Source()));
+ new TCPClientSocket(addr, NULL, &log, NetLog::Source()));
int rv = callback.GetResult(transport->Connect(callback.callback()));
EXPECT_EQ(OK, rv);
@@ -885,7 +885,7 @@ class SSLClientSocketFalseStartTest : public SSLClientSocketTest {
CHECK(spawned_test_server());
scoped_ptr<StreamSocket> real_transport(
- new TCPClientSocket(addr(), NULL, NetLog::Source()));
+ new TCPClientSocket(addr(), NULL, NULL, NetLog::Source()));
scoped_ptr<FakeBlockingStreamSocket> transport(
new FakeBlockingStreamSocket(std::move(real_transport)));
int rv = callback->GetResult(transport->Connect(callback->callback()));
@@ -1004,7 +1004,7 @@ TEST_F(SSLClientSocketTest, Connect) {
TestCompletionCallback callback;
TestNetLog log;
scoped_ptr<StreamSocket> transport(
- new TCPClientSocket(addr(), &log, NetLog::Source()));
+ new TCPClientSocket(addr(), NULL, &log, NetLog::Source()));
int rv = callback.GetResult(transport->Connect(callback.callback()));
EXPECT_EQ(OK, rv);
@@ -1150,7 +1150,7 @@ TEST_F(SSLClientSocketTest, Read) {
TestCompletionCallback callback;
scoped_ptr<StreamSocket> transport(
- new TCPClientSocket(addr(), NULL, NetLog::Source()));
+ new TCPClientSocket(addr(), NULL, NULL, NetLog::Source()));
EXPECT_EQ(0, transport->GetTotalReceivedBytes());
int rv = callback.GetResult(transport->Connect(callback.callback()));
@@ -1207,7 +1207,7 @@ TEST_F(SSLClientSocketTest, Connect_WithSynchronousError) {
TestCompletionCallback callback;
scoped_ptr<StreamSocket> real_transport(
- new TCPClientSocket(addr(), NULL, NetLog::Source()));
+ new TCPClientSocket(addr(), NULL, NULL, NetLog::Source()));
scoped_ptr<SynchronousErrorStreamSocket> transport(
new SynchronousErrorStreamSocket(std::move(real_transport)));
int rv = callback.GetResult(transport->Connect(callback.callback()));
@@ -1238,7 +1238,7 @@ TEST_F(SSLClientSocketTest, Read_WithSynchronousError) {
TestCompletionCallback callback;
scoped_ptr<StreamSocket> real_transport(
- new TCPClientSocket(addr(), NULL, NetLog::Source()));
+ new TCPClientSocket(addr(), NULL, NULL, NetLog::Source()));
scoped_ptr<SynchronousErrorStreamSocket> transport(
new SynchronousErrorStreamSocket(std::move(real_transport)));
int rv = callback.GetResult(transport->Connect(callback.callback()));
@@ -1288,7 +1288,7 @@ TEST_F(SSLClientSocketTest, Write_WithSynchronousError) {
TestCompletionCallback callback;
scoped_ptr<StreamSocket> real_transport(
- new TCPClientSocket(addr(), NULL, NetLog::Source()));
+ new TCPClientSocket(addr(), NULL, NULL, NetLog::Source()));
// Note: |error_socket|'s ownership is handed to |transport|, but a pointer
// is retained in order to configure additional errors.
scoped_ptr<SynchronousErrorStreamSocket> error_socket(
@@ -1355,7 +1355,7 @@ TEST_F(SSLClientSocketTest, Write_WithSynchronousErrorNoRead) {
TestCompletionCallback callback;
scoped_ptr<StreamSocket> real_transport(
- new TCPClientSocket(addr(), NULL, NetLog::Source()));
+ new TCPClientSocket(addr(), NULL, NULL, NetLog::Source()));
// Note: intermediate sockets' ownership are handed to |sock|, but a pointer
// is retained in order to query them.
scoped_ptr<SynchronousErrorStreamSocket> error_socket(
@@ -1455,7 +1455,7 @@ TEST_F(SSLClientSocketTest, Read_DeleteWhilePendingFullDuplex) {
TestCompletionCallback callback;
scoped_ptr<StreamSocket> real_transport(
- new TCPClientSocket(addr(), NULL, NetLog::Source()));
+ new TCPClientSocket(addr(), NULL, NULL, NetLog::Source()));
// Note: |error_socket|'s ownership is handed to |transport|, but a pointer
// is retained in order to configure additional errors.
scoped_ptr<SynchronousErrorStreamSocket> error_socket(
@@ -1564,7 +1564,7 @@ TEST_F(SSLClientSocketTest, Read_WithWriteError) {
TestCompletionCallback callback;
scoped_ptr<StreamSocket> real_transport(
- new TCPClientSocket(addr(), NULL, NetLog::Source()));
+ new TCPClientSocket(addr(), NULL, NULL, NetLog::Source()));
// Note: |error_socket|'s ownership is handed to |transport|, but a pointer
// is retained in order to configure additional errors.
scoped_ptr<SynchronousErrorStreamSocket> error_socket(
@@ -1661,7 +1661,7 @@ TEST_F(SSLClientSocketTest, Connect_WithZeroReturn) {
TestCompletionCallback callback;
scoped_ptr<StreamSocket> real_transport(
- new TCPClientSocket(addr(), NULL, NetLog::Source()));
+ new TCPClientSocket(addr(), NULL, NULL, NetLog::Source()));
scoped_ptr<SynchronousErrorStreamSocket> transport(
new SynchronousErrorStreamSocket(std::move(real_transport)));
int rv = callback.GetResult(transport->Connect(callback.callback()));
@@ -1687,7 +1687,7 @@ TEST_F(SSLClientSocketTest, Read_WithZeroReturn) {
TestCompletionCallback callback;
scoped_ptr<StreamSocket> real_transport(
- new TCPClientSocket(addr(), NULL, NetLog::Source()));
+ new TCPClientSocket(addr(), NULL, NULL, NetLog::Source()));
scoped_ptr<SynchronousErrorStreamSocket> transport(
new SynchronousErrorStreamSocket(std::move(real_transport)));
int rv = callback.GetResult(transport->Connect(callback.callback()));
@@ -1720,7 +1720,7 @@ TEST_F(SSLClientSocketTest, Read_WithAsyncZeroReturn) {
TestCompletionCallback callback;
scoped_ptr<StreamSocket> real_transport(
- new TCPClientSocket(addr(), NULL, NetLog::Source()));
+ new TCPClientSocket(addr(), NULL, NULL, NetLog::Source()));
scoped_ptr<SynchronousErrorStreamSocket> error_socket(
new SynchronousErrorStreamSocket(std::move(real_transport)));
SynchronousErrorStreamSocket* raw_error_socket = error_socket.get();
@@ -1801,7 +1801,7 @@ TEST_F(SSLClientSocketTest, Read_ManySmallRecords) {
TestCompletionCallback callback;
scoped_ptr<StreamSocket> real_transport(
- new TCPClientSocket(addr(), NULL, NetLog::Source()));
+ new TCPClientSocket(addr(), NULL, NULL, NetLog::Source()));
scoped_ptr<ReadBufferingStreamSocket> transport(
new ReadBufferingStreamSocket(std::move(real_transport)));
ReadBufferingStreamSocket* raw_transport = transport.get();
@@ -1872,7 +1872,7 @@ TEST_F(SSLClientSocketTest, Read_FullLogging) {
TestNetLog log;
log.SetCaptureMode(NetLogCaptureMode::IncludeSocketBytes());
scoped_ptr<StreamSocket> transport(
- new TCPClientSocket(addr(), &log, NetLog::Source()));
+ new TCPClientSocket(addr(), NULL, &log, NetLog::Source()));
int rv = callback.GetResult(transport->Connect(callback.callback()));
EXPECT_EQ(OK, rv);
@@ -1986,7 +1986,7 @@ TEST_F(SSLClientSocketTest, ClientSocketHandleNotFromPool) {
TestCompletionCallback callback;
scoped_ptr<StreamSocket> transport(
- new TCPClientSocket(addr(), NULL, NetLog::Source()));
+ new TCPClientSocket(addr(), NULL, NULL, NetLog::Source()));
int rv = callback.GetResult(transport->Connect(callback.callback()));
EXPECT_EQ(OK, rv);
@@ -2515,7 +2515,7 @@ TEST_F(SSLClientSocketTest, ReusableAfterWrite) {
TestCompletionCallback callback;
scoped_ptr<StreamSocket> real_transport(
- new TCPClientSocket(addr(), NULL, NetLog::Source()));
+ new TCPClientSocket(addr(), NULL, NULL, NetLog::Source()));
scoped_ptr<FakeBlockingStreamSocket> transport(
new FakeBlockingStreamSocket(std::move(real_transport)));
FakeBlockingStreamSocket* raw_transport = transport.get();
@@ -2571,7 +2571,7 @@ TEST_F(SSLClientSocketTest, SessionResumption) {
// Using a different HostPortPair uses a different session cache key.
scoped_ptr<StreamSocket> transport(
- new TCPClientSocket(addr(), &log_, NetLog::Source()));
+ new TCPClientSocket(addr(), NULL, &log_, NetLog::Source()));
TestCompletionCallback callback;
ASSERT_EQ(OK, callback.GetResult(transport->Connect(callback.callback())));
scoped_ptr<SSLClientSocket> sock = CreateSSLClientSocket(
« net/socket/client_socket_factory.h ('K') | « net/socket/socks_client_socket_pool_unittest.cc ('k') | net/socket/tcp_client_socket.h » ('j') | net/socket/tcp_socket_posix.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698