| Index: net/tools/quic/quic_simple_server_session_test.cc
|
| diff --git a/net/tools/quic/quic_simple_server_session_test.cc b/net/tools/quic/quic_simple_server_session_test.cc
|
| index 98c2b568dc240abea8c4c180966564bcdcc1e360..d64b333e96eac30137a01de56752390fb3f60948 100644
|
| --- a/net/tools/quic/quic_simple_server_session_test.cc
|
| +++ b/net/tools/quic/quic_simple_server_session_test.cc
|
| @@ -107,12 +107,11 @@ class MockConnectionWithSendStreamData : public MockConnection {
|
| const QuicVersionVector& supported_versions)
|
| : MockConnection(helper, perspective, supported_versions) {}
|
|
|
| - MOCK_METHOD6(SendStreamData,
|
| + MOCK_METHOD5(SendStreamData,
|
| QuicConsumedData(QuicStreamId id,
|
| QuicIOVector iov,
|
| QuicStreamOffset offset,
|
| bool fin,
|
| - FecProtection fec_protection,
|
| QuicAckListenerInterface* listern));
|
| };
|
|
|
| @@ -457,7 +456,7 @@ class QuicSimpleServerSessionServerPushTest
|
| // Since flow control window is smaller than response body, not the
|
| // whole body will be sent.
|
| EXPECT_CALL(*connection_,
|
| - SendStreamData(stream_id, _, 0, false, _, nullptr))
|
| + SendStreamData(stream_id, _, 0, false, nullptr))
|
| .WillOnce(
|
| Return(QuicConsumedData(kStreamFlowControlWindowSize, false)));
|
| EXPECT_CALL(*connection_, SendBlocked(stream_id));
|
| @@ -494,7 +493,7 @@ TEST_P(QuicSimpleServerSessionServerPushTest,
|
| EXPECT_CALL(*headers_stream_, WriteHeaders(next_out_going_stream_id, _, false,
|
| kDefaultPriority, nullptr));
|
| EXPECT_CALL(*connection_,
|
| - SendStreamData(next_out_going_stream_id, _, 0, false, _, nullptr))
|
| + SendStreamData(next_out_going_stream_id, _, 0, false, nullptr))
|
| .WillOnce(Return(QuicConsumedData(kStreamFlowControlWindowSize, false)));
|
| EXPECT_CALL(*connection_, SendBlocked(next_out_going_stream_id));
|
| session_->StreamDraining(2);
|
| @@ -528,7 +527,7 @@ TEST_P(QuicSimpleServerSessionServerPushTest,
|
| EXPECT_CALL(*headers_stream_, WriteHeaders(stream_not_reset, _, false,
|
| kDefaultPriority, nullptr));
|
| EXPECT_CALL(*connection_,
|
| - SendStreamData(stream_not_reset, _, 0, false, _, nullptr))
|
| + SendStreamData(stream_not_reset, _, 0, false, nullptr))
|
| .WillOnce(Return(QuicConsumedData(kStreamFlowControlWindowSize, false)));
|
| EXPECT_CALL(*connection_, SendBlocked(stream_not_reset));
|
| EXPECT_CALL(*headers_stream_, WriteHeaders(stream_got_reset, _, false,
|
| @@ -555,7 +554,7 @@ TEST_P(QuicSimpleServerSessionServerPushTest,
|
| EXPECT_CALL(*headers_stream_, WriteHeaders(stream_to_open, _, false,
|
| kDefaultPriority, nullptr));
|
| EXPECT_CALL(*connection_,
|
| - SendStreamData(stream_to_open, _, 0, false, _, nullptr))
|
| + SendStreamData(stream_to_open, _, 0, false, nullptr))
|
| .WillOnce(Return(QuicConsumedData(kStreamFlowControlWindowSize, false)));
|
|
|
| EXPECT_CALL(*connection_, SendBlocked(stream_to_open));
|
|
|