[SPDY] Refactor SpdyStream::Delegate

net/spdy/spdy_http_stream.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_SPDY_SPDY_HTTP_STREAM_H_
 #define NET_SPDY_SPDY_HTTP_STREAM_H_
 
 #include <list>
 
 #include "base/basictypes.h"
@@ skipping 67 matching lines @@
   virtual bool IsConnectionReusable() const OVERRIDE;
   virtual bool GetLoadTimingInfo(
       LoadTimingInfo* load_timing_info) const OVERRIDE;
   virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
   virtual void GetSSLCertRequestInfo(
       SSLCertRequestInfo* cert_request_info) OVERRIDE;
   virtual bool IsSpdyHttpStream() const OVERRIDE;
   virtual void Drain(HttpNetworkSession* session) OVERRIDE;
 
   // SpdyStream::Delegate implementation.
-  virtual void OnSendRequestHeadersComplete() OVERRIDE;
-  virtual void OnSendBody() OVERRIDE;
-  virtual void OnSendBodyComplete() OVERRIDE;
-  virtual int OnResponseReceived(const SpdyHeaderBlock& response,
-                                 base::Time response_time,
-                                 int status) OVERRIDE;
+  virtual void OnRequestHeadersSent() OVERRIDE;
+  virtual int OnResponseHeadersReceived(const SpdyHeaderBlock& response,
+                                        base::Time response_time,
+                                        int status) OVERRIDE;
   virtual int OnDataReceived(scoped_ptr<SpdyBuffer> buffer) OVERRIDE;
   virtual void OnDataSent() OVERRIDE;
   virtual void OnClose(int status) OVERRIDE;
 
  private:
+  bool HasUploadData() const;
+
   void OnStreamCreated(const CompletionCallback& callback, int rv);
 
-  // Reads the data (whether chunked or not) from the request body
-  // stream and sends it. The read and subsequent sending may happen
-  // asynchronously.
+  // Reads the remaining data (whether chunked or not) from the
+  // request body stream and sends it if there's any. The read and
+  // subsequent sending may happen asynchronously. Must be called only
+  // when HasUploadData() is true.
   void ReadAndSendRequestBodyData();
 
   // Called when data has just been read from the request body stream;
   // does the actual sending of data.
   void OnRequestBodyReadCompleted(int status);
 
-  // Queues some request body data to be sent.
-  void SendRequestBodyData();
-
   // Call the user callback.
   void DoCallback(int rv);
 
   void ScheduleBufferedReadCallback();
 
   // Returns true if the callback is invoked.
   bool DoBufferedReadCallback();
   bool ShouldWaitForMoreBufferedData() const;
 
   base::WeakPtrFactory<SpdyHttpStream> weak_factory_;
 
   const scoped_refptr<SpdySession> spdy_session_;
   SpdyStreamRequest stream_request_;
   base::WeakPtr<SpdyStream> stream_;
 
   bool stream_closed_;
 
   // Set only when |stream_closed_| is true.
   int closed_stream_status_;
   SpdyStreamId closed_stream_id_;
 
   // The request to send.
   const HttpRequestInfo* request_info_;
 
-  bool has_upload_data_;
-
   // |response_info_| is the HTTP response data object which is filled in
   // when a SYN_REPLY comes in for the stream.
   // It is not owned by this stream object, or point to |push_response_info_|.
   HttpResponseInfo* response_info_;
 
   scoped_ptr<HttpResponseInfo> push_response_info_;
 
   bool response_headers_received_;  // Indicates waiting for more HEADERS.
 
   // We buffer the response body as it arrives asynchronously from the stream.
   SpdyReadQueue response_body_queue_;
 
   CompletionCallback callback_;
 
   // User provided buffer for the ReadResponseBody() response.
   scoped_refptr<IOBuffer> user_buffer_;
   int user_buffer_len_;
 
   // Temporary buffer used to read the request body from UploadDataStream.
-  scoped_refptr<IOBufferWithSize> raw_request_body_buf_;
-  int raw_request_body_buf_size_;
+  scoped_refptr<IOBufferWithSize> request_body_buf_;
+  int request_body_buf_size_;
 
   // Is there a scheduled read callback pending.
   bool buffered_read_callback_pending_;
   // Has more data been received from the network during the wait for the
   // scheduled read callback.
   bool more_read_data_pending_;
 
   // Is this spdy stream direct to the origin server (or to a proxy).
   bool direct_;
 
   DISALLOW_COPY_AND_ASSIGN(SpdyHttpStream);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_HTTP_STREAM_H_