Index: net/socket/client_socket_pool_manager.cc |
diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc |
index 0b49b56aa237499d60ae0ee07cae4540f0cec920..c00b5ec27e666a75568e38106e7645aef112d3e7 100644 |
--- a/net/socket/client_socket_pool_manager.cc |
+++ b/net/socket/client_socket_pool_manager.cc |
@@ -88,7 +88,8 @@ int InitSocketPoolHelper(const GURL& request_url, |
scoped_refptr<SOCKSSocketParams> socks_params; |
scoped_ptr<HostPortPair> proxy_host_port; |
- bool using_ssl = request_url.SchemeIs("https") || force_spdy_over_ssl; |
+ bool using_ssl = request_url.SchemeIs("https") || |
+ request_url.SchemeIs("wss") || force_spdy_over_ssl; |
HostPortPair origin_host_port = |
HostPortPair(request_url.HostNoBrackets(), |
@@ -393,6 +394,30 @@ int InitSocketHandleForHttpRequest( |
0, socket_handle, resolution_callback, callback); |
} |
+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) { |
+ DCHECK(socket_handle); |
+ return InitSocketPoolHelper( |
+ request_url, request_extra_headers, request_load_flags, request_priority, |
+ session, proxy_info, force_spdy_over_ssl, want_spdy_over_npn, |
+ ssl_config_for_origin, ssl_config_for_proxy, true, privacy_mode, net_log, |
+ 0, socket_handle, resolution_callback, callback); |
+} |
+ |
int InitSocketHandleForRawConnect( |
const HostPortPair& host_port_pair, |
HttpNetworkSession* session, |