Index: net/quic/quic_spdy_stream_test.cc |
diff --git a/net/quic/quic_spdy_stream_test.cc b/net/quic/quic_spdy_stream_test.cc |
index 8bd1e62bb5019a0ad623933579f6a61a079098f3..c9a4ea006c1726e2d587ca3e020be63aff29ef17 100644 |
--- a/net/quic/quic_spdy_stream_test.cc |
+++ b/net/quic/quic_spdy_stream_test.cc |
@@ -443,7 +443,7 @@ TEST_P(QuicSpdyStreamTest, StreamFlowControlBlocked) { |
GenerateBody(&body, kWindow + kOverflow); |
EXPECT_CALL(*connection_, SendBlocked(kClientDataStreamId1)); |
- EXPECT_CALL(*session_, WritevData(kClientDataStreamId1, _, _, _, _)) |
+ EXPECT_CALL(*session_, WritevData(stream_, kClientDataStreamId1, _, _, _, _)) |
.WillOnce(Return(QuicConsumedData(kWindow, true))); |
stream_->WriteOrBufferData(body, false, nullptr); |
@@ -689,7 +689,7 @@ TEST_P(QuicSpdyStreamTest, StreamFlowControlFinNotBlocked) { |
bool fin = true; |
EXPECT_CALL(*connection_, SendBlocked(kClientDataStreamId1)).Times(0); |
- EXPECT_CALL(*session_, WritevData(kClientDataStreamId1, _, _, _, _)) |
+ EXPECT_CALL(*session_, WritevData(stream_, kClientDataStreamId1, _, _, _, _)) |
.WillOnce(Return(QuicConsumedData(0, fin))); |
stream_->WriteOrBufferData(body, fin, nullptr); |
@@ -880,7 +880,7 @@ TEST_P(QuicSpdyStreamTest, WritingTrailersSendsAFin) { |
// Test that writing trailers will send a FIN, as Trailers are the last thing |
// to be sent on a stream. |
Initialize(kShouldProcessData); |
- EXPECT_CALL(*session_, WritevData(_, _, _, _, _)) |
+ EXPECT_CALL(*session_, WritevData(_, _, _, _, _, _)) |
.Times(AnyNumber()) |
.WillRepeatedly(Invoke(MockQuicSession::ConsumeAllData)); |
@@ -901,7 +901,7 @@ TEST_P(QuicSpdyStreamTest, WritingTrailersFinalOffset) { |
// Test that when writing trailers, the trailers that are actually sent to the |
// peer contain the final offset field indicating last byte of data. |
Initialize(kShouldProcessData); |
- EXPECT_CALL(*session_, WritevData(_, _, _, _, _)) |
+ EXPECT_CALL(*session_, WritevData(_, _, _, _, _, _)) |
.Times(AnyNumber()) |
.WillRepeatedly(Invoke(MockQuicSession::ConsumeAllData)); |
@@ -928,7 +928,7 @@ TEST_P(QuicSpdyStreamTest, WritingTrailersClosesWriteSide) { |
// Test that if trailers are written after all other data has been written |
// (headers and body), that this closes the stream for writing. |
Initialize(kShouldProcessData); |
- EXPECT_CALL(*session_, WritevData(_, _, _, _, _)) |
+ EXPECT_CALL(*session_, WritevData(_, _, _, _, _, _)) |
.Times(AnyNumber()) |
.WillRepeatedly(Invoke(MockQuicSession::ConsumeAllData)); |
@@ -953,7 +953,7 @@ TEST_P(QuicSpdyStreamTest, WritingTrailersWithQueuedBytes) { |
// Test that the stream is not closed for writing when trailers are sent |
// while there are still body bytes queued. |
Initialize(kShouldProcessData); |
- EXPECT_CALL(*session_, WritevData(_, _, _, _, _)) |
+ EXPECT_CALL(*session_, WritevData(_, _, _, _, _, _)) |
.Times(AnyNumber()) |
.WillRepeatedly(Invoke(MockQuicSession::ConsumeAllData)); |
@@ -963,7 +963,7 @@ TEST_P(QuicSpdyStreamTest, WritingTrailersWithQueuedBytes) { |
// Write non-zero body data, but only consume partially, ensuring queueing. |
const int kBodySize = 1 * 1024; // 1 MB |
- EXPECT_CALL(*session_, WritevData(_, _, _, _, _)) |
+ EXPECT_CALL(*session_, WritevData(_, _, _, _, _, _)) |
.WillOnce(Return(QuicConsumedData(kBodySize - 1, false))); |
stream_->WriteOrBufferData(string(kBodySize, 'x'), false, nullptr); |
EXPECT_EQ(1u, stream_->queued_data_bytes()); |
@@ -980,7 +980,7 @@ TEST_P(QuicSpdyStreamTest, WritingTrailersWithQueuedBytes) { |
TEST_P(QuicSpdyStreamTest, WritingTrailersAfterFIN) { |
// Test that it is not possible to write Trailers after a FIN has been sent. |
Initialize(kShouldProcessData); |
- EXPECT_CALL(*session_, WritevData(_, _, _, _, _)) |
+ EXPECT_CALL(*session_, WritevData(_, _, _, _, _, _)) |
.Times(AnyNumber()) |
.WillRepeatedly(Invoke(MockQuicSession::ConsumeAllData)); |