net/socket/client_socket_pool_manager.cc - Issue 2351513002: net: rename BoundNetLog to NetLogWithSource

Unified Diff: net/socket/client_socket_pool_manager.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/socket/client_socket_pool_manager.h ('k') | net/socket/fuzzed_socket.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/socket/client_socket_pool_manager.cc

diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc

index 3b38b2bd3780a7339ea0feedd3a5d008b91138c4..8482dc2b166780ec9bfe0cda75d547f6a7be2d2f 100644

--- a/net/socket/client_socket_pool_manager.cc

+++ b/net/socket/client_socket_pool_manager.cc

@@ -77,7 +77,7 @@ int InitSocketPoolHelper(ClientSocketPoolManager::SocketGroupType group_type,

const SSLConfig& ssl_config_for_proxy,

bool force_tunnel,

PrivacyMode privacy_mode,

- const BoundNetLog& net_log,

+ const NetLogWithSource& net_log,

int num_preconnect_streams,

ClientSocketHandle* socket_handle,

HttpNetworkSession::SocketPoolType socket_pool_type,

@@ -357,7 +357,7 @@ int InitSocketHandleForHttpRequest(

const SSLConfig& ssl_config_for_origin,

const SSLConfig& ssl_config_for_proxy,

PrivacyMode privacy_mode,

- const BoundNetLog& net_log,

+ const NetLogWithSource& net_log,

ClientSocketHandle* socket_handle,

const OnHostResolutionCallback& resolution_callback,

const CompletionCallback& callback) {

@@ -382,7 +382,7 @@ int InitSocketHandleForWebSocketRequest(

const SSLConfig& ssl_config_for_origin,

const SSLConfig& ssl_config_for_proxy,

PrivacyMode privacy_mode,

- const BoundNetLog& net_log,

+ const NetLogWithSource& net_log,

ClientSocketHandle* socket_handle,

const OnHostResolutionCallback& resolution_callback,

const CompletionCallback& callback) {

@@ -395,16 +395,15 @@ int InitSocketHandleForWebSocketRequest(

resolution_callback, callback);

}

-int InitSocketHandleForRawConnect(

- const HostPortPair& host_port_pair,

- HttpNetworkSession* session,

- const ProxyInfo& proxy_info,

- const SSLConfig& ssl_config_for_origin,

- const SSLConfig& ssl_config_for_proxy,

- PrivacyMode privacy_mode,

- const BoundNetLog& net_log,

- ClientSocketHandle* socket_handle,

- const CompletionCallback& callback) {

+int InitSocketHandleForRawConnect(const HostPortPair& host_port_pair,

+ HttpNetworkSession* session,

+ const ProxyInfo& proxy_info,

+ const SSLConfig& ssl_config_for_origin,

+ const SSLConfig& ssl_config_for_proxy,

+ PrivacyMode privacy_mode,

+ const NetLogWithSource& net_log,

+ ClientSocketHandle* socket_handle,

+ const CompletionCallback& callback) {

DCHECK(socket_handle);

HttpRequestHeaders request_extra_headers;

int request_load_flags = 0;

@@ -424,7 +423,7 @@ int InitSocketHandleForTlsConnect(const HostPortPair& endpoint,

const SSLConfig& ssl_config_for_origin,

const SSLConfig& ssl_config_for_proxy,

PrivacyMode privacy_mode,

- const BoundNetLog& net_log,

+ const NetLogWithSource& net_log,

ClientSocketHandle* socket_handle,

const CompletionCallback& callback) {

DCHECK(socket_handle);

@@ -452,7 +451,7 @@ int PreconnectSocketsForHttpRequest(

const SSLConfig& ssl_config_for_origin,

const SSLConfig& ssl_config_for_proxy,

PrivacyMode privacy_mode,

- const BoundNetLog& net_log,

+ const NetLogWithSource& net_log,

int num_preconnect_streams) {

return InitSocketPoolHelper(

group_type, endpoint, request_extra_headers, request_load_flags,