net/socket/client_socket_pool_manager_impl.cc - Issue 517693002: Add embedder-specific headers to HTTP CONNECT tunnel request

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/socket/client_socket_pool_manager_impl.cc

Issue 517693002: Add embedder-specific headers to HTTP CONNECT tunnel request (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed comments from mef and mmenke Created 6 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

« net/http/http_proxy_client_socket_pool_unittest.cc ('K') | « net/socket/client_socket_pool_manager_impl.h ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/socket/client_socket_pool_manager_impl.cc

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

index 083dfb061783bdf07337a5f96ec7bd1a77d5bbc7..5ed31fc9a25b367f6e8346d9cf9ab6663530a625 100644

--- a/net/socket/client_socket_pool_manager_impl.cc

+++ b/net/socket/client_socket_pool_manager_impl.cc

@@ -46,6 +46,7 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(

ProxyService* proxy_service,

SSLConfigService* ssl_config_service,

bool enable_ssl_connect_job_waiting,

+ ProxyDelegate* proxy_delegate,

HttpNetworkSession::SocketPoolType pool_type)

: net_log_(net_log),

socket_factory_(socket_factory),

@@ -98,7 +99,8 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(

transport_for_https_proxy_pool_histograms_("TCPforHTTPSProxy"),

ssl_for_https_proxy_pool_histograms_("SSLforHTTPSProxy"),

http_proxy_pool_histograms_("HTTPProxy"),

- ssl_socket_pool_for_proxies_histograms_("SSLForProxies") {

+ ssl_socket_pool_for_proxies_histograms_("SSLForProxies"),

+ proxy_delegate_(proxy_delegate) {

CertDatabase::GetInstance()->AddObserver(this);

}

@@ -324,6 +326,7 @@ ClientSocketPoolManagerImpl::GetSocketPoolForHTTPProxy(

host_resolver_,

tcp_http_ret.first->second,

ssl_https_ret.first->second,

+ proxy_delegate_,

net_log_)));

return ret.first->second;