Land recent SPDY changes (through 67282679)

net/spdy/hpack_decoder.cc

 // 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.
 
 #include "net/spdy/hpack_decoder.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "net/spdy/hpack_constants.h"
 #include "net/spdy/hpack_output_stream.h"
@@ skipping 42 matching lines @@
       headers_block_buffer_.clear();
       return false;
     }
   }
   headers_block_buffer_.clear();
 
   // Emit everything in the reference set that hasn't already been emitted.
   // 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;
 
     if (entry->state() == kNoState) {
       HandleHeaderRepresentation(entry->name(), entry->value());
     } else {
       entry->set_state(kNoState);
     }
   }
@@ skipping 157 matching lines @@
     return result;
   } else if (input_stream->MatchPrefixAndConsume(
       kStringLiteralIdentityEncoded)) {
     return input_stream->DecodeNextIdentityString(output);
   } else {
     return false;
   }
 }
 
 }  // namespace net