Stop using SpdySynReplyIR for SPDY 4.

net/spdy/spdy_websocket_test_util.cc

Index: net/spdy/spdy_websocket_test_util.cc
diff --git a/net/spdy/spdy_websocket_test_util.cc b/net/spdy/spdy_websocket_test_util.cc
index 5e79020c21a9084ff53f0bbda43ac604a9b25772..b30e24c970e8e184234e858d7517b7640b3ca16a 100644
--- a/net/spdy/spdy_websocket_test_util.cc
+++ b/net/spdy/spdy_websocket_test_util.cc
@@ -52,15 +52,9 @@ SpdyFrame* SpdyWebSocketTestUtil::ConstructSpdyWebSocketSynStream(
 
 SpdyFrame* SpdyWebSocketTestUtil::ConstructSpdyWebSocketSynReply(
     int stream_id) {
-  scoped_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock());
-  SetHeader("status", "101", headers.get());
-  return spdy_util_.ConstructSpdyControlFrame(headers.Pass(),
-                                              false,
-                                              stream_id,
-                                              LOWEST,
-                                              SYN_REPLY,
-                                              CONTROL_FLAG_NONE,
-                                              0);
+  SpdyHeaderBlock block;
+  SetHeader("status", "101", &block);
+  return spdy_util_.ConstructSpdyReply(stream_id, block);
 }
 
 SpdyFrame* SpdyWebSocketTestUtil::ConstructSpdyWebSocketHandshakeRequestFrame(
@@ -92,25 +86,7 @@ SpdyFrame* SpdyWebSocketTestUtil::ConstructSpdyWebSocketHandshakeResponseFrame(
     scoped_ptr<SpdyHeaderBlock> headers,
     SpdyStreamId stream_id,
     RequestPriority request_priority) {
-  // SPDY SYN_REPLY control frame header.
-  const SpdyHeaderInfo kSynReplyHeader = {
-    SYN_REPLY,
-    stream_id,
-    kDefaultAssociatedStreamId,
-    ConvertRequestPriorityToSpdyPriority(request_priority, SPDY2),
-    kSpdyCredentialSlotUnused,
-    CONTROL_FLAG_NONE,
-    kDefaultCompressed,
-    RST_STREAM_INVALID,
-    kDefaultDataPointer,
-    kDefaultDataLength,
-    DATA_FLAG_NONE
-  };
-
-  // Construct SPDY SYN_REPLY control frame.
-  return spdy_util_.ConstructSpdyFrame(
-      kSynReplyHeader,
-      headers.Pass());
+  return spdy_util_.ConstructSpdyReply(stream_id, *headers);
 }
 
 SpdyFrame* SpdyWebSocketTestUtil::ConstructSpdyWebSocketHeadersFrame(