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

net/spdy/core/hpack/hpack_huffman_table_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/core/hpack/hpack_huffman_table.h"
 
 #include <stdint.h>
 
 #include <bitset>
 #include <utility>
@@ skipping 329 matching lines @@
     // First decode with HpackHuffmanTable.
     {
       HpackInputStream input_stream(encoded);
       EXPECT_TRUE(table_.GenericDecodeString(&input_stream, out));
     }
     // And decode again with the fixed decoder, confirming that the result is
     // the same.
     {
       HpackInputStream input_stream(encoded);
       SpdyString buf;
-      EXPECT_TRUE(HpackHuffmanDecoder::DecodeString(&input_stream, &buf));
+      EXPECT_TRUE(SpdyHpackHuffmanDecoder::DecodeString(&input_stream, &buf));
       EXPECT_EQ(*out, buf);
     }
   }
 };
 
 TEST_F(HpackHuffmanTableTest, InitializeHpackCode) {
   EXPECT_EQ(peer_.pad_bits(), '\xFF');  // First 8 bits of EOS.
 }
 
 TEST_F(HpackHuffmanTableTest, SpecRequestExamples) {
@@ skipping 96 matching lines @@
     output_stream.TakeString(&encoding);
     EXPECT_EQ(encoding.size(), table_.EncodedSize(test_table[i]));
   }
 }
 
 }  // namespace
 
 }  // namespace test
 
 }  // namespace net