Added a net::BidirectionalStream to expose a bidirectional streaming interface

net/http/http_stream_factory_impl_request.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_REQUEST_H_
 #define NET_HTTP_HTTP_STREAM_FACTORY_IMPL_REQUEST_H_
 
 #include <set>
 #include "base/memory/scoped_ptr.h"
 #include "net/http/http_stream_factory_impl.h"
 #include "net/log/net_log.h"
 #include "net/socket/connection_attempts.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/spdy/spdy_session_key.h"
 #include "net/ssl/ssl_failure_state.h"
 #include "url/gurl.h"
 
 namespace net {
 
 class ClientSocketHandle;
 class HttpStream;
 class SpdySession;
 
 class HttpStreamFactoryImpl::Request : public HttpStreamRequest {
  public:
+  // Indicates which type of stream is requested.
+  enum StreamType {
+    BIDIRECTIONAL_STREAM_SPDY_JOB,
+    HTTP_STREAM,
+  };
+
   Request(const GURL& url,
           HttpStreamFactoryImpl* factory,
           HttpStreamRequest::Delegate* delegate,
           WebSocketHandshakeStreamBase::CreateHelper*
               websocket_handshake_stream_create_helper,
-          const BoundNetLog& net_log);
+          const BoundNetLog& net_log,
+          StreamType stream_type);
+
   ~Request() override;
 
   // The GURL from the HttpRequestInfo the started the Request.
   const GURL& url() const { return url_; }
 
   const BoundNetLog& net_log() const { return net_log_; }
 
   // Called when the Job determines the appropriate |spdy_session_key| for the
   // Request. Note that this does not mean that SPDY is necessarily supported
   // for this SpdySessionKey, since we may need to wait for NPN to complete
   // before knowing if SPDY is available.
   void SetSpdySessionKey(const SpdySessionKey& spdy_session_key);
   bool HasSpdySessionKey() const;
 
   // Attaches |job| to this request. Does not mean that Request will use |job|,
   // but Request will own |job|.
   void AttachJob(HttpStreamFactoryImpl::Job* job);
 
   // Marks completion of the request. Must be called before OnStreamReady().
   void Complete(bool was_npn_negotiated,
                 NextProto protocol_negotiated,
                 bool using_spdy);
 
   // If this Request has a |spdy_session_key_|, remove this session from the
   // SpdySessionRequestMap.
   void RemoveRequestFromSpdySessionRequestMap();
 
   // Called by an attached Job if it sets up a SpdySession.
-  void OnNewSpdySessionReady(Job* job,
-                             scoped_ptr<HttpStream> stream,
-                             const base::WeakPtr<SpdySession>& spdy_session,
-                             bool direct);
+  // |stream| is null when |for_bidirectional| is true.
+  // |bidirectional_stream_spdy_job| is null when |for_bidirectional| is false.
+  void OnNewSpdySessionReady(
+      Job* job,
+      scoped_ptr<HttpStream> stream,
+      scoped_ptr<BidirectionalStreamJob> bidirectional_stream_spdy_job,

[mef, 2015/12/21 17:31:43]

Forward-declare BidirectionalStreamJob?

[xunjieli, 2015/12/21 22:01:22]

Done.

+      const base::WeakPtr<SpdySession>& spdy_session,
+      bool direct);
 
   // Called by an attached Job to record connection attempts made by the socket
   // layer for this stream request.
   void AddConnectionAttempts(const ConnectionAttempts& attempts);
 
   WebSocketHandshakeStreamBase::CreateHelper*
   websocket_handshake_stream_create_helper() {
     return websocket_handshake_stream_create_helper_;
   }
 
   // HttpStreamRequest::Delegate methods which we implement. Note we don't
   // actually subclass HttpStreamRequest::Delegate.
 
   void OnStreamReady(Job* job,
                      const SSLConfig& used_ssl_config,
                      const ProxyInfo& used_proxy_info,
                      HttpStream* stream);
+  void OnBidirectionalStreamJobReady(Job* job,
+                                     const SSLConfig& used_ssl_config,
+                                     const ProxyInfo& used_proxy_info,
+                                     BidirectionalStreamJob* stream);
+
   void OnWebSocketHandshakeStreamReady(Job* job,
                                        const SSLConfig& used_ssl_config,
                                        const ProxyInfo& used_proxy_info,
                                        WebSocketHandshakeStreamBase* stream);
   void OnStreamFailed(Job* job,
                       int status,
                       const SSLConfig& used_ssl_config,
                       SSLFailureState ssl_failure_state);
   void OnCertificateError(Job* job,
                           int status,
@@ skipping 16 matching lines @@
 
   // HttpStreamRequest methods.
 
   int RestartTunnelWithProxyAuth(const AuthCredentials& credentials) override;
   void SetPriority(RequestPriority priority) override;
   LoadState GetLoadState() const override;
   bool was_npn_negotiated() const override;
   NextProto protocol_negotiated() const override;
   bool using_spdy() const override;
   const ConnectionAttempts& connection_attempts() const override;
+  bool for_bidirectional() const { return for_bidirectional_; }
 
  private:
   // Used to bind |job| to the request and orphan all other jobs in |jobs_|.
   void BindJob(Job* job);
 
   // Used to orphan all jobs in |jobs_|.
   void OrphanJobs();
 
   // Used to cancel all jobs in |jobs_|.
   void CancelJobs();
@@ skipping 13 matching lines @@
   std::set<HttpStreamFactoryImpl::Job*> jobs_;
   scoped_ptr<const SpdySessionKey> spdy_session_key_;
 
   bool completed_;
   bool was_npn_negotiated_;
   // Protocol negotiated with the server.
   NextProto protocol_negotiated_;
   bool using_spdy_;
   ConnectionAttempts connection_attempts_;
 
+  const bool for_bidirectional_;
   DISALLOW_COPY_AND_ASSIGN(Request);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_REQUEST_H_