Introduce RequestWebSocketStream into HttpStreamFactory

net/http/http_stream_factory_impl_request.h

Index: net/http/http_stream_factory_impl_request.h
diff --git a/net/http/http_stream_factory_impl_request.h b/net/http/http_stream_factory_impl_request.h
index f0b5335885415938eab187f0569829e1b8e8ce35..baef5daa0687dbbaa31d69922af637f425c63e46 100644
--- a/net/http/http_stream_factory_impl_request.h
+++ b/net/http/http_stream_factory_impl_request.h
@@ -14,12 +14,16 @@
 
 namespace net {
 
+class ClientSocketHandle;
+class SpdySession;
+
 class HttpStreamFactoryImpl::Request : public HttpStreamRequest {
  public:
   Request(const GURL& url,
           HttpStreamFactoryImpl* factory,
           HttpStreamRequest::Delegate* delegate,
-          const BoundNetLog& net_log);
+          const BoundNetLog& net_log,
+          bool for_websocket);
   virtual ~Request();
 
   // The GURL from the HttpRequestInfo the started the Request.
@@ -57,9 +61,9 @@ class HttpStreamFactoryImpl::Request : public HttpStreamRequest {
   void RemoveRequestFromHttpPipeliningRequestMap();
 
   // Called by an attached Job if it sets up a SpdySession.
-  void OnSpdySessionReady(Job* job,
-                          scoped_refptr<SpdySession> spdy_session,
-                          bool direct);
+  void OnNewSpdySessionReady(Job* job,
+                             scoped_refptr<SpdySession> spdy_session,
+                             bool direct);
 
   // HttpStreamRequest::Delegate methods which we implement. Note we don't
   // actually subclass HttpStreamRequest::Delegate.
@@ -68,6 +72,16 @@ class HttpStreamFactoryImpl::Request : public HttpStreamRequest {
                      const SSLConfig& used_ssl_config,
                      const ProxyInfo& used_proxy_info,
                      HttpStreamBase* stream);
+  // Called by an attached Job if it wants to pass a spdy session
+  // to the delegate.
+  void OnSpdySessionReadyForWebSocket(Job* job,
+                                      const SSLConfig& used_ssl_config,
+                                      const ProxyInfo& used_proxy_info,
+                                      scoped_refptr<SpdySession> session);
+  void OnSocketReadyForWebSocket(Job* job,
+                                 const SSLConfig& used_ssl_config,
+                                 const ProxyInfo& used_proxy_info,
+                                 ClientSocketHandle* connection);
   void OnStreamFailed(Job* job, int status, const SSLConfig& used_ssl_config);
   void OnCertificateError(Job* job,
                           int status,
@@ -88,6 +102,8 @@ class HttpStreamFactoryImpl::Request : public HttpStreamRequest {
       const ProxyInfo& used_proxy_info,
       HttpStreamBase* stream);
 
+  bool for_websocket() const { return for_websocket_; }
+
   // HttpStreamRequest methods.
 
   virtual int RestartTunnelWithProxyAuth(
@@ -105,6 +121,9 @@ class HttpStreamFactoryImpl::Request : public HttpStreamRequest {
   // Used to orphan all jobs in |jobs_|.
   void OrphanJobs();
 
+  // Orphan a job if appropriate.
+  void Orphan(Job* job);
+
   const GURL url_;
   HttpStreamFactoryImpl* const factory_;
   HttpStreamRequest::Delegate* const delegate_;
@@ -121,10 +140,11 @@ class HttpStreamFactoryImpl::Request : public HttpStreamRequest {
   // Protocol negotiated with the server.
   NextProto protocol_negotiated_;
   bool using_spdy_;
+  bool for_websocket_;
 
   DISALLOW_COPY_AND_ASSIGN(Request);
 };
 
 }  // namespace net
 
-#endif  // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_H_
+#endif  // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_REQUEST_H_