HPACK: Refactor and expand HpackHeaderTable indexing.

net/spdy/hpack_decoder_test.cc

Index: net/spdy/hpack_decoder_test.cc
diff --git a/net/spdy/hpack_decoder_test.cc b/net/spdy/hpack_decoder_test.cc
index 9631cd186b1d252b7bf1b2c5c37361ac18e45a96..e96dc1e6bcb7a186652e2f8bd8c115609aa21e2c 100644
--- a/net/spdy/hpack_decoder_test.cc
+++ b/net/spdy/hpack_decoder_test.cc
@@ -23,18 +23,6 @@ namespace test {
 using base::StringPiece;
 using std::string;
 
-class HpackEncodingContextPeer {
- public:
-  explicit HpackEncodingContextPeer(const HpackEncodingContext& context)
-      : context_(context) {}
-  const HpackHeaderTable& header_table() {
-    return context_.header_table_;
-  }
-
- private:
-  const HpackEncodingContext& context_;
-};
-
 class HpackDecoderPeer {
  public:
   explicit HpackDecoderPeer(HpackDecoder* decoder)
@@ -46,8 +34,8 @@ class HpackDecoderPeer {
   bool DecodeNextName(HpackInputStream* in, StringPiece* out) {
     return decoder_->DecodeNextName(in, out);
   }
-  HpackEncodingContextPeer context_peer() {
-    return HpackEncodingContextPeer(decoder_->context_);
+  const HpackHeaderTable& header_table() {
+    return decoder_->header_table_;
   }
   void set_cookie_name(string name) {
     decoder_->cookie_name_ = name;
@@ -88,8 +76,7 @@ class HpackDecoderTest : public ::testing::Test {
  protected:
   HpackDecoderTest()
       : decoder_(ObtainHpackHuffmanTable()),
-        decoder_peer_(&decoder_),
-        context_peer_(decoder_peer_.context_peer()) {}
+        decoder_peer_(&decoder_) {}
 
   bool DecodeHeaderBlock(StringPiece str) {
     return decoder_.HandleControlFrameHeadersData(0, str.data(), str.size()) &&
@@ -109,7 +96,6 @@ class HpackDecoderTest : public ::testing::Test {
 
   HpackDecoder decoder_;
   test::HpackDecoderPeer decoder_peer_;
-  test::HpackEncodingContextPeer context_peer_;
 };
 
 TEST_F(HpackDecoderTest, HandleControlFrameHeadersData) {
@@ -257,11 +243,11 @@ TEST_F(HpackDecoderTest, InvalidIndexedHeader) {
 
 TEST_F(HpackDecoderTest, ContextUpdateMaximumSize) {
   EXPECT_EQ(kDefaultHeaderTableSizeSetting,
-            context_peer_.header_table().max_size());
+            decoder_peer_.header_table().max_size());
   {
     // Maximum-size update with size 126. Succeeds.
     EXPECT_TRUE(DecodeHeaderBlock(StringPiece("\x80\x7e", 2)));
-    EXPECT_EQ(126u, context_peer_.header_table().max_size());
+    EXPECT_EQ(126u, decoder_peer_.header_table().max_size());
   }
   string input;
   {
@@ -274,7 +260,7 @@ TEST_F(HpackDecoderTest, ContextUpdateMaximumSize) {
     output_stream.TakeString(&input);
     EXPECT_TRUE(DecodeHeaderBlock(StringPiece(input)));
     EXPECT_EQ(kDefaultHeaderTableSizeSetting,
-              context_peer_.header_table().max_size());
+              decoder_peer_.header_table().max_size());
   }
   {
     // Maximum-size update with kDefaultHeaderTableSizeSetting + 1. Fails.
@@ -286,7 +272,7 @@ TEST_F(HpackDecoderTest, ContextUpdateMaximumSize) {
     output_stream.TakeString(&input);
     EXPECT_FALSE(DecodeHeaderBlock(StringPiece(input)));
     EXPECT_EQ(kDefaultHeaderTableSizeSetting,
-              context_peer_.header_table().max_size());
+              decoder_peer_.header_table().max_size());
   }
 }