Land recent SPDY changes (through 70021377)

net/spdy/spdy_test_util_common.h

 // Copyright (c) 2013 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_SPDY_TEST_UTIL_COMMON_H_
 #define NET_SPDY_SPDY_TEST_UTIL_COMMON_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 447 matching lines @@
                                const char* location);
 
   SpdyFrame* ConstructInitialSpdyPushFrame(scoped_ptr<SpdyHeaderBlock> headers,
                                            int stream_id,
                                            int associated_stream_id);
 
   SpdyFrame* ConstructSpdyPushHeaders(int stream_id,
                                       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.
   // Returns a SpdyFrame.
   SpdyFrame* ConstructSpdyGetSynReply(const char* const extra_headers[],
                                       int extra_header_count,
                                       int stream_id);
 
   // Constructs a standard SPDY SYN_REPLY frame to match the SPDY GET.
   // |extra_headers| are the extra header-value pairs, which typically
@@ skipping 47 matching lines @@
                                     uint32 len, bool fin);
 
   // Wraps |frame| in the payload of a data frame in stream |stream_id|.
   SpdyFrame* ConstructWrappedSpdyFrame(const scoped_ptr<SpdyFrame>& frame,
                                        int stream_id);
 
   const SpdyHeaderInfo MakeSpdyHeader(SpdyFrameType type);
 
   // 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;
 
   NextProto protocol() const { return protocol_; }
   SpdyMajorVersion spdy_version() const { return spdy_version_; }
   bool is_spdy2() const { return protocol_ < kProtoSPDY3; }
   bool include_version_header() const { return protocol_ < kProtoSPDY4; }
   scoped_ptr<SpdyFramer> CreateFramer(bool compressed) const;
 
@@ skipping 12 matching lines @@
       base::StringPiece url,
       int64* content_length) const;
 
   const NextProto protocol_;
   const SpdyMajorVersion spdy_version_;
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_TEST_UTIL_COMMON_H_