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

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: Added tests Created 6 years, 4 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/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..3980981ca4e949dc46c03814c8c75c24d4e820ee 100644
--- a/net/socket/client_socket_pool_manager_impl.cc
+++ b/net/socket/client_socket_pool_manager_impl.cc
@@ -4,6 +4,7 @@
#include "net/socket/client_socket_pool_manager_impl.h"
+#include "base/callback.h"
#include "base/logging.h"
#include "base/values.h"
#include "net/http/http_network_session.h"
@@ -46,6 +47,8 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(
ProxyService* proxy_service,
SSLConfigService* ssl_config_service,
bool enable_ssl_connect_job_waiting,
+ const base::Callback<void(const HostPortPair&, HttpRequestHeaders*)>&
+ before_proxy_tunnel_request_callback,
HttpNetworkSession::SocketPoolType pool_type)
: net_log_(net_log),
socket_factory_(socket_factory),
@@ -98,7 +101,9 @@ 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"),
+ before_proxy_tunnel_request_callback_(
+ before_proxy_tunnel_request_callback) {
CertDatabase::GetInstance()->AddObserver(this);
}
@@ -324,6 +329,7 @@ ClientSocketPoolManagerImpl::GetSocketPoolForHTTPProxy(
host_resolver_,
tcp_http_ret.first->second,
ssl_https_ret.first->second,
+ before_proxy_tunnel_request_callback_,
net_log_)));
return ret.first->second;

Powered by Google App Engine
This is Rietveld 408576698