Landing Recent QUIC changes until 10:38 AM, Oct 17, 2016 UTC-4

net/quic/core/quic_framer_test.cc

Index: net/quic/core/quic_framer_test.cc
diff --git a/net/quic/core/quic_framer_test.cc b/net/quic/core/quic_framer_test.cc
index 1ae77ee27c4a3aa712f7aa2ed7ac116286d41e76..0d4f9ba4d667ab9cd257ffc279750f9b176df536 100644
--- a/net/quic/core/quic_framer_test.cc
+++ b/net/quic/core/quic_framer_test.cc
@@ -1187,11 +1187,7 @@ TEST_P(QuicFramerTest, ReceivedPacketOnClosedPath) {
 }
 
 TEST_P(QuicFramerTest, PacketHeaderWith4BytePacketNumber) {
-  if (FLAGS_quic_packet_numbers_largest_received) {
-    QuicFramerPeer::SetLargestPacketNumber(&framer_, kPacketNumber - 2);
-  } else {
-    QuicFramerPeer::SetLastPacketNumber(&framer_, kPacketNumber - 2);
-  }
+  QuicFramerPeer::SetLargestPacketNumber(&framer_, kPacketNumber - 2);
 
   // clang-format off
   unsigned char packet[] = {
@@ -1261,11 +1257,7 @@ TEST_P(QuicFramerTest, PacketHeaderWith4BytePacketNumber) {
 }
 
 TEST_P(QuicFramerTest, PacketHeaderWith2BytePacketNumber) {
-  if (FLAGS_quic_packet_numbers_largest_received) {
-    QuicFramerPeer::SetLargestPacketNumber(&framer_, kPacketNumber - 2);
-  } else {
-    QuicFramerPeer::SetLastPacketNumber(&framer_, kPacketNumber - 2);
-  }
+  QuicFramerPeer::SetLargestPacketNumber(&framer_, kPacketNumber - 2);
 
   // clang-format off
   unsigned char packet[] = {
@@ -1337,11 +1329,7 @@ TEST_P(QuicFramerTest, PacketHeaderWith2BytePacketNumber) {
 }
 
 TEST_P(QuicFramerTest, PacketHeaderWith1BytePacketNumber) {
-  if (FLAGS_quic_packet_numbers_largest_received) {
-    QuicFramerPeer::SetLargestPacketNumber(&framer_, kPacketNumber - 2);
-  } else {
-    QuicFramerPeer::SetLastPacketNumber(&framer_, kPacketNumber - 2);
-  }
+  QuicFramerPeer::SetLargestPacketNumber(&framer_, kPacketNumber - 2);
 
   // clang-format off
   unsigned char packet[] = {
@@ -1413,7 +1401,6 @@ TEST_P(QuicFramerTest, PacketHeaderWith1BytePacketNumber) {
 }
 
 TEST_P(QuicFramerTest, PacketNumberDecreasesThenIncreases) {
-  FLAGS_quic_packet_numbers_largest_received = true;
   // Test the case when a packet is received from the past and future packet
   // numbers are still calculated relative to the largest received packet.
   QuicPacketHeader header;