Land recent SPDY changes (through 66310528)

net/spdy/spdy_test_utils.cc

 // Copyright (c) 2012 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/spdy_test_utils.h"
 
 #include <cstring>
+#include <vector>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/sys_byteorder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace test {
 
 std::string HexDumpWithMarks(const unsigned char* data, int length,
                              const bool* marks, int mark_length) {
   static const char kHexChars[] = "0123456789abcdef";
@@ skipping 101 matching lines @@
         memcpy(frame->data(),
                reinterpret_cast<char*>(&wire_length),
                sizeof(uint16));
       }
       break;
     default:
       LOG(FATAL) << "Unsupported SPDY version.";
   }
 }
 
+std::string a2b_hex(const char* hex_data) {
+  std::vector<uint8> output;
+  std::string result;
+  if (base::HexStringToBytes(hex_data, &output))
+    result.assign(reinterpret_cast<const char*>(&output[0]), output.size());
+  return result;
+}
 
 }  // namespace test
 
 }  // namespace net