Land recent SPDY changes (through 70021377)

net/spdy/hpack_input_stream_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/spdy/hpack_input_stream.h"
 
 #include <bitset>
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
 #include "net/spdy/hpack_constants.h"
 #include "net/spdy/spdy_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
 using base::StringPiece;
 using std::string;
 using test::a2b_hex;
 
 const size_t kLiteralBound = 1024;
 
 class HpackInputStreamTest : public ::testing::Test {
- protected:
+ public:
   virtual void SetUp() {
     std::vector<HpackHuffmanSymbol> code = HpackHuffmanCode();
-    EXPECT_TRUE(huffman_table.Initialize(&code[0], code.size()));
+    EXPECT_TRUE(huffman_table_.Initialize(&code[0], code.size()));
   }
 
-  HpackHuffmanTable huffman_table;
+ protected:
+  HpackHuffmanTable huffman_table_;
 };
 
 // Hex representation of encoded length and Huffman string.
-const char kEncodedHuffmanFixture[] = "31"  // Length prefix.
-  "e0d6cf9f6e8f9fd3e5f6fa76fefd3c7e"
-  "df9eff1f2f0f3cfe9f6fcf7f8f879f61"
-  "ad4f4cc9a973a2200ec3725e18b1b74e"
-  "3f";
+const char kEncodedHuffmanFixture[] = "2d"  // Length prefix.
+  "94e7821dd7f2e6c7b335dfdfcd5b3960"
+  "d5af27087f3672c1ab270fb5291f9587"
+  "316065c003ed4ee5b1063d5007";
 
 const char kDecodedHuffmanFixture[] =
   "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1";
 
 // Utility function to decode an assumed-valid uint32 with an N-bit
 // prefix.
 uint32 DecodeValidUint32(uint8 N, StringPiece str) {
   EXPECT_GT(N, 0);
   EXPECT_LE(N, 8);
   HpackInputStream input_stream(kLiteralBound, str);
@@ skipping 461 matching lines @@
   EXPECT_TRUE(input_stream.HasMoreData());
   StringPiece string_piece;
   EXPECT_FALSE(input_stream.DecodeNextIdentityString(&string_piece));
 }
 
 TEST_F(HpackInputStreamTest, DecodeNextHuffmanString) {
   string output, input(a2b_hex(kEncodedHuffmanFixture));
   HpackInputStream input_stream(arraysize(kDecodedHuffmanFixture)-1, input);
 
   EXPECT_TRUE(input_stream.HasMoreData());
-  EXPECT_TRUE(input_stream.DecodeNextHuffmanString(huffman_table, &output));
+  EXPECT_TRUE(input_stream.DecodeNextHuffmanString(huffman_table_, &output));
   EXPECT_EQ(kDecodedHuffmanFixture, output);
   EXPECT_FALSE(input_stream.HasMoreData());
 }
 
 TEST_F(HpackInputStreamTest, DecodeNextHuffmanStringSizeLimit) {
   string output, input(a2b_hex(kEncodedHuffmanFixture));
   // Max string literal is one byte shorter than the decoded fixture.
   HpackInputStream input_stream(arraysize(kDecodedHuffmanFixture)-2, input);
 
   // Decoded string overflows the max string literal.
   EXPECT_TRUE(input_stream.HasMoreData());
-  EXPECT_FALSE(input_stream.DecodeNextHuffmanString(huffman_table, &output));
+  EXPECT_FALSE(input_stream.DecodeNextHuffmanString(huffman_table_, &output));
 }
 
 TEST_F(HpackInputStreamTest, DecodeNextHuffmanStringNotEnoughInput) {
   string output, input(a2b_hex(kEncodedHuffmanFixture));
   input[0]++;  // Input prefix is one byte larger than available input.
   HpackInputStream input_stream(arraysize(kDecodedHuffmanFixture)-1, input);
 
   // Not enough buffer for declared encoded length.
   EXPECT_TRUE(input_stream.HasMoreData());
-  EXPECT_FALSE(input_stream.DecodeNextHuffmanString(huffman_table, &output));
+  EXPECT_FALSE(input_stream.DecodeNextHuffmanString(huffman_table_, &output));
 }
 
 TEST_F(HpackInputStreamTest, PeekBitsAndConsume) {
   HpackInputStream input_stream(kLiteralBound, "\xad\xab\xad\xab\xad");
 
   uint32 bits = 0;
   size_t peeked_count = 0;
 
   // Read 0xad.
   EXPECT_TRUE(input_stream.PeekBits(&peeked_count, &bits));
@@ skipping 63 matching lines @@
 
   input_stream.ConsumeBits(6);
   EXPECT_TRUE(input_stream.HasMoreData());
   input_stream.ConsumeByteRemainder();
   EXPECT_FALSE(input_stream.HasMoreData());
 }
 
 }  // namespace
 
 }  // namespace net