Land recent SPDY changes (through 66310528)

net/spdy/hpack_input_stream.h

Index: net/spdy/hpack_input_stream.h
diff --git a/net/spdy/hpack_input_stream.h b/net/spdy/hpack_input_stream.h
index 058a4b4286a741f6cbd67a5099c7d22166202f91..ec1dc03bbc7c76ce85fd0f0f1efeef3aa400c887 100644
--- a/net/spdy/hpack_input_stream.h
+++ b/net/spdy/hpack_input_stream.h
@@ -15,7 +15,7 @@
 #include "net/spdy/hpack_huffman_table.h"
 
 // All section references below are to
-// http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-06
+// http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-07
 
 namespace net {
 
@@ -31,9 +31,8 @@ class NET_EXPORT_PRIVATE HpackInputStream {
   // Returns whether or not there is more data to process.
   bool HasMoreData() const;
 
-  // If the next octet has the top |size| bits equal to |bits|,
-  // consumes it and returns true. Otherwise, consumes nothing and
-  // returns false.
+  // If the next bits of input match |prefix|, consumes them and returns true.
+  // Otherwise, consumes nothing and returns false.
   bool MatchPrefixAndConsume(HpackPrefix prefix);
 
   // The Decode* functions return true and fill in their arguments if
@@ -64,10 +63,6 @@ class NET_EXPORT_PRIVATE HpackInputStream {
     bit_offset_ = bit_offset;
   }
 
-  bool DecodeNextUint32ForTest(uint32* I) {
-    return DecodeNextUint32(I);
-  }
-
  private:
   const uint32 max_string_literal_size_;
   base::StringPiece buffer_;