Land recent SPDY changes (through 67282679)

net/spdy/hpack_decoder.cc

Index: net/spdy/hpack_decoder.cc
diff --git a/net/spdy/hpack_decoder.cc b/net/spdy/hpack_decoder.cc
index 3f68938668bb6988339a798c47108f93c3950d47..abd579ad007049be6730eccd728e881109da6fa2 100644
--- a/net/spdy/hpack_decoder.cc
+++ b/net/spdy/hpack_decoder.cc
@@ -60,7 +60,7 @@ bool HpackDecoder::HandleControlFrameHeadersComplete(SpdyStreamId id) {
   // Also clear entry state for the next decoded headers block.
   // TODO(jgraettinger): We may need to revisit the order in which headers
   // are emitted (b/14051713).
-  for (HpackEntry::OrderedSet::const_iterator it =
+  for (HpackHeaderTable::OrderedEntrySet::const_iterator it =
           header_table_.reference_set().begin();
        it != header_table_.reference_set().end(); ++it) {
     HpackEntry* entry = *it;