Land Recent QUIC Changes.

A number of tests define data stream IDs: this CL puts these definitions
in one place in quic_test_utils.h

Merge internal change: 67627075
https://codereview.chromium.org/296853003/


Replace NeuterPacket and RemovePacket with RemoveRetransmittibility,
which removes the retransmittibility property from a packet and it's
associated transmissions.

Merge internal change: 67615222
https://codereview.chromium.org/286933010/


Cleanup changes to fix the using:: order.

Merge internal change: 67541632,, 67612445
https://codereview.chromium.org/297773002/


Remove QuicSentPacketManager's DiscardUnackedPacket method now that it's
not necessary.

Merge internal change: 67542370
https://codereview.chromium.org/290333005/


Garbage collect QUIC entropy map as gaps are filled.  Not flag protected.

Merge internal change: 67521743
https://codereview.chromium.org/296053006/


Extract entropy tracking from QuicReceivedPacketManager into its own
class in preparation for garbage collecting unneeded entropy history.

Extract QUIC entropy tracking into a separate class, no behavior change.

Merge internal change: 67273904
https://codereview.chromium.org/294143004/


Remove check for an impossible condition.  StopWaiting frames with
least_unacked > packet sequence number are illegal.  Largest observed is
guaranteed to be >= the StopWaiting packet sequence number.

Remove impossible condition from an if.

Merge internal change: 67268376
https://codereview.chromium.org/292983009/

R=rch@chromium.org

Review URL: https://codereview.chromium.org/297513005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272158 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 10 deletions

diff --git a/net/quic/quic_packet_creator_test.cc b/net/quic/quic_packet_creator_test.cc
index 72faf7e..3e3b228 100644
--- a/net/quic/quic_packet_creator_test.cc
+++ b/net/quic/quic_packet_creator_test.cc
@@ -116,10 +116,10 @@ class QuicPacketCreatorTest : public ::testing::TestWithParam<TestParams> {
   // Returns the number of bytes consumed by the non-data fields of a stream
   // frame, assuming it is the last frame in the packet
   size_t GetStreamFrameOverhead(InFecGroup is_in_fec_group) {
-    return QuicFramer::GetMinStreamFrameSize(
-        client_framer_.version(), kStreamId, kOffset, true, is_in_fec_group);
+    return QuicFramer::GetMinStreamFrameSize(client_framer_.version(),
+                                             kClientDataStreamId1, kOffset,
+                                             true, is_in_fec_group);
   }
-  static const QuicStreamId kStreamId = 1u;
   static const QuicStreamOffset kOffset = 1u;
 
   QuicFrames frames_;
@@ -503,12 +503,13 @@ TEST_P(QuicPacketCreatorTest, CreateAllFreeBytesForStreamFrames) {
     creator_.options()->max_packet_length = i;
     const bool should_have_room = i > overhead + GetStreamFrameOverhead(
         NOT_IN_FEC_GROUP);
-    ASSERT_EQ(should_have_room,
-              creator_.HasRoomForStreamFrame(kStreamId, kOffset));
+    ASSERT_EQ(should_have_room, creator_.HasRoomForStreamFrame(
+                                    kClientDataStreamId1, kOffset));
     if (should_have_room) {
       QuicFrame frame;
       size_t bytes_consumed = creator_.CreateStreamFrame(
-          kStreamId, MakeIOVector("testdata"), kOffset, false, &frame);
+          kClientDataStreamId1, MakeIOVector("testdata"), kOffset, false,
+          &frame);
       EXPECT_LT(0u, bytes_consumed);
       ASSERT_TRUE(creator_.AddSavedFrame(frame));
       SerializedPacket serialized_packet = creator_.SerializePacket();
@@ -530,7 +531,7 @@ TEST_P(QuicPacketCreatorTest, StreamFrameConsumption) {
     size_t bytes_free = delta > 0 ? 0 : 0 - delta;
     QuicFrame frame;
     size_t bytes_consumed = creator_.CreateStreamFrame(
-        kStreamId, MakeIOVector(data), kOffset, false, &frame);
+        kClientDataStreamId1, MakeIOVector(data), kOffset, false, &frame);
     EXPECT_EQ(capacity - bytes_free, bytes_consumed);
 
     ASSERT_TRUE(creator_.AddSavedFrame(frame));
@@ -559,7 +560,7 @@ TEST_P(QuicPacketCreatorTest, StreamFrameConsumptionWithFec) {
     size_t bytes_free = delta > 0 ? 0 : 0 - delta;
     QuicFrame frame;
     size_t bytes_consumed = creator_.CreateStreamFrame(
-        kStreamId, MakeIOVector(data), kOffset, false, &frame);
+        kClientDataStreamId1, MakeIOVector(data), kOffset, false, &frame);
     EXPECT_EQ(capacity - bytes_free, bytes_consumed);
 
     ASSERT_TRUE(creator_.AddSavedFrame(frame));
@@ -589,7 +590,7 @@ TEST_P(QuicPacketCreatorTest, CryptoStreamFramePacketPadding) {
 
     QuicFrame frame;
     size_t bytes_consumed = creator_.CreateStreamFrame(
-        kStreamId, MakeIOVector(data), kOffset, false, &frame);
+        kCryptoStreamId, MakeIOVector(data), kOffset, false, &frame);
     EXPECT_LT(0u, bytes_consumed);
     ASSERT_TRUE(creator_.AddSavedFrame(frame));
     SerializedPacket serialized_packet = creator_.SerializePacket();
@@ -622,7 +623,7 @@ TEST_P(QuicPacketCreatorTest, NonCryptoStreamFramePacketNonPadding) {
 
     QuicFrame frame;
     size_t bytes_consumed = creator_.CreateStreamFrame(
-        kStreamId + 2, MakeIOVector(data), kOffset, false, &frame);
+        kClientDataStreamId1, MakeIOVector(data), kOffset, false, &frame);
     EXPECT_LT(0u, bytes_consumed);
     ASSERT_TRUE(creator_.AddSavedFrame(frame));
     SerializedPacket serialized_packet = creator_.SerializePacket();