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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/ssl_client_socket_pool_unittest.cc

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 3 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
« components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h ('K') | « net/socket/ssl_client_socket_pool.cc ('k') | net/socket/ssl_client_socket_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_pool_unittest.cc
diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc
index 14d0af11e3de772e7bd4dff7033d7a07015d89a2..28a73b343957fd1b1c27ef8a6c55d16bd338a4d0 100644
--- a/net/socket/ssl_client_socket_pool_unittest.cc
+++ b/net/socket/ssl_client_socket_pool_unittest.cc
@@ -220,7 +220,7 @@ TEST_F(SSLClientSocketPoolTest, TCPFail) {
ClientSocketHandle handle;
int rv =
handle.Init("a", params, MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
- CompletionCallback(), pool_.get(), BoundNetLog());
+ CompletionCallback(), pool_.get(), NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_CONNECTION_FAILED));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -243,7 +243,7 @@ TEST_F(SSLClientSocketPoolTest, TCPFailAsync) {
TestCompletionCallback callback;
int rv =
handle.Init("a", params, MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog());
+ callback.callback(), pool_.get(), NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -272,7 +272,7 @@ TEST_F(SSLClientSocketPoolTest, BasicDirect) {
TestCompletionCallback callback;
int rv =
handle.Init("a", params, MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog());
+ callback.callback(), pool_.get(), NetLogWithSource());
EXPECT_THAT(rv, IsOk());
EXPECT_TRUE(handle.is_initialized());
EXPECT_TRUE(handle.socket());
@@ -297,9 +297,10 @@ TEST_F(SSLClientSocketPoolTest, SetSocketRequestPriorityOnInitDirect) {
ClientSocketHandle handle;
TestCompletionCallback callback;
- EXPECT_EQ(OK, handle.Init("a", params, priority,
- ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog()));
+ EXPECT_EQ(
+ OK, handle.Init("a", params, priority,
+ ClientSocketPool::RespectLimits::ENABLED,
+ callback.callback(), pool_.get(), NetLogWithSource()));
EXPECT_EQ(priority, transport_socket_pool_.last_request_priority());
handle.socket()->Disconnect();
}
@@ -319,7 +320,7 @@ TEST_F(SSLClientSocketPoolTest, BasicDirectAsync) {
TestCompletionCallback callback;
int rv =
handle.Init("a", params, MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog());
+ callback.callback(), pool_.get(), NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -344,7 +345,7 @@ TEST_F(SSLClientSocketPoolTest, DirectCertError) {
TestCompletionCallback callback;
int rv =
handle.Init("a", params, MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog());
+ callback.callback(), pool_.get(), NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -369,7 +370,7 @@ TEST_F(SSLClientSocketPoolTest, DirectSSLError) {
TestCompletionCallback callback;
int rv =
handle.Init("a", params, MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog());
+ callback.callback(), pool_.get(), NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -395,7 +396,7 @@ TEST_F(SSLClientSocketPoolTest, DirectWithNPN) {
TestCompletionCallback callback;
int rv =
handle.Init("a", params, MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog());
+ callback.callback(), pool_.get(), NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -423,7 +424,7 @@ TEST_F(SSLClientSocketPoolTest, DirectNoSPDY) {
TestCompletionCallback callback;
int rv =
handle.Init("a", params, MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog());
+ callback.callback(), pool_.get(), NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -449,7 +450,7 @@ TEST_F(SSLClientSocketPoolTest, DirectGotSPDY) {
TestCompletionCallback callback;
int rv =
handle.Init("a", params, MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog());
+ callback.callback(), pool_.get(), NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -479,7 +480,7 @@ TEST_F(SSLClientSocketPoolTest, DirectGotBonusSPDY) {
TestCompletionCallback callback;
int rv =
handle.Init("a", params, MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog());
+ callback.callback(), pool_.get(), NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -507,7 +508,7 @@ TEST_F(SSLClientSocketPoolTest, SOCKSFail) {
TestCompletionCallback callback;
int rv =
handle.Init("a", params, MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog());
+ callback.callback(), pool_.get(), NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_CONNECTION_FAILED));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -527,7 +528,7 @@ TEST_F(SSLClientSocketPoolTest, SOCKSFailAsync) {
TestCompletionCallback callback;
int rv =
handle.Init("a", params, MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog());
+ callback.callback(), pool_.get(), NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -553,7 +554,7 @@ TEST_F(SSLClientSocketPoolTest, SOCKSBasic) {
TestCompletionCallback callback;
int rv =
handle.Init("a", params, MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog());
+ callback.callback(), pool_.get(), NetLogWithSource());
EXPECT_THAT(rv, IsOk());
EXPECT_TRUE(handle.is_initialized());
EXPECT_TRUE(handle.socket());
@@ -577,9 +578,10 @@ TEST_F(SSLClientSocketPoolTest, SetTransportPriorityOnInitSOCKS) {
ClientSocketHandle handle;
TestCompletionCallback callback;
- EXPECT_EQ(OK, handle.Init("a", params, HIGHEST,
- ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog()));
+ EXPECT_EQ(OK,
+ handle.Init("a", params, HIGHEST,
+ ClientSocketPool::RespectLimits::ENABLED,
+ callback.callback(), pool_.get(), NetLogWithSource()));
EXPECT_EQ(HIGHEST, transport_socket_pool_.last_request_priority());
}
@@ -597,7 +599,7 @@ TEST_F(SSLClientSocketPoolTest, SOCKSBasicAsync) {
TestCompletionCallback callback;
int rv =
handle.Init("a", params, MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog());
+ callback.callback(), pool_.get(), NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -623,7 +625,7 @@ TEST_F(SSLClientSocketPoolTest, HttpProxyFail) {
TestCompletionCallback callback;
int rv =
handle.Init("a", params, MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog());
+ callback.callback(), pool_.get(), NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_PROXY_CONNECTION_FAILED));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -643,7 +645,7 @@ TEST_F(SSLClientSocketPoolTest, HttpProxyFailAsync) {
TestCompletionCallback callback;
int rv =
handle.Init("a", params, MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog());
+ callback.callback(), pool_.get(), NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -681,7 +683,7 @@ TEST_F(SSLClientSocketPoolTest, HttpProxyBasic) {
TestCompletionCallback callback;
int rv =
handle.Init("a", params, MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog());
+ callback.callback(), pool_.get(), NetLogWithSource());
EXPECT_THAT(rv, IsOk());
EXPECT_TRUE(handle.is_initialized());
EXPECT_TRUE(handle.socket());
@@ -715,9 +717,10 @@ TEST_F(SSLClientSocketPoolTest, SetTransportPriorityOnInitHTTP) {
ClientSocketHandle handle;
TestCompletionCallback callback;
- EXPECT_EQ(OK, handle.Init("a", params, HIGHEST,
- ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog()));
+ EXPECT_EQ(OK,
+ handle.Init("a", params, HIGHEST,
+ ClientSocketPool::RespectLimits::ENABLED,
+ callback.callback(), pool_.get(), NetLogWithSource()));
EXPECT_EQ(HIGHEST, transport_socket_pool_.last_request_priority());
}
@@ -747,7 +750,7 @@ TEST_F(SSLClientSocketPoolTest, HttpProxyBasicAsync) {
TestCompletionCallback callback;
int rv =
handle.Init("a", params, MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog());
+ callback.callback(), pool_.get(), NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -785,7 +788,7 @@ TEST_F(SSLClientSocketPoolTest, NeedProxyAuth) {
TestCompletionCallback callback;
int rv =
handle.Init("a", params, MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), pool_.get(), BoundNetLog());
+ callback.callback(), pool_.get(), NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -825,7 +828,7 @@ TEST_F(SSLClientSocketPoolTest, IPPooling) {
// code would have done this already, but we do it manually.
HostResolver::RequestInfo info(HostPortPair(test_hosts[i].name, kTestPort));
host_resolver_.Resolve(info, DEFAULT_PRIORITY, &test_hosts[i].addresses,
- CompletionCallback(), &req[i], BoundNetLog());
+ CompletionCallback(), &req[i], NetLogWithSource());
// Setup a SpdySessionKey
test_hosts[i].key = SpdySessionKey(
@@ -845,8 +848,8 @@ TEST_F(SSLClientSocketPoolTest, IPPooling) {
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(true /* tcp pool */, false, false);
- base::WeakPtr<SpdySession> spdy_session =
- CreateSecureSpdySession(session_.get(), test_hosts[0].key, BoundNetLog());
+ base::WeakPtr<SpdySession> spdy_session = CreateSecureSpdySession(
+ session_.get(), test_hosts[0].key, NetLogWithSource());
EXPECT_TRUE(
HasSpdySession(session_->spdy_session_pool(), test_hosts[0].key));
@@ -881,9 +884,9 @@ void SSLClientSocketPoolTest::TestIPPoolingDisabled(
// This test requires that the HostResolver cache be populated. Normal
// code would have done this already, but we do it manually.
HostResolver::RequestInfo info(HostPortPair(test_hosts[i].name, kTestPort));
- rv =
- host_resolver_.Resolve(info, DEFAULT_PRIORITY, &test_hosts[i].addresses,
- callback.callback(), &req[i], BoundNetLog());
+ rv = host_resolver_.Resolve(info, DEFAULT_PRIORITY,
+ &test_hosts[i].addresses, callback.callback(),
+ &req[i], NetLogWithSource());
EXPECT_THAT(callback.GetResult(rv), IsOk());
// Setup a SpdySessionKey
@@ -900,8 +903,8 @@ void SSLClientSocketPoolTest::TestIPPoolingDisabled(
socket_factory_.AddSSLSocketDataProvider(ssl);
CreatePool(true /* tcp pool */, false, false);
- base::WeakPtr<SpdySession> spdy_session =
- CreateSecureSpdySession(session_.get(), test_hosts[0].key, BoundNetLog());
+ base::WeakPtr<SpdySession> spdy_session = CreateSecureSpdySession(
+ session_.get(), test_hosts[0].key, NetLogWithSource());
EXPECT_TRUE(
HasSpdySession(session_->spdy_session_pool(), test_hosts[0].key));
« components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h ('K') | « net/socket/ssl_client_socket_pool.cc ('k') | net/socket/ssl_client_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698