| commit | 0e0a00c39a7fd2368b7ae91ed1e0522135525df6 | [log] [tgz] |
|---|---|---|
| author | jokulik <[email protected]> | Mon Jun 13 21:51:58 2016 |
| committer | Commit bot <[email protected]> | Mon Jun 13 21:53:54 2016 |
| tree | 7eeab337bdc1856e2e48f73c6432b0aa8bb570ad | |
| parent | 7da13a533284fd918f10737750e5281b76821644 [diff] [blame] |
Landing Recent QUIC changes until UTC Fri Jun 10 22:29:19 2016 +0000 relnote: Add extra log when AppendAckFrameAndTypeByte failed. n/a logging only change. Merge internal change: 124496602 https://codereview.chromium.org/2065493003 relnote: Deprecate rolled back flag quic_only_one_sending_alarm. Merge internal change: 124469720. https://codereview.chromium.org/2065553002 relnote: deprecating flag quic_use_early_return_when_verifying_chlo Merge internal change: 124348798 https://codereview.chromium.org/2060723002 relnote: Add a new rate based sending connection option which uses the pacing rate to keep the bytes_in_flight close to the CWND. Protected by flag quic_rate_based_sending. Merge internal change: 124302573 https://codereview.chromium.org/2064543002 relnote: Always send queued retransmission packets, because of write blocked socket, once the socket gets unblocked. Protected by flag quic_always_write_queued_retransmissions. Merge internal change: 124273380 https://codereview.chromium.org/2065463002 [email protected] BUG= Review-Url: https://codereview.chromium.org/2061743002 Cr-Commit-Position: refs/heads/master@{#399558}
diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc index 1c954a4a..68a164c 100644 --- a/net/quic/quic_http_stream_test.cc +++ b/net/quic/quic_http_stream_test.cc
@@ -221,7 +221,7 @@ .WillRepeatedly(Return(QuicTime::Delta::Zero())); EXPECT_CALL(*send_algorithm_, GetCongestionWindow()) .WillRepeatedly(Return(kMaxPacketSize)); - EXPECT_CALL(*send_algorithm_, PacingRate()) + EXPECT_CALL(*send_algorithm_, PacingRate(_)) .WillRepeatedly(Return(QuicBandwidth::Zero())); EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _)) .WillRepeatedly(Return(QuicTime::Delta::Zero()));