Landing Recent QUIC changes until Sat Apr 29 00:22:04 2017 +0000

net/quic/core/quic_write_blocked_list_test.cc

 // Copyright 2014 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_write_blocked_list.h"
 
 #include "net/quic/platform/api/quic_test.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 
 using net::kV3LowestPriority;
@@ skipping 82 matching lines @@
   EXPECT_FALSE(write_blocked_list.HasWriteBlockedCryptoOrHeadersStream());
   EXPECT_FALSE(write_blocked_list.HasWriteBlockedDataStreams());
 }
 
 TEST_F(QuicWriteBlockedListTest, NoDuplicateEntries) {
   // Test that QuicWriteBlockedList doesn't allow duplicate entries.
   QuicWriteBlockedList write_blocked_list;
 
   // Try to add a stream to the write blocked list multiple times at the same
   // priority.
-  const QuicStreamId kBlockedId = kClientDataStreamId1;
+  const QuicStreamId kBlockedId = kHeadersStreamId + 2;
   write_blocked_list.RegisterStream(kBlockedId, kV3HighestPriority);
   write_blocked_list.AddStream(kBlockedId);
   write_blocked_list.AddStream(kBlockedId);
   write_blocked_list.AddStream(kBlockedId);
 
   // This should only result in one blocked stream being added.
   EXPECT_EQ(1u, write_blocked_list.NumBlockedStreams());
   EXPECT_TRUE(write_blocked_list.HasWriteBlockedDataStreams());
 
   // There should only be one stream to pop off the front.
   EXPECT_EQ(kBlockedId, write_blocked_list.PopFront());
   EXPECT_EQ(0u, write_blocked_list.NumBlockedStreams());
   EXPECT_FALSE(write_blocked_list.HasWriteBlockedDataStreams());
 }
 
 TEST_F(QuicWriteBlockedListTest, BatchingWrites) {
   QuicWriteBlockedList write_blocked_list;
 
-  const QuicStreamId id1 = kClientDataStreamId1;
-  const QuicStreamId id2 = kClientDataStreamId2;
-  const QuicStreamId id3 = kClientDataStreamId2 + 2;
+  const QuicStreamId id1 = kHeadersStreamId + 2;
+  const QuicStreamId id2 = id1 + 2;
+  const QuicStreamId id3 = id2 + 2;
   write_blocked_list.RegisterStream(id1, kV3LowestPriority);
   write_blocked_list.RegisterStream(id2, kV3LowestPriority);
   write_blocked_list.RegisterStream(id3, kV3HighestPriority);
 
   write_blocked_list.AddStream(id1);
   write_blocked_list.AddStream(id2);
   EXPECT_EQ(2u, write_blocked_list.NumBlockedStreams());
 
   // The first stream we push back should stay at the front until 16k is
   // written.
@@ skipping 77 matching lines @@
   write_blocked_list.AddStream(kCryptoStreamId);
   EXPECT_TRUE(write_blocked_list.ShouldYield(16));
   EXPECT_TRUE(write_blocked_list.ShouldYield(15));
   EXPECT_TRUE(write_blocked_list.ShouldYield(kHeadersStreamId));
   EXPECT_FALSE(write_blocked_list.ShouldYield(kCryptoStreamId));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net