Merge ReliableQuicStream::WriteData with

net/tools/quic/quic_spdy_server_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/tools/quic/quic_spdy_server_stream.h"
 
 #include "base/memory/singleton.h"
 #include "net/quic/quic_session.h"
 #include "net/spdy/spdy_framer.h"
 #include "net/tools/quic/quic_in_memory_cache.h"
@@ skipping 53 matching lines @@
 }
 
 void QuicSpdyServerStream::SendHeaders(
     const BalsaHeaders& response_headers) {
   SpdyHeaderBlock header_block =
       SpdyUtils::ResponseHeadersToSpdyHeaders(response_headers);
 
   string headers_string;
   headers_string = session()->compressor()->CompressHeaders(header_block);
 
-  WriteData(headers_string, false);
+  WriteOrBufferData(headers_string, false);
 }
 
 int QuicSpdyServerStream::ParseRequestHeaders() {
   size_t read_buf_len = static_cast<size_t>(read_buf_->offset());
   SpdyFramer framer(SPDY3);
   SpdyHeaderBlock headers;
   char* data = read_buf_->StartOfBuffer();
   size_t len = framer.ParseHeaderBlockInBuffer(data, read_buf_->offset(),
                                                &headers);
   if (len == 0) {
@@ skipping 17 matching lines @@
 void QuicSpdyServerStream::SendResponse() {
   // Find response in cache. If not found, send error response.
   const QuicInMemoryCache::Response* response =
       QuicInMemoryCache::GetInstance()->GetResponse(headers_);
   if (response == NULL) {
     SendErrorResponse();
     return;
   }
 
   DLOG(INFO) << "Sending response for stream " << id();
-  SendHeaders(response->headers());
-  WriteData(response->body(), true);
+  SendHeadersAndBody(response->headers(), response->body());
 }
 
 void QuicSpdyServerStream::SendErrorResponse() {
   DLOG(INFO) << "Sending error response for stream " << id();
   BalsaHeaders headers;
   headers.SetResponseFirstlineFromStringPieces(
       "HTTP/1.1", "500", "Server Error");
   headers.ReplaceOrAppendHeader("content-length", "3");
-  SendHeaders(headers);
-  WriteData("bad", true);
+  SendHeadersAndBody(headers, "bad");
 }
 
-QuicConsumedData QuicSpdyServerStream::WriteData(StringPiece data, bool fin) {
+void QuicSpdyServerStream:: SendHeadersAndBody(
+    const BalsaHeaders& response_headers,
+    StringPiece data) {
   // We only support SPDY and HTTP, and neither handles bidirectional streaming.
   if (!read_side_closed()) {
     CloseReadSide();
   }
-  return ReliableQuicStream::WriteData(data, fin);
+  SendHeaders(response_headers);
+  WriteOrBufferData(data, true);
 }
 
 }  // namespace tools
 }  // namespace net