Update from https://crrev.com/307330

net/spdy/hpack_huffman_table_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_huffman_table.h"
 
 #include <bitset>
 #include <string>
 
 #include "base/logging.h"
@@ skipping 220 matching lines @@
   HpackHuffmanSymbol code[] = {
     {bits32("01100000000000000000000000000000"), 4, 0},  // 3rd.
     {bits32("01110000000000000000000000000000"), 4, 1},  // 4th.
     {bits32("00000000000000000000000000000000"), 2, 2},  // 1st assigned code.
     {bits32("01000000000000000000000000000000"), 3, 3},  // 2nd.
     {bits32("10000000000000000000000000000000"), 5, 4},  // 5th.
     {bits32("10001000000000000000000000000000"), 5, 5},  // 6th.
     {bits32("10011000000000000000000000000000"), 8, 6},  // 8th.
     {bits32("10010000000000000000000000000000"), 5, 7}};  // 7th.
   EXPECT_TRUE(table_.Initialize(code, arraysize(code)));
-
-  EXPECT_THAT(peer_.code_by_id(), ElementsAre(
-      bits32("01100000000000000000000000000000"),
-      bits32("01110000000000000000000000000000"),
-      bits32("00000000000000000000000000000000"),
-      bits32("01000000000000000000000000000000"),
-      bits32("10000000000000000000000000000000"),
-      bits32("10001000000000000000000000000000"),
-      bits32("10011000000000000000000000000000"),
-      bits32("10010000000000000000000000000000")));
-  EXPECT_THAT(peer_.length_by_id(), ElementsAre(
-      4, 4, 2, 3, 5, 5, 8, 5));
+  ASSERT_EQ(arraysize(code), peer_.code_by_id().size());
+  ASSERT_EQ(arraysize(code), peer_.length_by_id().size());
+  for (size_t i = 0; i < arraysize(code); ++i) {
+    EXPECT_EQ(code[i].code, peer_.code_by_id()[i]);
+    EXPECT_EQ(code[i].length, peer_.length_by_id()[i]);
+  }
 
   EXPECT_EQ(1u, peer_.decode_tables().size());
   {
     std::vector<DecodeEntry> expected;
     expected.resize(128, DecodeEntry(0, 2, 2));  // Fills 128.
     expected.resize(192, DecodeEntry(0, 3, 3));  // Fills 64.
     expected.resize(224, DecodeEntry(0, 4, 0));  // Fills 32.
     expected.resize(256, DecodeEntry(0, 4, 1));  // Fills 32.
     expected.resize(272, DecodeEntry(0, 5, 4));  // Fills 16.
     expected.resize(288, DecodeEntry(0, 5, 5));  // Fills 16.
@@ skipping 249 matching lines @@
     output_stream.TakeString(&encoding);
     EXPECT_EQ(encoding.size(), table_.EncodedSize(test_table[i]));
   }
 }
 
 }  // namespace
 
 }  // namespace test
 
 }  // namespace net