Add embedder-specific headers to HTTP CONNECT tunnel request

net/http/http_proxy_client_socket_pool.h

Index: net/http/http_proxy_client_socket_pool.h
diff --git a/net/http/http_proxy_client_socket_pool.h b/net/http/http_proxy_client_socket_pool.h
index a26c05f6603c9fbd1590eeac54682e8a830dbded..b65e21f64e10461d01c5d41c0ecc7b43c38aff19 100644
--- a/net/http/http_proxy_client_socket_pool.h
+++ b/net/http/http_proxy_client_socket_pool.h
@@ -28,6 +28,7 @@ namespace net {
 class HostResolver;
 class HttpAuthCache;
 class HttpAuthHandlerFactory;
+class HttpProxyTunnelDelegate;
 class SSLClientSocketPool;
 class SSLSocketParams;
 class SpdySessionPool;
@@ -51,7 +52,8 @@ class NET_EXPORT_PRIVATE HttpProxySocketParams
       HttpAuthCache* http_auth_cache,
       HttpAuthHandlerFactory* http_auth_handler_factory,
       SpdySessionPool* spdy_session_pool,
-      bool tunnel);
+      bool tunnel,
+      HttpProxyTunnelDelegate* http_proxy_tunnel_delegate);
 
   const scoped_refptr<TransportSocketParams>& transport_params() const {
     return transport_params_;
@@ -73,6 +75,10 @@ class NET_EXPORT_PRIVATE HttpProxySocketParams
   bool tunnel() const { return tunnel_; }
   bool ignore_limits() const { return ignore_limits_; }
 
+  HttpProxyTunnelDelegate* http_proxy_tunnel_delegate() const {
+    return http_proxy_tunnel_delegate_;
+  }
+
  private:
   friend class base::RefCounted<HttpProxySocketParams>;
   ~HttpProxySocketParams();
@@ -87,6 +93,7 @@ class NET_EXPORT_PRIVATE HttpProxySocketParams
   HttpAuthHandlerFactory* const http_auth_handler_factory_;
   const bool tunnel_;
   bool ignore_limits_;
+  HttpProxyTunnelDelegate* http_proxy_tunnel_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpProxySocketParams);
 };
@@ -186,6 +193,7 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool
       HostResolver* host_resolver,
       TransportClientSocketPool* transport_pool,
       SSLClientSocketPool* ssl_pool,
+      HttpProxyTunnelDelegate* http_proxy_tunnel_delegate,
       NetLog* net_log);
 
   virtual ~HttpProxyClientSocketPool();
@@ -251,6 +259,7 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool
         TransportClientSocketPool* transport_pool,
         SSLClientSocketPool* ssl_pool,
         HostResolver* host_resolver,
+        HttpProxyTunnelDelegate* http_proxy_tunnel_delegate,
         NetLog* net_log);
 
     // ClientSocketPoolBase::ConnectJobFactory methods.
@@ -265,6 +274,7 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool
     TransportClientSocketPool* const transport_pool_;
     SSLClientSocketPool* const ssl_pool_;
     HostResolver* const host_resolver_;
+    HttpProxyTunnelDelegate* http_proxy_tunnel_delegate_;

[mef, 2014/09/05 17:22:50]

Should this be HttpProxyTunnelDelegate* const?

[bengr, 2014/09/07 21:02:24]

Done.

     NetLog* net_log_;
     base::TimeDelta timeout_;