Land recent SPDY changes (through 66310528)

net/spdy/spdy_test_utils.cc

Index: net/spdy/spdy_test_utils.cc
diff --git a/net/spdy/spdy_test_utils.cc b/net/spdy/spdy_test_utils.cc
index a7cfc901fbd93ed3e24298a30043f02c05a53d43..e33a08bc1c33f81d4bcdef41e91a16abedef0084 100644
--- a/net/spdy/spdy_test_utils.cc
+++ b/net/spdy/spdy_test_utils.cc
@@ -5,9 +5,11 @@
 #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"
 
@@ -129,6 +131,13 @@ void SetFrameLength(SpdyFrame* frame,
   }
 }
 
+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