Introduce RequestWebSocketStream into HttpStreamFactory

net/http/http_stream_factory_impl.h

 // 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.
 
 #ifndef NET_HTTP_HTTP_STREAM_FACTORY_IMPL_H_
 #define NET_HTTP_HTTP_STREAM_FACTORY_IMPL_H_
 
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 10 matching lines @@
 namespace net {
 
 class HttpNetworkSession;
 class HttpPipelinedHost;
 class SpdySession;
 
 class NET_EXPORT_PRIVATE HttpStreamFactoryImpl :
     public HttpStreamFactory,
     public HttpPipelinedHostPool::Delegate {
  public:
-  explicit HttpStreamFactoryImpl(HttpNetworkSession* session);
+  // You can call RequestStream if and only if |for_websocket| is false.
+  // You can call RequestWebSocketStream if and only if |for_websocket| is true.

[mmenke, 2013/05/24 14:53:22]

nit:  Some people feel that "you" shouldn't be used in comments, since it's
somewhat ambiguous.  I suggest just using passing voice, something along the
lines of "RequestStream may only be called if |for_websocket| is false...", etc.

[yhirano, 2013/05/27 09:21:32]

Done.

+  explicit HttpStreamFactoryImpl(HttpNetworkSession* session,
+                                 bool for_websocket);

[mmenke, 2013/05/24 14:53:22]

nit:  Explicit not needed, since we have two arguments now.

[mmenke, 2013/05/24 14:53:22]

Think "for_websockets" may be a little clearer.

[yhirano, 2013/05/27 09:21:32]

Done.

[yhirano, 2013/05/27 09:21:32]

Done.

   virtual ~HttpStreamFactoryImpl();
 
   // HttpStreamFactory interface
   virtual HttpStreamRequest* RequestStream(
       const HttpRequestInfo& info,
       RequestPriority priority,
       const SSLConfig& server_ssl_config,
       const SSLConfig& proxy_ssl_config,
       HttpStreamRequest::Delegate* delegate,
       const BoundNetLog& net_log) OVERRIDE;
 
+  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) OVERRIDE;
+
   virtual void PreconnectStreams(int num_streams,
                                  const HttpRequestInfo& info,
                                  RequestPriority priority,
                                  const SSLConfig& server_ssl_config,
                                  const SSLConfig& proxy_ssl_config) OVERRIDE;
   virtual base::Value* PipelineInfoToValue() const OVERRIDE;
   virtual const HostMappingRules* GetHostMappingRules() const OVERRIDE;
 
   // HttpPipelinedHostPool::Delegate interface
   virtual void OnHttpPipelinedHostHasAdditionalCapacity(
       HttpPipelinedHost* host) OVERRIDE;
 
  private:
   class Request;
   class Job;
 
   typedef std::set<Request*> RequestSet;
   typedef std::vector<Request*> RequestVector;
   typedef std::map<SpdySessionKey, RequestSet> SpdySessionRequestMap;
   typedef std::map<HttpPipelinedHost::Key,
                    RequestVector> HttpPipeliningRequestMap;
 
+  HttpStreamRequest* RequestStreamInternal(
+      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);
+
   PortAlternateProtocolPair GetAlternateProtocolRequestFor(
       const GURL& original_url,
       GURL* alternate_url) const;
 
   // Detaches |job| from |request|.
   void OrphanJob(Job* job, const Request* request);
 
   // Called when a SpdySession is ready. It will find appropriate Requests and
   // fulfill them. |direct| indicates whether or not |spdy_session| uses a
   // proxy.
-  void OnSpdySessionReady(scoped_refptr<SpdySession> spdy_session,
-                          bool direct,
-                          const SSLConfig& used_ssl_config,
-                          const ProxyInfo& used_proxy_info,
-                          bool was_npn_negotiated,
-                          NextProto protocol_negotiated,
-                          bool using_spdy,
-                          const BoundNetLog& net_log);
+  void OnNewSpdySessionReady(scoped_refptr<SpdySession> spdy_session,
+                             bool direct,
+                             const SSLConfig& used_ssl_config,
+                             const ProxyInfo& used_proxy_info,
+                             bool was_npn_negotiated,
+                             NextProto protocol_negotiated,
+                             bool using_spdy,
+                             const BoundNetLog& net_log);
 
   // Called when the Job detects that the endpoint indicated by the
   // Alternate-Protocol does not work. Lets the factory update
   // HttpAlternateProtocols with the failure and resets the SPDY session key.
   void OnBrokenAlternateProtocol(const Job*, const HostPortPair& origin);
 
   // Invoked when an orphaned Job finishes.
   void OnOrphanedJobComplete(const Job* job);
 
   // Invoked when the Job finishes preconnecting sockets.
@@ skipping 24 matching lines @@
   // not be canceled when Requests are canceled. Therefore, in
   // ~HttpStreamFactoryImpl, it is possible for some jobs to still exist in this
   // set. Leftover jobs will be deleted when the factory is destroyed.
   std::set<const Job*> orphaned_job_set_;
 
   // These jobs correspond to preconnect requests and have no associated Request
   // object. They're owned by HttpStreamFactoryImpl. Leftover jobs will be
   // deleted when the factory is destroyed.
   std::set<const Job*> preconnect_job_set_;
 
+  const bool for_websocket_;
   DISALLOW_COPY_AND_ASSIGN(HttpStreamFactoryImpl);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_H_