Revert of Implement QUIC-based net::BidirectionalStream

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/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/http/http_stream_factory_impl.h"
 #include "net/log/net_log.h"
 #include "net/net_features.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 BidirectionalStreamJob;
 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,
           StreamType stream_type);
 
   ~Request() override;
 
@@ skipping 16 matching lines @@
   // 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.
-  // |stream| is null when |stream_type| is HttpStreamRequest::HTTP_STREAM.
-  // |bidirectional_stream_spdy_job| is null when |stream_type| is
-  // HttpStreamRequest::BIDIRECTIONAL_STREAM.
+  // |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,
 #if BUILDFLAG(ENABLE_BIDIRECTIONAL_STREAM)
       scoped_ptr<BidirectionalStreamJob> bidirectional_stream_spdy_job,
 #else
       void* unused,
 #endif
       const base::WeakPtr<SpdySession>& spdy_session,
       bool direct);
@@ skipping 48 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;
-  HttpStreamRequest::StreamType stream_type() const { return stream_type_; }
+  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 HttpStreamRequest::StreamType stream_type_;
+  const bool for_bidirectional_;
   DISALLOW_COPY_AND_ASSIGN(Request);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_REQUEST_H_