Update from https://crrev.com/309415

net/spdy/hpack_encoder.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_encoder.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "net/spdy/hpack_header_table.h"
@@ skipping 46 matching lines @@
         // header table).
         EmitIndexedLiteral(*it);
       } else {
         // Most common pseudo-header fields are represented in the static table,
         // while uncommon ones are small, so do not index them.
         EmitNonIndexedLiteral(*it);
       }
     }
   }
 
-  // Encode regular headers that are already in the header table first,
-  // save the rest into another vector.  This way we avoid evicting an entry
-  // from the header table before it can be used.
-  Representations literal_headers;
+  // Encode regular headers.
   for (Representations::const_iterator it = regular_headers.begin();
        it != regular_headers.end(); ++it) {
     const HpackEntry* entry =
         header_table_.GetByNameAndValue(it->first, it->second);
     if (entry != NULL) {
       EmitIndex(entry);
     } else {
-      literal_headers.push_back(*it);
+      EmitIndexedLiteral(*it);
     }
   }
 
-  // Encode the remaining header fields, while inserting them in the header
-  // table.
-  for (Representations::const_iterator it = literal_headers.begin();
-       it != literal_headers.end(); ++it) {
-    EmitIndexedLiteral(*it);
-  }
-
   output_stream_.TakeString(output);
   return true;
 }
 
 bool HpackEncoder::EncodeHeaderSetWithoutCompression(
     const std::map<string, string>& header_set,
     string* output) {
 
   allow_huffman_compression_ = false;
   for (std::map<string, string>::const_iterator it = header_set.begin();
@@ skipping 108 matching lines @@
   size_t end = 0;
   while (end != StringPiece::npos) {
     end = header_field.second.find('\0', pos);
     out->push_back(make_pair(header_field.first,
                              header_field.second.substr(pos, end - pos)));
     pos = end + 1;
   }
 }
 
 }  // namespace net