Index: net/spdy/spdy_test_util_common.cc |
diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc |
index 8225d0aa7de63483a874ee042e64ee4f8776655e..116f00ff97bf85220c8fbff48bcd321c2235eb63 100644 |
--- a/net/spdy/spdy_test_util_common.cc |
+++ b/net/spdy/spdy_test_util_common.cc |
@@ -953,12 +953,23 @@ SpdyFrame* SpdyTestUtil::ConstructSpdyGet(const char* const extra_headers[], |
int stream_id, |
RequestPriority request_priority, |
bool direct) { |
+ return ConstructSpdyGet(extra_headers, extra_header_count, compressed, |
+ stream_id, request_priority, direct, true); |
+} |
+ |
+SpdyFrame* SpdyTestUtil::ConstructSpdyGet(const char* const extra_headers[], |
+ int extra_header_count, |
+ bool compressed, |
+ int stream_id, |
+ RequestPriority request_priority, |
+ bool direct, |
+ bool fin) { |
SpdyHeaderBlock block; |
MaybeAddVersionHeader(&block); |
block[GetMethodKey()] = "GET"; |
AddUrlToHeaderBlock(default_url_.spec(), &block); |
AppendToHeaderBlock(extra_headers, extra_header_count, &block); |
- return ConstructSpdySyn(stream_id, block, request_priority, compressed, true); |
+ return ConstructSpdySyn(stream_id, block, request_priority, compressed, fin); |
} |
SpdyFrame* SpdyTestUtil::ConstructSpdyConnect( |
@@ -1100,7 +1111,15 @@ SpdyFrame* SpdyTestUtil::ConstructSpdyPushHeaders( |
SpdyFrame* SpdyTestUtil::ConstructSpdyHeaderFrame(int stream_id, |
const char* const headers[], |
int header_count) { |
+ return ConstructSpdyHeaderFrame(stream_id, headers, header_count, false); |
+} |
+ |
+SpdyFrame* SpdyTestUtil::ConstructSpdyHeaderFrame(int stream_id, |
+ const char* const headers[], |
+ int header_count, |
+ bool fin) { |
SpdyHeadersIR spdy_headers(stream_id); |
+ spdy_headers.set_fin(fin); |
AppendToHeaderBlock(headers, header_count, |
spdy_headers.mutable_header_block()); |
return CreateFramer(false)->SerializeFrame(spdy_headers); |
@@ -1225,7 +1244,7 @@ SpdyFrame* SpdyTestUtil::ConstructSpdyPostSynReply( |
const char* const extra_headers[], |
int extra_header_count) { |
// TODO(jgraettinger): Remove this method. |
- return ConstructSpdyGetSynReply(NULL, 0, 1); |
+ return ConstructSpdyGetSynReply(extra_headers, extra_header_count, 1); |
} |
SpdyFrame* SpdyTestUtil::ConstructSpdyBodyFrame(int stream_id, bool fin) { |