Land recent SPDY changes (through 70021377)

net/spdy/fuzzing/hpack_fuzz_util_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/fuzzing/hpack_fuzz_util.h"
 
 #include <map>
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
@@ skipping 77 matching lines @@
 
 TEST(HpackFuzzUtilTest, SerializedHeaderBlockPrefixes) {
   EXPECT_EQ(string("\x00\x00\x00\x00", 4), HpackFuzzUtil::HeaderBlockPrefix(0));
   EXPECT_EQ(string("\x00\x00\x00\x05", 4), HpackFuzzUtil::HeaderBlockPrefix(5));
   EXPECT_EQ(string("\x4f\xb3\x0a\x91", 4),
             HpackFuzzUtil::HeaderBlockPrefix(1337133713));
 }
 
 TEST(HpackFuzzUtilTest, PassValidInputThroughAllStages) {
   // Example lifted from HpackDecoderTest.SectionD3RequestHuffmanExamples.
-  string input = a2b_hex("828786448ce7cf9bebe89b6fb16fa9b6ff");
+  string input = a2b_hex("828786448cf1e3c2e5f23a6ba0ab90f4"
+                         "ff");
 
   HpackFuzzUtil::FuzzerContext context;
   HpackFuzzUtil::InitializeFuzzerContext(&context);
 
   EXPECT_TRUE(
       HpackFuzzUtil::RunHeaderBlockThroughFuzzerStages(&context, input));
 
   std::map<string, string> expect;
   expect[":method"] = "GET";
   expect[":scheme"] = "http";
@@ skipping 33 matching lines @@
   EXPECT_EQ(unmodified, buffer);
   HpackFuzzUtil::FlipBits(reinterpret_cast<uint8*>(buffer),
                           arraysize(buffer) - 1,
                           1);
   EXPECT_NE(unmodified, buffer);
 }
 
 }  // namespace
 
 }  // namespace net