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

net/quic/core/quic_write_blocked_list_test.cc

Index: net/quic/core/quic_write_blocked_list_test.cc
diff --git a/net/quic/core/quic_write_blocked_list_test.cc b/net/quic/core/quic_write_blocked_list_test.cc
index ab851b501726bebb8beb8996e54d45605258edcf..0589f5573becdcc571a58673c05c556d23a76693 100644
--- a/net/quic/core/quic_write_blocked_list_test.cc
+++ b/net/quic/core/quic_write_blocked_list_test.cc
@@ -100,7 +100,7 @@ TEST_F(QuicWriteBlockedListTest, NoDuplicateEntries) {
 
   // 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);
@@ -119,9 +119,9 @@ TEST_F(QuicWriteBlockedListTest, NoDuplicateEntries) {
 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);