Land Recent QUIC changes.

net/quic/reliable_quic_stream_test.cc

Index: net/quic/reliable_quic_stream_test.cc
diff --git a/net/quic/reliable_quic_stream_test.cc b/net/quic/reliable_quic_stream_test.cc
index ede58bdffa0f19761a8774c2d24825306ba79364..54f97e8dde7a50b1b89129e54e0e302d173a03c0 100644
--- a/net/quic/reliable_quic_stream_test.cc
+++ b/net/quic/reliable_quic_stream_test.cc
@@ -94,7 +94,8 @@ TEST_F(ReliableQuicStreamTest, WriteAllData) {
   Initialize(kShouldProcessData);
 
   connection_->options()->max_packet_length =
-      1 + QuicPacketCreator::StreamFramePacketOverhead(1, !kIncludeVersion);
+      1 + QuicPacketCreator::StreamFramePacketOverhead(
+          1, PACKET_8BYTE_GUID, !kIncludeVersion, NOT_IN_FEC_GROUP);
   // TODO(rch): figure out how to get StrEq working here.
   //EXPECT_CALL(*session_, WriteData(kStreamId, StrEq(kData1), _, _)).WillOnce(
   EXPECT_CALL(*session_, WriteData(kStreamId, _, _, _)).WillOnce(
@@ -106,7 +107,8 @@ TEST_F(ReliableQuicStreamTest, WriteData) {
   Initialize(kShouldProcessData);
 
   connection_->options()->max_packet_length =
-      1 + QuicPacketCreator::StreamFramePacketOverhead(1, !kIncludeVersion);
+      1 + QuicPacketCreator::StreamFramePacketOverhead(
+          1, PACKET_8BYTE_GUID, !kIncludeVersion, NOT_IN_FEC_GROUP);
   // TODO(rch): figure out how to get StrEq working here.
   //EXPECT_CALL(*session_, WriteData(_, StrEq(kData1), _, _)).WillOnce(
   EXPECT_CALL(*session_, WriteData(_, _, _, _)).WillOnce(
@@ -309,6 +311,7 @@ TEST_F(ReliableQuicStreamTest, ProcessHeadersEarly) {
   stream2_->OnDecompressorAvailable();
   EXPECT_EQ(decompressed_headers2, stream2_->data());
 }
+
 TEST_F(ReliableQuicStreamTest, ProcessHeadersDelay) {
   Initialize(!kShouldProcessData);