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

net/spdy/core/hpack/hpack_huffman_decoder.cc

Index: net/spdy/core/hpack/hpack_huffman_decoder.cc
diff --git a/net/spdy/core/hpack/hpack_huffman_decoder.cc b/net/spdy/core/hpack/hpack_huffman_decoder.cc
index 85135795dfb16054db7ca9bb431e3dd637daf569..d1e998dcdc753fd6f44b3423ff53286a6924b7a7 100644
--- a/net/spdy/core/hpack/hpack_huffman_decoder.cc
+++ b/net/spdy/core/hpack/hpack_huffman_decoder.cc
@@ -35,8 +35,8 @@
 namespace net {
 namespace {
 
-typedef HpackHuffmanDecoder::HuffmanWord HuffmanWord;
-typedef HpackHuffmanDecoder::HuffmanCodeLength HuffmanCodeLength;
+typedef SpdyHpackHuffmanDecoder::HuffmanWord HuffmanWord;
+typedef SpdyHpackHuffmanDecoder::HuffmanCodeLength HuffmanCodeLength;
 
 const HuffmanCodeLength kHuffmanWordLength =
     std::numeric_limits<HuffmanWord>::digits;
@@ -180,8 +180,8 @@ bool IsEOSPrefix(HuffmanWord bits, HuffmanCodeLength bits_available) {
 // TODO(jamessynge): Is this being inlined by the compiler? Should we inline
 // into DecodeString the tests for code lengths 5 through 8 (> 99% of codes
 // according to the HPACK spec)?
-HpackHuffmanDecoder::HuffmanCodeLength HpackHuffmanDecoder::CodeLengthOfPrefix(
-    HpackHuffmanDecoder::HuffmanWord value) {
+SpdyHpackHuffmanDecoder::HuffmanCodeLength SpdyHpackHuffmanDecoder::CodeLengthOfPrefix(
+    SpdyHpackHuffmanDecoder::HuffmanWord value) {
   HuffmanCodeLength length;
   if (value < 0xb8000000) {
     if (value < 0x50000000) {
@@ -267,7 +267,7 @@ HpackHuffmanDecoder::HuffmanCodeLength HpackHuffmanDecoder::CodeLengthOfPrefix(
   return length;
 }
 
-HuffmanWord HpackHuffmanDecoder::DecodeToCanonical(
+HuffmanWord SpdyHpackHuffmanDecoder::DecodeToCanonical(
     HuffmanCodeLength code_length,
     HuffmanWord bits) {
   DCHECK_LE(kMinCodeLength, code_length);
@@ -292,7 +292,7 @@ HuffmanWord HpackHuffmanDecoder::DecodeToCanonical(
   return first_canonical + ordinal_in_length;
 }
 
-uint8_t HpackHuffmanDecoder::CanonicalToSource(HuffmanWord canonical) {
+uint8_t SpdyHpackHuffmanDecoder::CanonicalToSource(HuffmanWord canonical) {
   DCHECK_LT(canonical, 256u);
   return kCanonicalToSymbol[canonical];
 }
@@ -303,7 +303,7 @@ uint8_t HpackHuffmanDecoder::CanonicalToSource(HuffmanWord canonical) {
 // long strings, and a later portion dealing with the last few bytes of strings.
 // TODO(jamessynge): Determine if that is worth it by adding some counters to
 // measure the distribution of string sizes seen in practice.
-bool HpackHuffmanDecoder::DecodeString(HpackInputStream* in, SpdyString* out) {
+bool SpdyHpackHuffmanDecoder::DecodeString(HpackInputStream* in, SpdyString* out) {
   out->clear();
 
   // Load |bits| with the leading bits of the input stream, left justified