Introduce RequestWebSocketStream into HttpStreamFactory

net/socket/client_socket_pool_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/client_socket_pool_manager.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 70 matching lines @@
                          const BoundNetLog& net_log,
                          int num_preconnect_streams,
                          ClientSocketHandle* socket_handle,
                          const OnHostResolutionCallback& resolution_callback,
                          const CompletionCallback& callback) {
   scoped_refptr<TransportSocketParams> tcp_params;
   scoped_refptr<HttpProxySocketParams> http_proxy_params;
   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;

[mmenke, 2013/05/28 21:22:37]

Another issue for the CL to use the right HttpStreamFactory:  If we're using an
HTTP proxy, we want to make sure we use it as a Connect proxy.  I believe the
current code will just connect to the HTTP proxy, and pass that on to the
WebSocketStream.

[yhirano, 2013/05/30 04:44:32]

I'm not sure if I understand your comment correctly, but we use CONNECT when we
use a proxy server, as RFC6455 says in 4.1, _Proxy Usage_
(http://tools.ietf.org/html/rfc6455#section-4.1). Is that resolve the problem?

[mmenke, 2013/05/30 19:27:12]

The issue is this code isn't using a CONNECT.  Look at
HttpProxyConnectJob::DoHttpProxyConnect and HttpProxyClientSocket::Connect. 
using_spdy_ will be false, as will params_->tunnel().  As a result, I believe
this code won't issue a CONNECT request.  Instead, it will determine a tunnel is
not in use, and HttpProxyClientSocket::Connect will complete synchronously,
without establishing the tunnel.

[yhirano, 2013/05/31 08:36:45]

I see, I added InitSocketHandleForWebSocket which calls the helper function with
force_tunnel = true in client_socket_pool_manager.h and use it if for_websocket_
is true.

 
   HostPortPair origin_host_port =
       HostPortPair(request_url.HostNoBrackets(),
                    request_url.EffectiveIntPort());
 
   if (!using_ssl && session->params().testing_fixed_http_port != 0) {
     origin_host_port.set_port(session->params().testing_fixed_http_port);
   } else if (using_ssl && session->params().testing_fixed_https_port != 0) {
     origin_host_port.set_port(session->params().testing_fixed_https_port);
   }
@@ skipping 331 matching lines @@
     int num_preconnect_streams) {
   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, false, privacy_mode, net_log,
       num_preconnect_streams, NULL, OnHostResolutionCallback(),
       CompletionCallback());
 }
 
 }  // namespace net