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

net/spdy/core/hpack/hpack_input_stream.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_input_stream.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "net/spdy/core/hpack/hpack_huffman_decoder.h"
@@ skipping 136 matching lines @@
     need_more_data_ = true;
     DVLOG(1) << "HpackInputStream::DecodeNextHuffmanString " << encoded_size
              << " > " << buffer_.size();
     return false;
   }
 
   HpackInputStream bounded_reader(buffer_.substr(0, encoded_size));
   buffer_.remove_prefix(encoded_size);
   parsed_bytes_current_ += encoded_size;
 
-  return HpackHuffmanDecoder::DecodeString(&bounded_reader, str);
+  return SpdyHpackHuffmanDecoder::DecodeString(&bounded_reader, str);
 }
 
 bool HpackInputStream::PeekBits(size_t* peeked_count, uint32_t* out) const {
   size_t byte_offset = (bit_offset_ + *peeked_count) / 8;
   size_t bit_offset = (bit_offset_ + *peeked_count) % 8;
 
   if (*peeked_count >= 32 || byte_offset >= buffer_.size()) {
     return false;
   }
   // We'll read the minimum of the current byte remainder,
@@ skipping 72 matching lines @@
 
 bool HpackInputStream::NeedMoreData() const {
   return need_more_data_;
 }
 
 void HpackInputStream::MarkCurrentPosition() {
   parsed_bytes_ = parsed_bytes_current_;
 }
 
 }  // namespace net