Land Recent QUIC changes

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 "net/quic/quic_session.h"
 #include "net/spdy/spdy_framer.h"
 #include "net/tools/quic/spdy_utils.h"
 
 using std::string;
 
 namespace net {
 namespace tools {
 
 static const size_t kHeaderBufInitialSize = 4096;
 
@@ skipping 38 matching lines @@
              BalsaHeadersEnums::VALID_CONTENT_LENGTH) &&
              mutable_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 =
-      SpdyUtils::SerializeResponseHeaders(response_headers);
+      session()->compressor()->CompressHeaders(header_block);
+
   WriteData(headers, false);
 }
 
 int QuicSpdyServerStream::ParseRequestHeaders() {
   size_t read_buf_len = static_cast<size_t>(read_buf_->offset());
   SpdyFramer framer(3);
   SpdyHeaderBlock headers;
   char* data = read_buf_->StartOfBuffer();
   size_t len = framer.ParseHeaderBlockInBuffer(data, read_buf_->offset(),
                                                &headers);
@@ skipping 10 matching lines @@
   if (delta > 0) {
     mutable_body()->append(data + len, delta);
   }
 
   request_headers_received_ = true;
   return len;
 }
 
 }  // namespace tools
 }  // namespace net