Stop using SpdySynReplyIR for SPDY 4.

net/spdy/spdy_test_util_common.cc

 // 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.
 
 #include "net/spdy/spdy_test_util_common.h"
 
 #include <cstddef>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 1098 matching lines @@
     const char* const extra_headers[],
     int extra_header_count) {
   SpdyHeadersIR headers(stream_id);
   headers.SetHeader(GetStatusKey(), "200 OK");
   MaybeAddVersionHeader(&headers);
   AppendToHeaderBlock(extra_headers, extra_header_count,
                       headers.mutable_name_value_block());
   return CreateFramer(false)->SerializeFrame(headers);
 }
 
+SpdyFrame* SpdyTestUtil::ConstructSpdyReply(int stream_id,
+                                            const SpdyHeaderBlock& headers) {
+  if (protocol_ < kProtoSPDY4) {
+    SpdySynReplyIR syn_reply(stream_id);
+    syn_reply.set_name_value_block(headers);
+    return CreateFramer(false)->SerializeFrame(syn_reply);
+  } else {
+    SpdyHeadersIR reply(stream_id);
+    reply.set_name_value_block(headers);
+    return CreateFramer(false)->SerializeFrame(reply);
+  }
+}
+
 SpdyFrame* SpdyTestUtil::ConstructSpdySynReplyError(
     const char* const status,
     const char* const* const extra_headers,
     int extra_header_count,
     int stream_id) {
-  SpdySynReplyIR syn_reply(stream_id);
-  syn_reply.SetHeader("hello", "bye");
-  syn_reply.SetHeader(GetStatusKey(), status);
-  MaybeAddVersionHeader(&syn_reply);
-  AppendToHeaderBlock(extra_headers, extra_header_count,
-                      syn_reply.mutable_name_value_block());
-  return CreateFramer(false)->SerializeFrame(syn_reply);
+  SpdyHeaderBlock block;
+  block["hello"] = "bye";
+  block[GetStatusKey()] = status;
+  MaybeAddVersionHeader(&block);
+  AppendToHeaderBlock(extra_headers, extra_header_count, &block);
+
+  return ConstructSpdyReply(stream_id, block);
 }
 
 SpdyFrame* SpdyTestUtil::ConstructSpdyGetSynReplyRedirect(int stream_id) {
   static const char* const kExtraHeaders[] = {
     "location", "http://www.foo.com/index.php",
   };
   return ConstructSpdySynReplyError("301 Moved Permanently", kExtraHeaders,
                                     arraysize(kExtraHeaders)/2, stream_id);
 }
 
 SpdyFrame* SpdyTestUtil::ConstructSpdySynReplyError(int stream_id) {
   return ConstructSpdySynReplyError("500 Internal Server Error", NULL, 0, 1);
 }
 
 SpdyFrame* SpdyTestUtil::ConstructSpdyGetSynReply(
     const char* const extra_headers[],
     int extra_header_count,
     int stream_id) {
-  SpdySynReplyIR syn_reply(stream_id);
-  syn_reply.SetHeader("hello", "bye");
-  syn_reply.SetHeader(GetStatusKey(), "200");
-  MaybeAddVersionHeader(&syn_reply);
-  AppendToHeaderBlock(extra_headers, extra_header_count,
-                      syn_reply.mutable_name_value_block());
-  return CreateFramer(false)->SerializeFrame(syn_reply);
+  SpdyHeaderBlock block;
+  block["hello"] = "bye";
+  block[GetStatusKey()] = "200";
+  MaybeAddVersionHeader(&block);
+  AppendToHeaderBlock(extra_headers, extra_header_count, &block);
+
+  return ConstructSpdyReply(stream_id, block);
 }
 
 SpdyFrame* SpdyTestUtil::ConstructSpdyPost(const char* url,
                                            SpdyStreamId stream_id,
                                            int64 content_length,
                                            RequestPriority priority,
                                            const char* const extra_headers[],
                                            int extra_header_count) {
   const SpdyHeaderInfo kSynStartHeader = {
     SYN_STREAM,
@@ skipping 23 matching lines @@
   MaybeAddVersionHeader(&syn_stream);
   SetPriority(LOWEST, &syn_stream);
   AppendToHeaderBlock(extra_headers, extra_header_count,
                       syn_stream.mutable_name_value_block());
   return CreateFramer(false)->SerializeFrame(syn_stream);
 }
 
 SpdyFrame* SpdyTestUtil::ConstructSpdyPostSynReply(
     const char* const extra_headers[],
     int extra_header_count) {
-  SpdySynReplyIR syn_reply(1);
-  syn_reply.SetHeader("hello", "bye");
-  syn_reply.SetHeader(GetStatusKey(), "200");
-  syn_reply.SetHeader(GetPathKey(), "/index.php");
-  MaybeAddVersionHeader(&syn_reply);
-  AppendToHeaderBlock(extra_headers, extra_header_count,
-                      syn_reply.mutable_name_value_block());
-  return CreateFramer(false)->SerializeFrame(syn_reply);
+  // TODO(jgraettinger): Remove this method.
+  return ConstructSpdyGetSynReply(NULL, 0, 1);
 }
 
 SpdyFrame* SpdyTestUtil::ConstructSpdyBodyFrame(int stream_id, bool fin) {
   SpdyFramer framer(spdy_version_);
   SpdyDataIR data_ir(stream_id,
                      base::StringPiece(kUploadData, kUploadDataSize));
   data_ir.set_fin(fin);
   return framer.SerializeData(data_ir);
 }
 
@@ skipping 87 matching lines @@
   return headers.Pass();
 }
 
 void SpdyTestUtil::MaybeAddVersionHeader(
     SpdyFrameWithNameValueBlockIR* frame_ir) const {
   if (include_version_header()) {
     frame_ir->SetHeader(GetVersionKey(), "HTTP/1.1");
   }
 }
 
+void SpdyTestUtil::MaybeAddVersionHeader(SpdyHeaderBlock* block) const {
+  if (include_version_header()) {
+    (*block)[GetVersionKey()] = "HTTP/1.1";
+  }
+}
+
 void SpdyTestUtil::SetPriority(RequestPriority priority,
                                SpdySynStreamIR* ir) const {
   ir->set_priority(ConvertRequestPriorityToSpdyPriority(
       priority, spdy_version()));
 }
 
 }  // namespace net