Land recent SPDY changes (through 66310528)

net/spdy/hpack_encoder.h

 // 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.
 
 #ifndef NET_SPDY_HPACK_ENCODER_H_
 #define NET_SPDY_HPACK_ENCODER_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/macros.h"
 #include "base/strings/string_piece.h"
 #include "net/base/net_export.h"
 #include "net/spdy/hpack_header_table.h"
 #include "net/spdy/hpack_output_stream.h"
 
 // An HpackEncoder encodes header sets as outlined in
-// http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-06
+// http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-07
 
 namespace net {
 
 class HpackHuffmanTable;
 
 namespace test {
 class HpackEncoderPeer;
 }  // namespace test
 
 class NET_EXPORT_PRIVATE HpackEncoder {
@@ skipping 68 matching lines @@
   // Externally-owned, nullable storage for character counts of literals.
   std::vector<size_t>* char_counts_;
   size_t* total_char_counts_;
 
   DISALLOW_COPY_AND_ASSIGN(HpackEncoder);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_HPACK_ENCODER_H_