Land recent SPDY changes (through 66310528)

net/spdy/spdy_test_utils.h

 // 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.
 
 #ifndef NET_SPDY_TEST_UTILS_H_
 #define NET_SPDY_TEST_UTILS_H_
 
 #include <string>
 
 #include "net/spdy/spdy_protocol.h"
@@ skipping 13 matching lines @@
     const int expected_len);
 
 void SetFrameFlags(SpdyFrame* frame,
                    uint8 flags,
                    SpdyMajorVersion spdy_version);
 
 void SetFrameLength(SpdyFrame* frame,
                     size_t length,
                     SpdyMajorVersion spdy_version);
 
+std::string a2b_hex(const char* hex_data);
+
 }  // namespace test
 
 }  // namespace net
 
 #endif  // NET_SPDY_TEST_UTILS_H_