Land Recent QUIC changes.

net/tools/quic/quic_epoll_connection_helper_test.cc

Index: net/tools/quic/quic_epoll_connection_helper_test.cc
diff --git a/net/tools/quic/quic_epoll_connection_helper_test.cc b/net/tools/quic/quic_epoll_connection_helper_test.cc
index 321565d777ec9026d3658208e23fa92f2a71fdee..bfef189679f9ca5575170fe4d582af0f7f1a249f 100644
--- a/net/tools/quic/quic_epoll_connection_helper_test.cc
+++ b/net/tools/quic/quic_epoll_connection_helper_test.cc
@@ -124,8 +124,8 @@ TEST_F(QuicConnectionHelperTest, DISABLED_TestRetransmission) {
 
   const char buffer[] = "foo";
   const size_t packet_size =
-      GetPacketHeaderSize(
-          PACKET_8BYTE_GUID, kIncludeVersion, NOT_IN_FEC_GROUP) +
+      GetPacketHeaderSize(PACKET_8BYTE_GUID, kIncludeVersion,
+                          PACKET_6BYTE_SEQUENCE_NUMBER, NOT_IN_FEC_GROUP) +
       QuicFramer::GetMinStreamFrameSize() + arraysize(buffer) - 1;
   EXPECT_CALL(*send_algorithm_,
               SentPacket(_, 1, packet_size, NOT_RETRANSMISSION));