Revert 54906 - Refactor HttpNetworkTransaction to eliminate the SPDY...

net/http/http_network_transaction.h

 // Copyright (c) 2010 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_NETWORK_TRANSACTION_H_
 #define NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
 #pragma once
 
 #include <string>
 
@@ skipping 18 matching lines @@
 #include "net/proxy/proxy_service.h"
 #include "net/socket/client_socket_pool.h"
 
 namespace net {
 
 class ClientSocketFactory;
 class ClientSocketHandle;
 class HttpNetworkSession;
 class HttpRequestHeaders;
 class HttpStream;
-class SpdySession;
+class SpdyHttpStream;
 
 class HttpNetworkTransaction : public HttpTransaction {
  public:
   explicit HttpNetworkTransaction(HttpNetworkSession* session);
 
   virtual ~HttpNetworkTransaction();
 
   static void SetHostMappingRules(const std::string& rules);
 
   // Controls whether or not we use the Alternate-Protocol header.
@@ skipping 34 matching lines @@
   virtual uint64 GetUploadProgress() const;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionTest, ResetStateForRestart);
 
   enum State {
     STATE_RESOLVE_PROXY,
     STATE_RESOLVE_PROXY_COMPLETE,
     STATE_INIT_CONNECTION,
     STATE_INIT_CONNECTION_COMPLETE,
-    STATE_INIT_STREAM,
-    STATE_INIT_STREAM_COMPLETE,
     STATE_RESTART_TUNNEL_AUTH,
     STATE_RESTART_TUNNEL_AUTH_COMPLETE,
     STATE_GENERATE_PROXY_AUTH_TOKEN,
     STATE_GENERATE_PROXY_AUTH_TOKEN_COMPLETE,
     STATE_GENERATE_SERVER_AUTH_TOKEN,
     STATE_GENERATE_SERVER_AUTH_TOKEN_COMPLETE,
     STATE_SEND_REQUEST,
     STATE_SEND_REQUEST_COMPLETE,
     STATE_READ_HEADERS,
     STATE_READ_HEADERS_COMPLETE,
     STATE_READ_BODY,
     STATE_READ_BODY_COMPLETE,
     STATE_DRAIN_BODY_FOR_AUTH_RESTART,
     STATE_DRAIN_BODY_FOR_AUTH_RESTART_COMPLETE,
+    STATE_SPDY_GET_STREAM,
+    STATE_SPDY_GET_STREAM_COMPLETE,
+    STATE_SPDY_SEND_REQUEST,
+    STATE_SPDY_SEND_REQUEST_COMPLETE,
+    STATE_SPDY_READ_HEADERS,
+    STATE_SPDY_READ_HEADERS_COMPLETE,
+    STATE_SPDY_READ_BODY,
+    STATE_SPDY_READ_BODY_COMPLETE,
     STATE_NONE
   };
 
   enum AlternateProtocolMode {
     kUnspecified,  // Unspecified, check HttpAlternateProtocols
     kUsingAlternateProtocol,  // Using an alternate protocol
     kDoNotUseAlternateProtocol,  // Failed to connect once, do not try again.
   };
 
   void DoCallback(int result);
   void OnIOComplete(int result);
 
   // Runs the state transition loop.
   int DoLoop(int result);
 
   // Each of these methods corresponds to a State value.  Those with an input
   // argument receive the result from the previous state.  If a method returns
   // ERR_IO_PENDING, then the result from OnIOComplete will be passed to the
   // next state method as the result arg.
   int DoResolveProxy();
   int DoResolveProxyComplete(int result);
   int DoInitConnection();
   int DoInitConnectionComplete(int result);
-  int DoInitStream();
-  int DoInitStreamComplete(int result);
   int DoRestartTunnelAuth();
   int DoRestartTunnelAuthComplete(int result);
   int DoGenerateProxyAuthToken();
   int DoGenerateProxyAuthTokenComplete(int result);
   int DoGenerateServerAuthToken();
   int DoGenerateServerAuthTokenComplete(int result);
   int DoSendRequest();
   int DoSendRequestComplete(int result);
   int DoReadHeaders();
   int DoReadHeadersComplete(int result);
   int DoReadBody();
   int DoReadBodyComplete(int result);
   int DoDrainBodyForAuthRestart();
   int DoDrainBodyForAuthRestartComplete(int result);
+  int DoSpdyGetStream();
+  int DoSpdyGetStreamComplete(int result);
+  int DoSpdySendRequest();
+  int DoSpdySendRequestComplete(int result);
+  int DoSpdyReadHeaders();
+  int DoSpdyReadHeadersComplete(int result);
+  int DoSpdyReadBody();
+  int DoSpdyReadBodyComplete(int result);
 
   // Record histograms of latency until Connect() completes.
   static void LogHttpConnectedMetrics(const ClientSocketHandle& handle);
 
   // Record histogram of time until first byte of header is received.
   void LogTransactionConnectedMetrics();
 
   // Record histogram of latency (durations until last byte received).
   void LogTransactionMetrics() const;
 
@@ skipping 99 matching lines @@
   scoped_refptr<HttpNetworkSession> session_;
 
   BoundNetLog net_log_;
   const HttpRequestInfo* request_;
   HttpResponseInfo response_;
 
   ProxyService::PacRequest* pac_request_;
   ProxyInfo proxy_info_;
 
   scoped_ptr<ClientSocketHandle> connection_;
-  scoped_ptr<HttpStream> stream_;
-  scoped_refptr<SpdySession> spdy_session_;
+  scoped_ptr<HttpStream> http_stream_;
+  scoped_ptr<SpdyHttpStream> spdy_http_stream_;
   bool reused_socket_;
 
   // True if we've validated the headers that the stream parser has returned.
   bool headers_valid_;
 
   // True if we've logged the time of the first response byte.  Used to
   // prevent logging across authentication activity where we see multiple
   // responses.
   bool logged_response_time_;
 
@@ skipping 46 matching lines @@
   bool establishing_tunnel_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpNetworkTransaction);
 };
 
 int ConvertRequestPriorityToSpdyPriority(RequestPriority priority);
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_NETWORK_TRANSACTION_H_