Land Recent QUIC changes

net/tools/quic/quic_spdy_server_stream.cc

Index: net/tools/quic/quic_spdy_server_stream.cc
diff --git a/net/tools/quic/quic_spdy_server_stream.cc b/net/tools/quic/quic_spdy_server_stream.cc
index 57c520e02af7053f01378157c09f91050e41df68..94afaa0aad482ea7519d8aba999d4f2b22b52bed 100644
--- a/net/tools/quic/quic_spdy_server_stream.cc
+++ b/net/tools/quic/quic_spdy_server_stream.cc
@@ -4,6 +4,7 @@
 
 #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"
 
@@ -62,8 +63,11 @@ void QuicSpdyServerStream::TerminateFromPeer(bool half_close) {
 
 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);
 }