| Index: net/socket/client_socket_pool_manager.h
|
| diff --git a/net/socket/client_socket_pool_manager.h b/net/socket/client_socket_pool_manager.h
|
| index 434a463b7e4688cdcba3d0650c6cf1b3b3422312..a514d25724eaf9d71bcb3d3d1e2cd55a89e07459 100644
|
| --- a/net/socket/client_socket_pool_manager.h
|
| +++ b/net/socket/client_socket_pool_manager.h
|
| @@ -108,6 +108,31 @@ int InitSocketHandleForHttpRequest(
|
|
|
| // A helper method that uses the passed in proxy information to initialize a
|
| // ClientSocketHandle with the relevant socket pool. Use this method for
|
| +// HTTP/HTTPS requests for WebSocket handshake.
|
| +// |ssl_config_for_origin| is only used if the request
|
| +// uses SSL and |ssl_config_for_proxy| is used if the proxy server is HTTPS.
|
| +// |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.
|
| +int InitSocketHandleForWebSocketRequest(
|
| + const GURL& request_url,
|
| + const HttpRequestHeaders& request_extra_headers,
|
| + int request_load_flags,
|
| + RequestPriority request_priority,
|
| + HttpNetworkSession* session,
|
| + const ProxyInfo& proxy_info,
|
| + bool force_spdy_over_ssl,
|
| + bool want_spdy_over_npn,
|
| + const SSLConfig& ssl_config_for_origin,
|
| + const SSLConfig& ssl_config_for_proxy,
|
| + PrivacyMode privacy_mode,
|
| + const BoundNetLog& net_log,
|
| + ClientSocketHandle* socket_handle,
|
| + const OnHostResolutionCallback& resolution_callback,
|
| + const CompletionCallback& callback);
|
| +
|
| +// A helper method that uses the passed in proxy information to initialize a
|
| +// ClientSocketHandle with the relevant socket pool. Use this method for
|
| // a raw socket connection to a host-port pair (that needs to tunnel through
|
| // the proxies).
|
| NET_EXPORT int InitSocketHandleForRawConnect(
|
|
|