Land recent SPDY changes (through 66310528)

net/spdy/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/hpack_input_stream.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 12 matching lines @@
 HpackInputStream::~HpackInputStream() {}
 
 bool HpackInputStream::HasMoreData() const {
   return !buffer_.empty();
 }
 
 bool HpackInputStream::MatchPrefixAndConsume(HpackPrefix prefix) {
   DCHECK_GT(prefix.bit_size, 0u);
   DCHECK_LE(prefix.bit_size, 8u);
 
-  uint8 next_octet = 0;
-  if (!PeekNextOctet(&next_octet))
+  uint32 peeked = 0;
+  size_t peeked_count = 0;
+
+  if (!PeekBits(&peeked_count, &peeked))
     return false;
 
-  if ((next_octet >> (8 - prefix.bit_size)) == prefix.bits) {
+  if ((peeked >> (32 - prefix.bit_size)) == prefix.bits) {
     ConsumeBits(prefix.bit_size);
     return true;
   }
-
   return false;
 }
 
 bool HpackInputStream::PeekNextOctet(uint8* next_octet) {
   if ((bit_offset_ > 0) || buffer_.empty())
     return false;
 
   *next_octet = buffer_[0];
   return true;
 }
@@ skipping 110 matching lines @@
   buffer_.remove_prefix(byte_count);
 }
 
 void HpackInputStream::ConsumeByteRemainder() {
   if (bit_offset_ != 0) {
     ConsumeBits(8 - bit_offset_);
   }
 }
 
 }  // namespace net