Land recent SPDY changes (through 70021377)

net/spdy/hpack_encoder.h

Index: net/spdy/hpack_encoder.h
diff --git a/net/spdy/hpack_encoder.h b/net/spdy/hpack_encoder.h
index c3ab96bcbe44b5075f7cb5b6c2a0c023357efdbd..12e41c52375f36e2da4e459998c858a80560ec22 100644
--- a/net/spdy/hpack_encoder.h
+++ b/net/spdy/hpack_encoder.h
@@ -17,7 +17,7 @@
 #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-07
+// http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-08
 
 namespace net {
 
@@ -65,11 +65,11 @@ class NET_EXPORT_PRIVATE HpackEncoder {
   typedef std::pair<base::StringPiece, base::StringPiece> Representation;
   typedef std::vector<Representation> Representations;
 
-  // Emits a static/dynamic indexed representation (Section 4.2).
+  // Emits a static/dynamic indexed representation (Section 7.1).
   void EmitDynamicIndex(HpackEntry* entry);
   void EmitStaticIndex(HpackEntry* entry);
 
-  // Emits a literal representation (Section 4.3).
+  // Emits a literal representation (Section 7.2).
   void EmitIndexedLiteral(const Representation& representation);
   void EmitNonIndexedLiteral(const Representation& representation);
   void EmitLiteral(const Representation& representation);