Update from https://crrev.com/312398

net/quic/quic_session_test.cc

Index: net/quic/quic_session_test.cc
diff --git a/net/quic/quic_session_test.cc b/net/quic/quic_session_test.cc
index 96d30b8c5819228d29c5773b63b79c9e93ddeb46..842c4eb3e1dcb9d4db4412d2346c8360bc32d833 100644
--- a/net/quic/quic_session_test.cc
+++ b/net/quic/quic_session_test.cc
@@ -316,6 +316,10 @@ TEST_P(QuicSessionTest, StreamIdTooLarge) {
 
 TEST_P(QuicSessionTest, DecompressionError) {
   QuicHeadersStream* stream = QuicSessionPeer::GetHeadersStream(&session_);
+  if (version() > QUIC_VERSION_23) {
+    // This test does not apply to HPACK compression.
+    return;
+  }
   const unsigned char data[] = {
     0x80, 0x03, 0x00, 0x01,  // SPDY/3 SYN_STREAM frame
     0x00, 0x00, 0x00, 0x25,  // flags/length
@@ -723,12 +727,12 @@ TEST_P(QuicSessionTest, HandshakeUnblocksFlowControlBlockedHeadersStream) {
     headers["header"] = base::Uint64ToString(base::RandUint64()) +
         base::Uint64ToString(base::RandUint64()) +
         base::Uint64ToString(base::RandUint64());
-    headers_stream->WriteHeaders(stream_id, headers, true, nullptr);
+    headers_stream->WriteHeaders(stream_id, headers, true, 0, nullptr);
     stream_id += 2;
   }
   // Write once more to ensure that the headers stream has buffered data. The
   // random headers may have exactly filled the flow control window.
-  headers_stream->WriteHeaders(stream_id, headers, true, nullptr);
+  headers_stream->WriteHeaders(stream_id, headers, true, 0, nullptr);
   EXPECT_TRUE(headers_stream->HasBufferedData());
 
   EXPECT_TRUE(headers_stream->flow_controller()->IsBlocked());