Land Recent QUIC changes.

net/quic/quic_spdy_decompressor_test.cc

Index: net/quic/quic_spdy_decompressor_test.cc
diff --git a/net/quic/quic_spdy_decompressor_test.cc b/net/quic/quic_spdy_decompressor_test.cc
index b2fbb37b51db5c9c99adbccfcb95686584a4361b..1e6339691fa182ab96f486c3c8a26982132322b0 100644
--- a/net/quic/quic_spdy_decompressor_test.cc
+++ b/net/quic/quic_spdy_decompressor_test.cc
@@ -52,6 +52,22 @@ TEST_F(QuicSpdyDecompressorTest, DecompressAndIgnoreTrailingData) {
   EXPECT_EQ(SpdyUtils::SerializeUncompressedHeaders(headers), visitor_.data());
 }
 
+TEST_F(QuicSpdyDecompressorTest, DecompressError) {
+  SpdyHeaderBlock headers;
+  headers[":host"] = "www.google.com";
+  headers[":path"] = "/index.hml";
+  headers[":scheme"] = "https";
+
+  EXPECT_EQ(1u, decompressor_.current_header_id());
+  string compressed_headers = compressor_.CompressHeaders(headers).substr(4);
+  compressed_headers[compressed_headers.length() - 1] ^= 0x01;
+  EXPECT_NE(compressed_headers.length(),
+            decompressor_.DecompressData(compressed_headers, &visitor_));
+
+  EXPECT_TRUE(visitor_.error());
+  EXPECT_EQ("", visitor_.data());
+}
+
 }  // namespace
 }  // namespace test
 }  // namespace net