Minor cleanup of QuicSpdyServerStream and QuicSpdyClientStream.

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 36 matching lines @@
 }
 
 void QuicSpdyServerStream::OnFinRead() {
   ReliableQuicStream::OnFinRead();
   if (write_side_closed() || fin_buffered()) {
     return;
   }
 
   if (!request_headers_received_) {
     SendErrorResponse();  // We're not done reading headers.
-  } else if ((headers().content_length_status() ==
+  } else if ((headers_.content_length_status() ==
              BalsaHeadersEnums::VALID_CONTENT_LENGTH) &&
-             body_.size() != headers().content_length()) {
+             body_.size() != headers_.content_length()) {
     SendErrorResponse();  // Invalid content length
   } else {
     SendResponse();
   }
 }
 
-void QuicSpdyServerStream::SendHeaders(
-    const BalsaHeaders& response_headers) {
-  SpdyHeaderBlock header_block =
-      SpdyUtils::ResponseHeadersToSpdyHeaders(response_headers);
-
-  string headers_string;
-  headers_string = session()->compressor()->CompressHeaders(header_block);
-
-  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) {
     return -1;
   }
@@ skipping 29 matching lines @@
   DLOG(INFO) << "Sending error response for stream " << id();
   BalsaHeaders headers;
   headers.SetResponseFirstlineFromStringPieces(
       "HTTP/1.1", "500", "Server Error");
   headers.ReplaceOrAppendHeader("content-length", "3");
   SendHeadersAndBody(headers, "bad");
 }
 
 void QuicSpdyServerStream:: SendHeadersAndBody(
     const BalsaHeaders& response_headers,
-    StringPiece data) {
+    StringPiece body) {
   // We only support SPDY and HTTP, and neither handles bidirectional streaming.
   if (!read_side_closed()) {
     CloseReadSide();
   }
-  SendHeaders(response_headers);
-  WriteOrBufferData(data, true);
+
+  SpdyHeaderBlock header_block =
+      SpdyUtils::ResponseHeadersToSpdyHeaders(response_headers);
+
+  string headers_string =
+      session()->compressor()->CompressHeaders(header_block);
+    WriteOrBufferData(headers_string, body.empty());
+
+  if (!body.empty()) {
+    WriteOrBufferData(body, true);
+  }
 }
 
 }  // namespace tools
 }  // namespace net