[SPDY] Remove SpdyStream::Delegate::OnSendBody()'s return value

net/spdy/spdy_stream.cc

 // 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.
 
 #include "net/spdy/spdy_stream.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 734 matching lines @@
       case STATE_SEND_HEADERS:
         CHECK_EQ(result, OK);
         result = DoSendHeaders();
         break;
       case STATE_SEND_HEADERS_COMPLETE:
         CHECK_EQ(result, OK);
         result = DoSendHeadersComplete();
         break;
       case STATE_SEND_BODY:
         CHECK_EQ(result, OK);
-        result = DoSendBody();
+        DoSendBody();
+        result = ERR_IO_PENDING;

[Ryan Hamilton, 2013/05/22 03:17:30]

Yeah, this looks weird to me.  I think it fits our pattern more consistently by
having DoSendBody return ERR_IO_PENDING.

[akalin, 2013/05/22 08:40:05]

Done.

         break;
       case STATE_SEND_BODY_COMPLETE:
         result = DoSendBodyComplete(result);
         break;
       // This is an intermediary waiting state. This state is reached when all
       // data has been sent, but no data has been received.
       case STATE_WAITING_FOR_RESPONSE:
         io_state_ = STATE_WAITING_FOR_RESPONSE;
         result = ERR_IO_PENDING;
         break;
@@ skipping 129 matching lines @@
 
   io_state_ =
       (delegate_->OnSendHeadersComplete() == MORE_DATA_TO_SEND) ?
       STATE_SEND_BODY : STATE_WAITING_FOR_RESPONSE;
 
   return OK;
 }
 
 // DoSendBody is called to send the optional body for the request.  This call
 // will also be called as each write of a chunk of the body completes.
-int SpdyStream::DoSendBody() {
+void SpdyStream::DoSendBody() {
   // If we're already in the STATE_SEND_BODY state, then we've already
   // sent a portion of the body.  In that case, we need to first consume
   // the bytes written in the body stream.  Note that the bytes written is
   // the number of bytes in the frame that were written, only consume the
   // data portion, of course.
   io_state_ = STATE_SEND_BODY_COMPLETE;
   CHECK(delegate_);
-  int status = delegate_->OnSendBody();
-  CHECK(status == OK || status == ERR_IO_PENDING);
-  return status;
+  delegate_->OnSendBody();
 }
 
 int SpdyStream::DoSendBodyComplete(int result) {
   if (result != OK)
     return result;
 
   if (just_completed_frame_type_ != DATA) {
     NOTREACHED();
     return ERR_UNEXPECTED;
   }
@@ skipping 71 matching lines @@
   UMA_HISTOGRAM_TIMES("Net.SpdyStreamDownloadTime",
       recv_last_byte_time_ - recv_first_byte_time_);
   UMA_HISTOGRAM_TIMES("Net.SpdyStreamTime",
       recv_last_byte_time_ - send_time_);
 
   UMA_HISTOGRAM_COUNTS("Net.SpdySendBytes", send_bytes_);
   UMA_HISTOGRAM_COUNTS("Net.SpdyRecvBytes", recv_bytes_);
 }
 
 }  // namespace net