Revert 181390 "SPDY - implement greedy approach to read all the ..."

net/spdy/spdy_session.h

Index: net/spdy/spdy_session.h
===================================================================
--- net/spdy/spdy_session.h	(revision 192196)
+++ net/spdy/spdy_session.h	(working copy)
@@ -46,10 +46,6 @@
 // Specifies the maxiumum concurrent streams server could send (via push).
 const int kMaxConcurrentPushedStreams = 1000;
 
-// Specifies the number of bytes read synchronously (without yielding) if the
-// data is available.
-const int kMaxReadBytes = 32 * 1024;
-
 // The initial receive window size for both streams and sessions.
 const int32 kDefaultInitialRecvWindowSize = 10 * 1024 * 1024;  // 10MB
 
@@ -340,7 +336,7 @@
   void IncreaseRecvWindowSize(int32 delta_window_size);
 
   // If session is closed, no new streams/transactions should be created.
-  bool IsClosed() const { return state_ == STATE_CLOSED; }
+  bool IsClosed() const { return state_ == CLOSED; }
 
   // Closes this session.  This will close all active streams and mark
   // the session as permanently closed.
@@ -490,11 +486,10 @@
                               SpdyIOBufferProducerCompare> WriteQueue;
 
   enum State {
-    STATE_IDLE,
-    STATE_CONNECTING,
-    STATE_DO_READ,
-    STATE_DO_READ_COMPLETE,
-    STATE_CLOSED
+    IDLE,
+    CONNECTING,
+    CONNECTED,
+    CLOSED
   };
 
   virtual ~SpdySession();
@@ -522,21 +517,6 @@
   // possible.
   void ProcessPendingStreamRequests();
 
-  // Start the DoLoop to read data from socket.
-  void StartRead();
-
-  // Try to make progress by reading and processing data.
-  int DoLoop(int result);
-  // The implementations of STATE_DO_READ/STATE_DO_READ_COMPLETE state changes
-  // of the state machine.
-  int DoRead();
-  int DoReadComplete(int bytes_read);
-
-  // Check if session is connected or not.
-  bool IsConnected() const {
-    return state_ == STATE_DO_READ || state_ == STATE_DO_READ_COMPLETE;
-  }
-
   // IO Callbacks
   void OnReadComplete(int result);
   void OnWriteComplete(int result);
@@ -575,6 +555,10 @@
   // haven't received any data in |kHungInterval| time period.
   void CheckPingStatus(base::TimeTicks last_check_time);
 
+  // Start reading from the socket.
+  // Returns OK on success, or an error on failure.
+  net::Error ReadSocket();
+
   // Write current data to the socket.
   void WriteSocketLater();
   void WriteSocket();
@@ -738,6 +722,7 @@
 
   // The read buffer used to read data from the socket.
   scoped_refptr<IOBuffer> read_buffer_;
+  bool read_pending_;
 
   int stream_hi_water_mark_;  // The next stream id to use.
 
@@ -807,15 +792,7 @@
   int streams_pushed_count_;
   int streams_pushed_and_claimed_count_;
   int streams_abandoned_count_;
-
-  // |total_bytes_received_| keeps track of all the bytes read by the
-  // SpdySession. It is used by the |Net.SpdySettingsCwnd...| histograms.
-  int total_bytes_received_;
-
-  // |bytes_read_| keeps track of number of bytes read continously in the
-  // DoLoop() without yielding.
-  int bytes_read_;
-
+  int bytes_received_;
   bool sent_settings_;      // Did this session send settings when it started.
   bool received_settings_;  // Did this session receive at least one settings
                             // frame.