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 18633fa965e10873698c85ce9a1752dcccfffa1c..86d830f79a82ff1688cc549f125509af88a7dbd8 100644
--- a/net/http/http_stream_factory_impl_request.h
+++ b/net/http/http_stream_factory_impl_request.h
@@ -15,11 +15,15 @@
 
 namespace net {
 
+class ClientSocketHandle;
+class SpdySession;
+
 class HttpStreamFactoryImpl::Request : public HttpStreamRequest {
  public:
   Request(const GURL& url,
           HttpStreamFactoryImpl* factory,
           HttpStreamRequest::Delegate* delegate,
+          WebSocketStreamBase::Factory* websocket_stream_factory,
           const BoundNetLog& net_log);
   virtual ~Request();
 
@@ -58,9 +62,13 @@ 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);
+
+  WebSocketStreamBase::Factory* websocket_stream_factory() {
+    return websocket_stream_factory_;
+  }
 
   // HttpStreamRequest::Delegate methods which we implement. Note we don't
   // actually subclass HttpStreamRequest::Delegate.
@@ -69,6 +77,10 @@ class HttpStreamFactoryImpl::Request : public HttpStreamRequest {
                      const SSLConfig& used_ssl_config,
                      const ProxyInfo& used_proxy_info,
                      HttpStreamBase* stream);
+  void OnWebSocketStreamReady(Job* job,
+                              const SSLConfig& used_ssl_config,
+                              const ProxyInfo& used_proxy_info,
+                              WebSocketStreamBase* stream);
   void OnStreamFailed(Job* job, int status, const SSLConfig& used_ssl_config);
   void OnCertificateError(Job* job,
                           int status,
@@ -106,8 +118,12 @@ class HttpStreamFactoryImpl::Request : public HttpStreamRequest {
   // Used to orphan all jobs in |jobs_|.
   void OrphanJobs();
 
+  // Orphan a job if appropriate.

[mmenke, 2013/06/03 21:10:18]

This comment is incorrect.  It may orphan all jobs except |job|.  It's also not
at all clear what "appropriate" means.

[yhirano, 2013/06/04 02:20:13]

I deleted this comment because the (new) name expresses what the function is
well.

+  void Orphan(Job* job);

[mmenke, 2013/06/03 21:10:18]

This name is misleading, since it doesn't orphan |job|, but rather all other
jobs.  I suggest calling this "OnJobSucceeded"

[yhirano, 2013/06/04 02:20:13]

Done.

+
   const GURL url_;
   HttpStreamFactoryImpl* const factory_;
+  WebSocketStreamBase::Factory* const websocket_stream_factory_;
   HttpStreamRequest::Delegate* const delegate_;
   const BoundNetLog net_log_;
 
@@ -128,4 +144,4 @@ class HttpStreamFactoryImpl::Request : public HttpStreamRequest {
 
 }  // namespace net
 
-#endif  // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_H_
+#endif  // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_REQUEST_H_