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

Unified Diff: net/socket/socks_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
Index: net/socket/socks_client_socket_pool_unittest.cc
diff --git a/net/socket/socks_client_socket_pool_unittest.cc b/net/socket/socks_client_socket_pool_unittest.cc
index 36cefb45b05bc9ab4b52bafb335c081d4065daf8..5827c99fb32a093f7a7065bc18a363dc44ff98d8 100644
--- a/net/socket/socks_client_socket_pool_unittest.cc
+++ b/net/socket/socks_client_socket_pool_unittest.cc
@@ -137,7 +137,7 @@ TEST_F(SOCKSClientSocketPoolTest, Simple) {
ClientSocketHandle handle;
int rv = handle.Init("a", CreateSOCKSv5Params(), LOW,
ClientSocketPool::RespectLimits::ENABLED,
- CompletionCallback(), &pool_, BoundNetLog());
+ CompletionCallback(), &pool_, NetLogWithSource());
EXPECT_THAT(rv, IsOk());
EXPECT_TRUE(handle.is_initialized());
EXPECT_TRUE(handle.socket());
@@ -155,9 +155,10 @@ TEST_F(SOCKSClientSocketPoolTest, SetSocketRequestPriorityOnInit) {
data.data_provider());
ClientSocketHandle handle;
- EXPECT_EQ(OK, handle.Init("a", CreateSOCKSv5Params(), priority,
- ClientSocketPool::RespectLimits::ENABLED,
- CompletionCallback(), &pool_, BoundNetLog()));
+ EXPECT_EQ(OK,
+ handle.Init("a", CreateSOCKSv5Params(), priority,
+ ClientSocketPool::RespectLimits::ENABLED,
+ CompletionCallback(), &pool_, NetLogWithSource()));
EXPECT_EQ(priority, transport_socket_pool_.last_request_priority());
handle.socket()->Disconnect();
}
@@ -177,7 +178,7 @@ TEST_F(SOCKSClientSocketPoolTest, SetResolvePriorityOnInit) {
EXPECT_EQ(ERR_IO_PENDING,
handle.Init("a", CreateSOCKSv4Params(), priority,
ClientSocketPool::RespectLimits::ENABLED,
- CompletionCallback(), &pool_, BoundNetLog()));
+ CompletionCallback(), &pool_, NetLogWithSource()));
EXPECT_EQ(priority, transport_socket_pool_.last_request_priority());
EXPECT_EQ(priority, host_resolver_.last_request_priority());
EXPECT_TRUE(handle.socket() == NULL);
@@ -192,7 +193,7 @@ TEST_F(SOCKSClientSocketPoolTest, Async) {
ClientSocketHandle handle;
int rv = handle.Init("a", CreateSOCKSv5Params(), LOW,
ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), &pool_, BoundNetLog());
+ callback.callback(), &pool_, NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -212,7 +213,7 @@ TEST_F(SOCKSClientSocketPoolTest, TransportConnectError) {
ClientSocketHandle handle;
int rv = handle.Init("a", CreateSOCKSv5Params(), LOW,
ClientSocketPool::RespectLimits::ENABLED,
- CompletionCallback(), &pool_, BoundNetLog());
+ CompletionCallback(), &pool_, NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_PROXY_CONNECTION_FAILED));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -227,7 +228,7 @@ TEST_F(SOCKSClientSocketPoolTest, AsyncTransportConnectError) {
ClientSocketHandle handle;
int rv = handle.Init("a", CreateSOCKSv5Params(), LOW,
ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), &pool_, BoundNetLog());
+ callback.callback(), &pool_, NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -250,7 +251,7 @@ TEST_F(SOCKSClientSocketPoolTest, SOCKSConnectError) {
EXPECT_EQ(0, transport_socket_pool_.release_count());
int rv = handle.Init("a", CreateSOCKSv5Params(), LOW,
ClientSocketPool::RespectLimits::ENABLED,
- CompletionCallback(), &pool_, BoundNetLog());
+ CompletionCallback(), &pool_, NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_SOCKS_CONNECTION_FAILED));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -271,7 +272,7 @@ TEST_F(SOCKSClientSocketPoolTest, AsyncSOCKSConnectError) {
EXPECT_EQ(0, transport_socket_pool_.release_count());
int rv = handle.Init("a", CreateSOCKSv5Params(), LOW,
ClientSocketPool::RespectLimits::ENABLED,
- callback.callback(), &pool_, BoundNetLog());
+ callback.callback(), &pool_, NetLogWithSource());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());

Powered by Google App Engine
This is Rietveld 408576698