Introduce RequestWebSocketStream into HttpStreamFactory

net/http/http_stream_factory.h

Index: net/http/http_stream_factory.h
diff --git a/net/http/http_stream_factory.h b/net/http/http_stream_factory.h
index eaadcc724e30a88f1d453bc9d648d231dea191d1..04635a4ba76832fa9ca87b04b29d53534a32ba99 100644
--- a/net/http/http_stream_factory.h
+++ b/net/http/http_stream_factory.h
@@ -17,6 +17,7 @@
 #include "net/base/net_export.h"
 #include "net/base/request_priority.h"
 #include "net/http/http_server_properties.h"
+#include "net/http/websocket_stream_base.h"
 #include "net/socket/ssl_client_socket.h"
 
 class GURL;
@@ -55,7 +56,7 @@ class NET_EXPORT_PRIVATE HttpStreamRequest {
    public:
     virtual ~Delegate() {}
 
-    // This is the success case.
+    // This is the success case for RequestStream.
     // |stream| is now owned by the delegate.
     // |used_ssl_config| indicates the actual SSL configuration used for this
     // stream, since the HttpStreamRequest may have modified the configuration
@@ -67,6 +68,18 @@ class NET_EXPORT_PRIVATE HttpStreamRequest {
         const ProxyInfo& used_proxy_info,
         HttpStreamBase* stream) = 0;
 
+    // This is the success case for RequestWebSocketStream.
+    // |stream| is now owned by the delegate.
+    // |used_ssl_config| indicates the actual SSL configuration used for this
+    // stream, since the HttpStreamRequest may have modified the configuration
+    // during stream processing.
+    // |used_proxy_info| indicates the actual ProxyInfo used for this stream,
+    // since the HttpStreamRequest performs the proxy resolution.
+    virtual void OnWebSocketStreamReady(
+      const SSLConfig& used_ssl_config,
+      const ProxyInfo& used_proxy_info,
+      WebSocketStreamBase* stream) = 0;

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

nit:  4 space indent.

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

Done.

+
     // This is the failure to create a stream case.
     // |used_ssl_config| indicates the actual SSL configuration used for this
     // stream, since the HttpStreamRequest may have modified the configuration
@@ -169,7 +182,7 @@ class NET_EXPORT HttpStreamFactory {
   // Virtual interface methods.
 
   // Request a stream.
-  // Will callback to the HttpStreamRequestDelegate upon completion.
+  // Will call delegate->OnStreamReady upon completion.

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

nit:  "on successful completion"

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

Done.

   virtual HttpStreamRequest* RequestStream(
       const HttpRequestInfo& info,
       RequestPriority priority,
@@ -178,6 +191,17 @@ class NET_EXPORT HttpStreamFactory {
       HttpStreamRequest::Delegate* delegate,
       const BoundNetLog& net_log) = 0;
 
+  // Request a websocket stream.
+  // Will call delegate->OnWebSocketStreamReady upon completion.

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

nit:  "on successful completion"

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

Done.

+  virtual HttpStreamRequest* RequestWebSocketStream(
+      const HttpRequestInfo& info,
+      RequestPriority priority,
+      const SSLConfig& server_ssl_config,
+      const SSLConfig& proxy_ssl_config,
+      HttpStreamRequest::Delegate* delegate,
+      WebSocketStreamBase::Factory* factory,
+      const BoundNetLog& net_log) = 0;
+
   // Requests that enough connections for |num_streams| be opened.
   virtual void PreconnectStreams(int num_streams,
                                  const HttpRequestInfo& info,