Land recent SPDY changes (through 66310528)

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"
 #include "base/files/file.h"
 #include "base/path_service.h"
+#include "net/spdy/spdy_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
+namespace {
+
 using base::StringPiece;
 using std::map;
 using std::string;
+using test::a2b_hex;
 
 TEST(HpackFuzzUtilTest, GeneratorContextInitialization) {
   HpackFuzzUtil::GeneratorContext context;
   HpackFuzzUtil::InitializeGeneratorContext(&context);
 
   // Context was seeded with initial name & value fixtures.
   EXPECT_LT(0u, context.names.size());
   EXPECT_LT(0u, context.values.size());
 }
 
@@ skipping 53 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.
-  char input[] =
-      "\x82\x87\x86\x04\x8b\xdb\x6d\x88\x3e\x68\xd1\xcb\x12\x25\xba\x7f";
+  string input = a2b_hex("828786448ce7cf9bebe89b6fb16fa9b6ff");
 
   HpackFuzzUtil::FuzzerContext context;
   HpackFuzzUtil::InitializeFuzzerContext(&context);
 
-  EXPECT_TRUE(HpackFuzzUtil::RunHeaderBlockThroughFuzzerStages(
-      &context,
-      StringPiece(input, arraysize(input) - 1)));
+  EXPECT_TRUE(
+      HpackFuzzUtil::RunHeaderBlockThroughFuzzerStages(&context, input));
 
   std::map<string, string> expect;
   expect[":method"] = "GET";
   expect[":scheme"] = "http";
   expect[":path"] = "/";
   expect[":authority"] = "www.example.com";
   EXPECT_EQ(expect, context.third_stage->decoded_block());
 }
 
 TEST(HpackFuzzUtilTest, ValidFuzzExamplesRegressionTest) {
   base::FilePath source_root;
   ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &source_root));
 
   // Load the example fixtures versioned with the source tree.
   HpackFuzzUtil::Input input;
   ASSERT_TRUE(base::ReadFileToString(
       source_root.Append(FILE_PATH_LITERAL("net"))
                  .Append(FILE_PATH_LITERAL("data"))
                  .Append(FILE_PATH_LITERAL("spdy_tests"))
-                 .Append(FILE_PATH_LITERAL("examples.hpack")),
+                 .Append(FILE_PATH_LITERAL("examples_07.hpack")),
       &input.input));
 
   HpackFuzzUtil::FuzzerContext context;
   HpackFuzzUtil::InitializeFuzzerContext(&context);
 
   StringPiece block;
   while (HpackFuzzUtil::NextHeaderBlock(&input, &block)) {
     // As these are valid examples, all fuzz stages should succeed.
     EXPECT_TRUE(HpackFuzzUtil::RunHeaderBlockThroughFuzzerStages(
         &context, block));
   }
 }
 
 TEST(HpackFuzzUtilTest, FlipBitsMutatesBuffer) {
   char buffer[] = "testbuffer1234567890";
   string unmodified(buffer, arraysize(buffer) - 1);
 
   EXPECT_EQ(unmodified, buffer);
   HpackFuzzUtil::FlipBits(reinterpret_cast<uint8*>(buffer),
                           arraysize(buffer) - 1,
                           1);
   EXPECT_NE(unmodified, buffer);
 }
 
+}  // namespace
+
 }  // namespace net