Land recent SPDY changes (through 70021377)

net/spdy/spdy_test_util_common.h

Index: net/spdy/spdy_test_util_common.h
diff --git a/net/spdy/spdy_test_util_common.h b/net/spdy/spdy_test_util_common.h
index f04ad4205c34534efa7deec2395dfeee2a4ddb7d..108e278541667ad0904983ec467204b66312921f 100644
--- a/net/spdy/spdy_test_util_common.h
+++ b/net/spdy/spdy_test_util_common.h
@@ -465,6 +465,20 @@ class SpdyTestUtil {
                                       const char* const extra_headers[],
                                       int extra_header_count);
 
+  // Construct a SPDY syn (HEADERS or SYN_STREAM, depending on protocol
+  // version) carrying exactly the given headers and priority.
+  SpdyFrame* ConstructSpdySyn(int stream_id,
+                              const SpdyHeaderBlock& headers,
+                              RequestPriority priority,
+                              bool compressed,
+                              bool fin) const;
+
+  // Construct a SPDY reply (HEADERS or SYN_REPLY, depending on protocol
+  // version) carrying exactly the given headers, and the default priority
+  // (or no priority, depending on protocl version).
+  // The |headers| parameter variant is preferred.
+  SpdyFrame* ConstructSpdyReply(int stream_id, const SpdyHeaderBlock& headers);
+
   // Constructs a standard SPDY SYN_REPLY frame to match the SPDY GET.
   // |extra_headers| are the extra header-value pairs, which typically
   // will vary the most between calls.
@@ -532,6 +546,7 @@ class SpdyTestUtil {
 
   // For versions below SPDY4, adds the version HTTP/1.1 header.
   void MaybeAddVersionHeader(SpdyFrameWithNameValueBlockIR* frame_ir) const;
+  void MaybeAddVersionHeader(SpdyHeaderBlock* block) const;
 
   // Maps |priority| to SPDY version priority, and sets it on |frame_ir|.
   void SetPriority(RequestPriority priority, SpdySynStreamIR* frame_ir) const;