[SPDY] Avoid leaking bytes from the session flow control receive window

net/spdy/spdy_session.h

Index: net/spdy/spdy_session.h
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index 9f4357bcce9266ebe2fbb15d4477586fc36e8133..cbcd15fd7e147dd99508887346d6e3634d9637e6 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -312,13 +312,6 @@ class NET_EXPORT SpdySession : public base::RefCounted<SpdySession>,
   void SendStreamWindowUpdate(SpdyStreamId stream_id,
                               uint32 delta_window_size);
 
-  // Called by a stream to increase this session's receive window size
-  // by |delta_window_size|, which must be at least 1 and must not
-  // cause this session's receive window size to overflow, possibly
-  // also sending a WINDOW_UPDATE frame. Does nothing if session flow
-  // control is turned off.
-  void IncreaseRecvWindowSize(int32 delta_window_size);
-
   // If session is closed, no new streams/transactions should be created.
   bool IsClosed() const { return state_ == CLOSED; }
 
@@ -466,6 +459,8 @@ class NET_EXPORT SpdySession : public base::RefCounted<SpdySession>,
   FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, AdjustSendWindowSize31);
   FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test,
                            SessionFlowControlInactiveStream31);
+  FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test,
+                           SessionFlowControlNoReceiveLeaks31);
   FRIEND_TEST_ALL_PREFIXES(SpdySessionSpdy3Test, SessionFlowControlEndToEnd31);
 
   typedef std::deque<SpdyStreamRequest*> PendingStreamRequestQueue;
@@ -668,6 +663,15 @@ class NET_EXPORT SpdySession : public base::RefCounted<SpdySession>,
   // cause this session's send window size to go negative.
   void DecreaseSendWindowSize(int32 delta_window_size);
 
+  // Called by SpdyBuffers (via ConsumeCallbacks) to increase this
+  // session's receive window size by |delta_window_size|, which must
+  // be at least 1 and must not cause this session's receive window
+  // size to overflow, possibly also sending a WINDOW_UPDATE
+  // frame. Also called during initialization to set the initial
+  // receive window size. Does nothing if session flow control is
+  // turned off.
+  void IncreaseRecvWindowSize(size_t delta_window_size);
+
   // If session flow control is turned on, called by OnStreamFrameData
   // (which is in turn called by the framer) to decrease this
   // session's receive window size by |delta_window_size|, which must