Remove WriteBlockedList::use_stream_to_priority.

net/spdy/write_blocked_list_test.cc

Index: net/spdy/write_blocked_list_test.cc
diff --git a/net/spdy/write_blocked_list_test.cc b/net/spdy/write_blocked_list_test.cc
index 50c3f351cf9cf300806354ab79b67e993f1b805a..20a1b7e43d009710852a12604b595f6869714e7c 100644
--- a/net/spdy/write_blocked_list_test.cc
+++ b/net/spdy/write_blocked_list_test.cc
@@ -23,14 +23,12 @@ namespace {
 
 typedef WriteBlockedList<int> IntWriteBlockedList;
 
-class WriteBlockedListTest : public ::testing::TestWithParam<bool> {
+class WriteBlockedListTest : public ::testing::Test {
  public:
-  WriteBlockedListTest() : list(GetParam()) {}
-
   IntWriteBlockedList list;
 };
 
-TEST_P(WriteBlockedListTest, GetHighestPriority) {
+TEST_F(WriteBlockedListTest, GetHighestPriority) {
   EXPECT_FALSE(list.HasWriteBlockedStreams());
   list.PushBack(1, 1);
   EXPECT_TRUE(list.HasWriteBlockedStreams());
@@ -40,7 +38,7 @@ TEST_P(WriteBlockedListTest, GetHighestPriority) {
   EXPECT_EQ(0, list.GetHighestPriorityWriteBlockedList());
 }
 
-TEST_P(WriteBlockedListTest, HasWriteBlockedStreamsOfGreaterThanPriority) {
+TEST_F(WriteBlockedListTest, HasWriteBlockedStreamsOfGreaterThanPriority) {
   list.PushBack(1, 4);
   EXPECT_TRUE(list.HasWriteBlockedStreamsGreaterThanPriority(5));
   EXPECT_FALSE(list.HasWriteBlockedStreamsGreaterThanPriority(4));
@@ -49,7 +47,7 @@ TEST_P(WriteBlockedListTest, HasWriteBlockedStreamsOfGreaterThanPriority) {
   EXPECT_FALSE(list.HasWriteBlockedStreamsGreaterThanPriority(2));
 }
 
-TEST_P(WriteBlockedListTest, RemoveStreamFromWriteBlockedList) {
+TEST_F(WriteBlockedListTest, RemoveStreamFromWriteBlockedList) {
   list.PushBack(1, 4);
   EXPECT_TRUE(list.HasWriteBlockedStreams());
 
@@ -66,100 +64,52 @@ TEST_P(WriteBlockedListTest, RemoveStreamFromWriteBlockedList) {
   EXPECT_TRUE(list.HasWriteBlockedStreams());
 }
 
-TEST_P(WriteBlockedListTest, PopFront) {
+TEST_F(WriteBlockedListTest, PopFront) {
   list.PushBack(1, 4);
   EXPECT_EQ(1u, list.NumBlockedStreams());
   list.PushBack(2, 4);
   list.PushBack(1, 4);
   list.PushBack(3, 4);
-  if (GetParam()) {
-    EXPECT_EQ(3u, list.NumBlockedStreams());
-  } else {
-    EXPECT_EQ(4u, list.NumBlockedStreams());
-  }
+  EXPECT_EQ(3u, list.NumBlockedStreams());
 
   EXPECT_EQ(1, list.PopFront(4));
   EXPECT_EQ(2, list.PopFront(4));
-  EXPECT_EQ(1, list.PopFront(4));
-  if (!GetParam()) {
-    EXPECT_EQ(1, list.PopFront(4));
-  }
   EXPECT_EQ(1u, list.NumBlockedStreams());
   EXPECT_EQ(3, list.PopFront(4));
 }
 
-TEST_P(WriteBlockedListTest, UpdateStreamPriorityInWriteBlockedList) {
-  if (GetParam()) {
-    list.PushBack(1, 1);
-    list.PushBack(2, 2);
-    list.PushBack(3, 3);
-    list.PushBack(1, 3);  // Re-prioritizes stream 1 at priority 3.
-    list.PushBack(1, 3);  // No effect.
-    EXPECT_EQ(3u, list.NumBlockedStreams());
-    EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
-    EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
-    EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(3, &list)->size());
-
-    list.UpdateStreamPriorityInWriteBlockedList(1, 3, 2);
-    EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
-    EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
-    list.UpdateStreamPriorityInWriteBlockedList(3, 3, 1);
-    EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
-    EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(3, &list)->size());
-
-    // Redundant update.
-    list.UpdateStreamPriorityInWriteBlockedList(1, 2, 2);
-    EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
-
-    // No entries for given stream_id / old_priority pair.
-    list.UpdateStreamPriorityInWriteBlockedList(4, 4, 1);
-    EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
-    EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
-    EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(4, &list)->size());
-
-    EXPECT_EQ(3, list.PopFront(1));
-    EXPECT_EQ(2, list.PopFront(2));
-    EXPECT_EQ(1, list.PopFront(2));
-    EXPECT_EQ(0u, list.NumBlockedStreams());
-  } else {
-    list.PushBack(1, 1);
-    list.PushBack(2, 2);
-    list.PushBack(3, 3);
-    list.PushBack(1, 3);
-    list.PushBack(1, 3);
-    EXPECT_EQ(5u, list.NumBlockedStreams());
-    EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
-    EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
-    EXPECT_EQ(3u, WriteBlockedListPeer::GetWriteBlockedList(3, &list)->size());
-
-    list.UpdateStreamPriorityInWriteBlockedList(1, 1, 2);
-    EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
-    EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
-    list.UpdateStreamPriorityInWriteBlockedList(3, 3, 1);
-    EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
-    EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(3, &list)->size());
-
-    // Redundant update.
-    list.UpdateStreamPriorityInWriteBlockedList(1, 3, 3);
-    EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(3, &list)->size());
-
-    // No entries for given stream_id / old_priority pair.
-    list.UpdateStreamPriorityInWriteBlockedList(4, 4, 1);
-    EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
-    EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
-    EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(4, &list)->size());
-
-    // Update multiple entries.
-    list.UpdateStreamPriorityInWriteBlockedList(1, 3, 4);
-    EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(3, &list)->size());
-    EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(4, &list)->size());
-
-    EXPECT_EQ(3, list.PopFront(1));
-    EXPECT_EQ(2, list.PopFront(2));
-    EXPECT_EQ(1, list.PopFront(2));
-    EXPECT_EQ(1, list.PopFront(4));
-    EXPECT_EQ(0u, list.NumBlockedStreams());
-  }
+TEST_F(WriteBlockedListTest, UpdateStreamPriorityInWriteBlockedList) {
+  list.PushBack(1, 1);
+  list.PushBack(2, 2);
+  list.PushBack(3, 3);
+  list.PushBack(1, 3);  // Re-prioritizes stream 1 at priority 3.
+  list.PushBack(1, 3);  // No effect.
+  EXPECT_EQ(3u, list.NumBlockedStreams());
+  EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
+  EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
+  EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(3, &list)->size());
+
+  list.UpdateStreamPriorityInWriteBlockedList(1, 3, 2);
+  EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
+  EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
+  list.UpdateStreamPriorityInWriteBlockedList(3, 3, 1);
+  EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
+  EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(3, &list)->size());
+
+  // Redundant update.
+  list.UpdateStreamPriorityInWriteBlockedList(1, 2, 2);
+  EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
+
+  // No entries for given stream_id / old_priority pair.
+  list.UpdateStreamPriorityInWriteBlockedList(4, 4, 1);
+  EXPECT_EQ(1u, WriteBlockedListPeer::GetWriteBlockedList(1, &list)->size());
+  EXPECT_EQ(2u, WriteBlockedListPeer::GetWriteBlockedList(2, &list)->size());
+  EXPECT_EQ(0u, WriteBlockedListPeer::GetWriteBlockedList(4, &list)->size());
+
+  EXPECT_EQ(3, list.PopFront(1));
+  EXPECT_EQ(2, list.PopFront(2));
+  EXPECT_EQ(1, list.PopFront(2));
+  EXPECT_EQ(0u, list.NumBlockedStreams());
 }
 
 }  // namespace