Land recent SPDY changes (through 66310528)

net/spdy/hpack_decoder.h

Index: net/spdy/hpack_decoder.h
diff --git a/net/spdy/hpack_decoder.h b/net/spdy/hpack_decoder.h
index ec2949bd99b2cfbabf0c2de0cf9005cdef7f4cf3..70729667de7396243ca5a7fa12c8f18d182705ca 100644
--- a/net/spdy/hpack_decoder.h
+++ b/net/spdy/hpack_decoder.h
@@ -18,7 +18,7 @@
 #include "net/spdy/spdy_protocol.h"
 
 // An HpackDecoder decodes 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 {
 
@@ -85,9 +85,8 @@ class NET_EXPORT_PRIVATE HpackDecoder {
   const uint32 max_string_literal_size_;
   HpackHeaderTable header_table_;
 
-  // Incrementally reconstructed cookie value. Name is also kept to preserve
-  // input casing.
-  std::string cookie_value_, cookie_name_;
+  // Incrementally reconstructed cookie value.
+  std::string cookie_value_;
 
   // TODO(jgraettinger): Buffer for headers data, and storage for the last-
   // processed headers block. Both will be removed with the switch to