Land recent SPDY changes (through 66310528)

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 298 matching lines @@
   headers["cookie"] = "e=ff; a=bb; c=dd";
   CompareWithExpectedEncoding(headers);
 }
 
 TEST_F(HpackEncoderTest, StringsDynamicallySelectHuffmanCoding) {
   peer_.set_allow_huffman_compression(true);
 
   // Compactable string. Uses Huffman coding.
   peer_.EmitString("feedbeef");
   expected_.AppendPrefix(kStringLiteralHuffmanEncoded);
-  expected_.AppendUint32(5);
-  expected_.AppendBytes("\xC4G\v\xC4q");
+  expected_.AppendUint32(6);
+  expected_.AppendBytes("\xE0\xB5\xD3\xBDk\xE1");
 
   // Non-compactable. Uses identity coding.
   peer_.EmitString("@@@@@@");
   expected_.AppendPrefix(kStringLiteralIdentityEncoded);
   expected_.AppendUint32(6);
   expected_.AppendBytes("@@@@@@");
 
   string expected_out, actual_out;
   expected_.TakeString(&expected_out);
   peer_.TakeString(&actual_out);
@@ skipping 109 matching lines @@
   expect[static_cast<uint8>('\xff')] = 1;
   expect[static_cast<uint8>('b')] = 1;
 
   EXPECT_EQ(expect, counts);
   EXPECT_EQ(9u, total_counts);
 }
 
 }  // namespace
 
 }  // namespace net