Improve HpackHeaderTableTest.

PiperOrigin-RevId: 363925725
Change-Id: I77edd99f59105e7164fa21ddddfac21db9a357a9

spdy/core/hpack/hpack_header_table_test.cc

diff --git a/spdy/core/hpack/hpack_header_table_test.cc b/spdy/core/hpack/hpack_header_table_test.cc
index 78d22cc..82e8dc1 100644
--- a/spdy/core/hpack/hpack_header_table_test.cc
+++ b/spdy/core/hpack/hpack_header_table_test.cc
@@ -31,10 +31,6 @@
   const HpackHeaderTable::EntryTable& static_entries() {
     return table_->static_entries_;
   }
-  // TODO(b/182789212): Remove this method, because it does not add any value.
-  size_t index_size() {
-    return table_->static_index_.size() + table_->dynamic_index_.size();
-  }
   std::vector<HpackEntry*> EvictionSet(absl::string_view name,
                                        absl::string_view value) {
     HpackHeaderTable::EntryTable::iterator begin, end;
@@ -48,8 +44,6 @@
   size_t dynamic_table_insertions() {
     return table_->dynamic_table_insertions_;
   }
-  // TODO(b/182789212): Inline this method.
-  size_t dynamic_entries_count() { return table_->dynamic_entries_.size(); }
   size_t EvictionCountForEntry(absl::string_view name,
                                absl::string_view value) {
     return table_->EvictionCountForEntry(name, value);
@@ -130,12 +124,11 @@
   EXPECT_EQ(kDefaultHeaderTableSizeSetting, table_.max_size());
   EXPECT_EQ(kDefaultHeaderTableSizeSetting, table_.settings_size_bound());
 
-  EXPECT_EQ(0u, peer_.dynamic_entries_count());
+  EXPECT_EQ(0u, peer_.dynamic_entries().size());
   EXPECT_EQ(0u, peer_.dynamic_table_insertions());
 
   // Static entries have been populated and inserted into the table & index.
   EXPECT_EQ(kStaticTableSize, peer_.static_entries().size());
-  EXPECT_EQ(peer_.index_size(), peer_.static_entries().size());
   for (size_t i = 0; i != peer_.static_entries().size(); ++i) {
     const HpackEntry* entry = &peer_.static_entries()[i];
 
@@ -146,6 +139,8 @@
 }
 
 TEST_F(HpackHeaderTableTest, BasicDynamicEntryInsertionAndEviction) {
+  EXPECT_EQ(kStaticTableSize, peer_.static_entries().size());
+
   const HpackEntry* first_static_entry = table_.GetByIndex(1);
   EXPECT_EQ(first_static_entry, table_.GetByIndex(1));
 
@@ -155,9 +150,8 @@
 
   // Table counts were updated appropriately.
   EXPECT_EQ(entry->Size(), table_.size());
-  EXPECT_EQ(1u, peer_.dynamic_entries_count());
-  EXPECT_EQ(peer_.dynamic_entries().size(), peer_.dynamic_entries_count());
-  EXPECT_EQ(kStaticTableSize + 1, peer_.index_size());
+  EXPECT_EQ(1u, peer_.dynamic_entries().size());
+  EXPECT_EQ(kStaticTableSize, peer_.static_entries().size());
 
   EXPECT_EQ(entry, table_.GetByIndex(62));
 
@@ -167,9 +161,8 @@
   // Evict |entry|. Table counts are again updated appropriately.
   peer_.Evict(1);
   EXPECT_EQ(0u, table_.size());
-  EXPECT_EQ(0u, peer_.dynamic_entries_count());
-  EXPECT_EQ(peer_.dynamic_entries().size(), peer_.dynamic_entries_count());
-  EXPECT_EQ(kStaticTableSize, peer_.index_size());
+  EXPECT_EQ(0u, peer_.dynamic_entries().size());
+  EXPECT_EQ(kStaticTableSize, peer_.static_entries().size());
 
   // Index of |first_static_entry| does not change.
   EXPECT_EQ(first_static_entry, table_.GetByIndex(1));