Update from https://crrev.com/309415

net/spdy/hpack_encoder_test.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 <map>
 #include <string>
 
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 301 matching lines @@
     CompareWithExpectedEncoding(headers);
   }
   // Header table is:
   // 65: key1: value1
   // 64: key2: value2
   // 63: cookie: a=bb
   // 62: cookie: c=dd
   // Pass 2.
   {
     map<string, string> headers;
-    headers["key1"] = "value1";
     headers["key2"] = "value2";
     headers["cookie"] = "c=dd; e=ff";
 
     ExpectIndex(IndexOf(cookie_c_));
-    // key1 by index.
+    // This cookie evicts |key1| from the dynamic table.
+    ExpectIndexedLiteral(peer_.table()->GetByName("cookie"), "e=ff");
+    // "key2: value2"
     ExpectIndex(65);
-    // key2 by index.
-    ExpectIndex(64);
-    // This cookie evicts |key1| from the header table.
-    ExpectIndexedLiteral(peer_.table()->GetByName("cookie"), "e=ff");
 
     CompareWithExpectedEncoding(headers);
   }
   // Header table is:
   // 65: key2: value2
   // 64: cookie: a=bb
   // 63: cookie: c=dd
   // 62: cookie: e=ff
   // Pass 3.
   {
     map<string, string> headers;
-    headers["key1"] = "value1";
-    headers["key3"] = "value3";
-    headers["cookie"] = "e=ff";
+    headers["key2"] = "value2";
+    headers["cookie"] = "a=bb; b=cc; c=dd";
 
-    // cookie: e=ff by index.
-    ExpectIndex(62);
-    ExpectIndexedLiteral("key1", "value1");
-    ExpectIndexedLiteral("key3", "value3");
+    // "cookie: a=bb"
+    ExpectIndex(64);
+    // This cookie evicts |key2| from the dynamic table.
+    ExpectIndexedLiteral(peer_.table()->GetByName("cookie"), "b=cc");
+    // "cookie: c=dd"
+    ExpectIndex(64);
+    // "key2: value2"
+    ExpectIndexedLiteral("key2", "value2");
 
     CompareWithExpectedEncoding(headers);
   }
 }
 
 TEST_F(HpackEncoderTest, PseudoHeadersFirst) {
   map<string, string> headers;
   // A pseudo-header to be indexed.
   headers[":authority"] = "www.example.com";
   // A pseudo-header that should not be indexed.
   headers[":path"] = "/spam/eggs.html";
   // A regular header which precedes ":" alphabetically, should still be encoded
   // after pseudo-headers.
   headers["-foo"] = "bar";
   headers["foo"] = "bar";
   headers["cookie"] = "c=dd";
 
   // Pseudo-headers are encoded in alphabetical order.
+  // This entry pushes "cookie: a=bb" back to 63.
   ExpectIndexedLiteral(peer_.table()->GetByName(":authority"),
                        "www.example.com");
   ExpectNonIndexedLiteral(":path", "/spam/eggs.html");
-  // Regular headers in the header table are encoded first.
-  ExpectIndex(IndexOf(cookie_a_));
-  // Regular headers not in the header table are encoded, in alphabetical order.
+  // Regular headers are endoded in alphabetical order.
+  // This entry pushes "cookie: a=bb" back to 64.
   ExpectIndexedLiteral("-foo", "bar");
+  ExpectIndex(64);
   ExpectIndexedLiteral("foo", "bar");
   CompareWithExpectedEncoding(headers);
 }
 
 TEST_F(HpackEncoderTest, CookieToCrumbs) {
   test::HpackEncoderPeer peer(NULL);
   std::vector<StringPiece> out;
 
   // A space after ';' is consumed. All other spaces remain. ';' at beginning
   // and end of string produce empty crumbs. Duplicate crumbs are removed.
@@ skipping 74 matching lines @@
   expected_.AppendUint32(62);
   expected_.AppendPrefix(kStringLiteralIdentityEncoded);
   expected_.AppendUint32(3);
   expected_.AppendBytes("bar");
   CompareWithExpectedEncoding(headers);
 }
 
 }  // namespace
 
 }  // namespace net