net/http/http_proxy_client_socket_pool_unittest.cc - Issue 2351513002: net: rename BoundNetLog to NetLogWithSource

Unified Diff: net/http/http_proxy_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

« components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h ('K') | « net/http/http_proxy_client_socket_pool.cc ('k') | net/http/http_proxy_client_socket_wrapper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/http/http_proxy_client_socket_pool_unittest.cc

diff --git a/net/http/http_proxy_client_socket_pool_unittest.cc b/net/http/http_proxy_client_socket_pool_unittest.cc

index 88849a04e81fc112f7d4eed6b6cb537c77efa434..3e707354e3a07b3f12b9b01aad0e39479efa9385 100644

--- a/net/http/http_proxy_client_socket_pool_unittest.cc

+++ b/net/http/http_proxy_client_socket_pool_unittest.cc

@@ -71,7 +71,7 @@ class HttpProxyClientSocketPoolTest

NULL,

session_deps_.ssl_config_service.get(),

- BoundNetLog().net_log()),

+ NetLogWithSource().net_log()),

pool_(kMaxSockets,

kMaxSocketsPerGroup,

&transport_socket_pool_,

@@ -221,7 +221,7 @@ TEST_P(HttpProxyClientSocketPoolTest, NoTunnel) {

std::unique_ptr<TestProxyDelegate> proxy_delegate(new TestProxyDelegate());

int rv = handle_.Init("a", CreateNoTunnelParams(proxy_delegate.get()), LOW,

ClientSocketPool::RespectLimits::ENABLED,

- CompletionCallback(), &pool_, BoundNetLog());

+ CompletionCallback(), &pool_, NetLogWithSource());

EXPECT_THAT(rv, IsOk());

EXPECT_TRUE(handle_.is_initialized());

ASSERT_TRUE(handle_.socket());

@@ -237,7 +237,7 @@ TEST_P(HttpProxyClientSocketPoolTest, SetSocketRequestPriorityOnInit) {

Initialize(NULL, 0, NULL, 0, NULL, 0, NULL, 0);

EXPECT_EQ(OK, handle_.Init("a", CreateNoTunnelParams(NULL), HIGHEST,

ClientSocketPool::RespectLimits::ENABLED,

- CompletionCallback(), &pool_, BoundNetLog()));

+ CompletionCallback(), &pool_, NetLogWithSource()));

EXPECT_EQ(HIGHEST, GetLastTransportRequestPriority());

}

@@ -277,7 +277,7 @@ TEST_P(HttpProxyClientSocketPoolTest, NeedAuth) {

int rv = handle_.Init("a", CreateTunnelParams(NULL), 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());

@@ -326,7 +326,7 @@ TEST_P(HttpProxyClientSocketPoolTest, HaveAuth) {

std::unique_ptr<TestProxyDelegate> proxy_delegate(new TestProxyDelegate());

int rv = handle_.Init("a", CreateTunnelParams(proxy_delegate.get()), LOW,

ClientSocketPool::RespectLimits::ENABLED,

- callback_.callback(), &pool_, BoundNetLog());

+ callback_.callback(), &pool_, NetLogWithSource());

EXPECT_THAT(rv, IsOk());

EXPECT_TRUE(handle_.is_initialized());

ASSERT_TRUE(handle_.socket());

@@ -377,7 +377,7 @@ TEST_P(HttpProxyClientSocketPoolTest, AsyncHaveAuth) {

std::unique_ptr<TestProxyDelegate> proxy_delegate(new TestProxyDelegate());

int rv = handle_.Init("a", CreateTunnelParams(proxy_delegate.get()), 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());

@@ -414,7 +414,7 @@ TEST_P(HttpProxyClientSocketPoolTest,

EXPECT_EQ(ERR_IO_PENDING,

handle_.Init("a", CreateTunnelParams(NULL), MEDIUM,

ClientSocketPool::RespectLimits::ENABLED,

- callback_.callback(), &pool_, BoundNetLog()));

+ callback_.callback(), &pool_, NetLogWithSource()));

EXPECT_EQ(MEDIUM, GetLastTransportRequestPriority());

EXPECT_THAT(callback_.WaitForResult(), IsOk());

@@ -430,7 +430,7 @@ TEST_P(HttpProxyClientSocketPoolTest, TCPError) {

int rv = handle_.Init("a", CreateTunnelParams(NULL), 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());

@@ -457,7 +457,7 @@ TEST_P(HttpProxyClientSocketPoolTest, SSLError) {

int rv = handle_.Init("a", CreateTunnelParams(NULL), 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());

@@ -485,7 +485,7 @@ TEST_P(HttpProxyClientSocketPoolTest, SslClientAuth) {

int rv = handle_.Init("a", CreateTunnelParams(NULL), 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());

@@ -524,7 +524,7 @@ TEST_P(HttpProxyClientSocketPoolTest, TunnelUnexpectedClose) {

int rv = handle_.Init("a", CreateTunnelParams(NULL), 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());

@@ -564,7 +564,7 @@ TEST_P(HttpProxyClientSocketPoolTest, Tunnel1xxResponse) {

int rv = handle_.Init("a", CreateTunnelParams(NULL), 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());

@@ -603,7 +603,7 @@ TEST_P(HttpProxyClientSocketPoolTest, TunnelSetupError) {

int rv = handle_.Init("a", CreateTunnelParams(NULL), 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());

@@ -660,7 +660,7 @@ TEST_P(HttpProxyClientSocketPoolTest, TunnelSetupRedirect) {

int rv = handle_.Init("a", CreateTunnelParams(NULL), 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());