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

net/quic/core/quic_framer_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/core/quic_framer.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 1169 matching lines @@
       framer_.version() <= QUIC_VERSION_33 ? arraysize(packet)
                                            : arraysize(packet_34),
       false);
   EXPECT_FALSE(framer_.ProcessPacket(encrypted));
   EXPECT_EQ(QUIC_NO_ERROR, framer_.error());
   EXPECT_EQ(0u, QuicFramerPeer::GetLastPacketNumber(&framer_));
   EXPECT_EQ(kInvalidPathId, QuicFramerPeer::GetLastPathId(&framer_));
 }
 
 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[] = {
     // public flags (8 byte connection_id and 4 byte packet number)
     0x28,
     // connection_id
     0x10, 0x32, 0x54, 0x76, 0x98, 0xBA, 0xDC, 0xFE,
     // packet number
     0xBC, 0x9A, 0x78, 0x56,
     // private flags
@@ skipping 49 matching lines @@
         expected_error = "Unable to read packet number.";
       }
     }
     CheckProcessingFails(
         framer_.version() <= QUIC_VERSION_33 ? packet : packet_34, i,
         expected_error, QUIC_INVALID_PACKET_HEADER);
   }
 }
 
 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[] = {
     // public flags (8 byte connection_id and 2 byte packet number)
     0x18,
     // connection_id
     0x10, 0x32, 0x54, 0x76, 0x98, 0xBA, 0xDC, 0xFE,
     // packet number
     0xBC, 0x9A,
     // private flags
@@ skipping 51 matching lines @@
         expected_error = "Unable to read packet number.";
       }
     }
     CheckProcessingFails(
         framer_.version() <= QUIC_VERSION_33 ? packet : packet_34, i,
         expected_error, QUIC_INVALID_PACKET_HEADER);
   }
 }
 
 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[] = {
     // public flags (8 byte connection_id and 1 byte packet number)
     0x08,
     // connection_id
     0x10, 0x32, 0x54, 0x76, 0x98, 0xBA, 0xDC, 0xFE,
     // packet number
     0xBC,
     // private flags
@@ skipping 51 matching lines @@
         expected_error = "Unable to read packet number.";
       }
     }
     CheckProcessingFails(
         framer_.version() <= QUIC_VERSION_33 ? packet : packet_34, i,
         expected_error, QUIC_INVALID_PACKET_HEADER);
   }
 }
 
 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;
   header.public_header.connection_id = kConnectionId;
   header.public_header.reset_flag = false;
   header.public_header.version_flag = false;
   header.entropy_flag = false;
   header.packet_number = kPacketNumber - 2;
 
   QuicPaddingFrame padding_frame;
@@ skipping 5065 matching lines @@
     'o',  ' ',  'w',  'o',
     'r',  'l',  'd',  '!',
   };
   // clang-format on
 
   QuicFramerFuzzFunc(packet, arraysize(packet));
 }
 
 }  // namespace test
 }  // namespace net