diff --git a/src/net/socket/client_socket_pool_manager.cc b/src/net/socket/client_socket_pool_manager.cc index cd5865da8a..d25b67c819 100644 --- a/src/net/socket/client_socket_pool_manager.cc +++ b/src/net/socket/client_socket_pool_manager.cc @@ -426,6 +426,30 @@ int InitSocketHandleForRawConnect(const HostPortPair& host_port_pair, OnHostResolutionCallback(), std::move(callback)); } +int InitSocketHandleForRawConnect2( + const HostPortPair& host_port_pair, + HttpNetworkSession* session, + int request_load_flags, + RequestPriority request_priority, + const ProxyInfo& proxy_info, + quic::QuicTransportVersion quic_version, + const SSLConfig& ssl_config_for_origin, + const SSLConfig& ssl_config_for_proxy, + PrivacyMode privacy_mode, + const NetLogWithSource& net_log, + ClientSocketHandle* socket_handle, + CompletionOnceCallback callback) { + DCHECK(socket_handle); + HttpRequestHeaders request_extra_headers; + return InitSocketPoolHelper( + ClientSocketPoolManager::NORMAL_GROUP, host_port_pair, + request_extra_headers, request_load_flags, request_priority, session, + proxy_info, quic_version, ssl_config_for_origin, ssl_config_for_proxy, + /*force_tunnel=*/true, privacy_mode, SocketTag(), net_log, 0, + socket_handle, HttpNetworkSession::NORMAL_SOCKET_POOL, + OnHostResolutionCallback(), std::move(callback)); +} + int InitSocketHandleForTlsConnect(const HostPortPair& endpoint, HttpNetworkSession* session, int request_load_flags, diff --git a/src/net/socket/client_socket_pool_manager.h b/src/net/socket/client_socket_pool_manager.h index 694b52da89..8a5401a191 100644 --- a/src/net/socket/client_socket_pool_manager.h +++ b/src/net/socket/client_socket_pool_manager.h @@ -103,7 +103,7 @@ class NET_EXPORT_PRIVATE ClientSocketPoolManager { // |resolution_callback| will be invoked after the the hostname is // resolved. If |resolution_callback| does not return OK, then the // connection will be aborted with that value. -NET_EXPORT int InitSocketHandleForHttpRequest( +int InitSocketHandleForHttpRequest( ClientSocketPoolManager::SocketGroupType group_type, const HostPortPair& endpoint, const HttpRequestHeaders& request_extra_headers, @@ -164,6 +164,20 @@ NET_EXPORT int InitSocketHandleForRawConnect( ClientSocketHandle* socket_handle, CompletionOnceCallback callback); +NET_EXPORT int InitSocketHandleForRawConnect2( + const HostPortPair& host_port_pair, + HttpNetworkSession* session, + int request_load_flags, + RequestPriority request_priority, + const ProxyInfo& proxy_info, + quic::QuicTransportVersion quic_version, + const SSLConfig& ssl_config_for_origin, + const SSLConfig& ssl_config_for_proxy, + PrivacyMode privacy_mode, + const NetLogWithSource& net_log, + ClientSocketHandle* socket_handle, + CompletionOnceCallback callback); + // Deprecated: Please do not use this outside of //net and //services/network. // A helper method that uses the passed in proxy information to initialize a // ClientSocketHandle with the relevant socket pool. Use this method for