Snapshot of all changes to get jumbo in blink and content.

net/spdy/core/hpack/hpack_huffman_decoder_test.cc

Index: net/spdy/core/hpack/hpack_huffman_decoder_test.cc
diff --git a/net/spdy/core/hpack/hpack_huffman_decoder_test.cc b/net/spdy/core/hpack/hpack_huffman_decoder_test.cc
index 8ab010f06b9077eb8c2f2199749fcf23b0698a4e..c474ff6daa8ee8f243e6e3ca95d3168e449feaab 100644
--- a/net/spdy/core/hpack/hpack_huffman_decoder_test.cc
+++ b/net/spdy/core/hpack/hpack_huffman_decoder_test.cc
@@ -33,22 +33,22 @@ uint32_t RandUint32() {
 // binary numbers when LOG'd.
 typedef std::bitset<32> Bits;
 
-typedef HpackHuffmanDecoder::HuffmanWord HuffmanWord;
-typedef HpackHuffmanDecoder::HuffmanCodeLength HuffmanCodeLength;
+typedef SpdyHpackHuffmanDecoder::HuffmanWord HuffmanWord;
+typedef SpdyHpackHuffmanDecoder::HuffmanCodeLength HuffmanCodeLength;
 
 class HpackHuffmanDecoderPeer {
  public:
   static HuffmanCodeLength CodeLengthOfPrefix(HuffmanWord value) {
-    return HpackHuffmanDecoder::CodeLengthOfPrefix(value);
+    return SpdyHpackHuffmanDecoder::CodeLengthOfPrefix(value);
   }
 
   static HuffmanWord DecodeToCanonical(HuffmanCodeLength code_length,
                                        HuffmanWord bits) {
-    return HpackHuffmanDecoder::DecodeToCanonical(code_length, bits);
+    return SpdyHpackHuffmanDecoder::DecodeToCanonical(code_length, bits);
   }
 
   static uint8_t CanonicalToSource(HuffmanWord canonical) {
-    return HpackHuffmanDecoder::CanonicalToSource(canonical);
+    return SpdyHpackHuffmanDecoder::CanonicalToSource(canonical);
   }
 };
 
@@ -177,7 +177,7 @@ TEST_F(HpackHuffmanDecoderTest, SpecRequestExamples) {
     const SpdyString& encodedFixture(test_table[i]);
     const SpdyString& decodedFixture(test_table[i + 1]);
     HpackInputStream input_stream(encodedFixture);
-    EXPECT_TRUE(HpackHuffmanDecoder::DecodeString(&input_stream, &buffer));
+    EXPECT_TRUE(SpdyHpackHuffmanDecoder::DecodeString(&input_stream, &buffer));
     EXPECT_EQ(decodedFixture, buffer);
     buffer = EncodeString(decodedFixture);
     EXPECT_EQ(encodedFixture, buffer);
@@ -209,7 +209,7 @@ TEST_F(HpackHuffmanDecoderTest, SpecResponseExamples) {
     const SpdyString& encodedFixture(test_table[i]);
     const SpdyString& decodedFixture(test_table[i + 1]);
     HpackInputStream input_stream(encodedFixture);
-    EXPECT_TRUE(HpackHuffmanDecoder::DecodeString(&input_stream, &buffer));
+    EXPECT_TRUE(SpdyHpackHuffmanDecoder::DecodeString(&input_stream, &buffer));
     EXPECT_EQ(decodedFixture, buffer);
     buffer = EncodeString(decodedFixture);
     EXPECT_EQ(encodedFixture, buffer);
@@ -224,7 +224,7 @@ TEST_F(HpackHuffmanDecoderTest, RoundTripIndividualSymbols) {
     SpdyString buffer_in = EncodeString(input);
     SpdyString buffer_out;
     HpackInputStream input_stream(buffer_in);
-    EXPECT_TRUE(HpackHuffmanDecoder::DecodeString(&input_stream, &buffer_out));
+    EXPECT_TRUE(SpdyHpackHuffmanDecoder::DecodeString(&input_stream, &buffer_out));
     EXPECT_EQ(input, buffer_out);
   }
 }
@@ -245,7 +245,7 @@ TEST_F(HpackHuffmanDecoderTest, RoundTripSymbolSequences) {
     }
     EncodeString(input, &encoded);
     HpackInputStream input_stream(encoded);
-    EXPECT_TRUE(HpackHuffmanDecoder::DecodeString(&input_stream, &decoded));
+    EXPECT_TRUE(SpdyHpackHuffmanDecoder::DecodeString(&input_stream, &decoded));
     EXPECT_EQ(input, decoded);
   }
 }