Landing Recent QUIC changes until 11:17 PM, Oct 12, 2017
deprecate FLAGS_quic_reloadable_flag_quic_disable_packets_based_cc
Merge internal change: 17201012
https://chromium-review.googlesource.com/c/chromium/src/+/728343
In QUIC, print range of packet numbers in ack frame when there are too many (> 128). No functional change expected.
Modify quic_ack_frame::operator<< to print out a range
rather than explict packet numbers when there would be too many
numbers to print.
Merge internal change: 171947147
https://chromium-review.googlesource.com/c/chromium/src/+/728394
Use go/portableproto for QUIC protos.
Merge internal change: 171878936
https://chromium-review.googlesource.com/c/chromium/src/+/728391
Add a new BBR connection option to use a slower STARTUP once loss occurs. Protected by FLAGS_quic_reloadable_flag_quic_bbr_slower_startup
Merge internal change: 171744905
https://chromium-review.googlesource.com/c/chromium/src/+/728390
Deprecate FLAGS_quic_reloadable_flag_quic_bbr_exit_startup_on_loss.
n/a (Flag deprecation)
Merge internal change: 171680259
https://chromium-review.googlesource.com/c/chromium/src/+/728388
In QUIC, remove ack listener list from SerializedPacket and TransmissionInfo. Also remove ack listener from the write path. No functional change expected.
Merge internal change: 171537663
https://chromium-review.googlesource.com/c/chromium/src/+/728385
Allows self address change for QUIC proxied sessions. Protected by FLAGS_quic_reloadable_flag_quic_allow_address_change_for_udp_proxy.
Merge internal change: 171526707
https://chromium-review.googlesource.com/c/chromium/src/+/728303
[email protected]
Bug:
Change-Id: I63f023d75ebc07dccb0956f21fbcaa018e46f549
Reviewed-on: https://chromium-review.googlesource.com/728701
Commit-Queue: Ian Swett <[email protected]>
Reviewed-by: Ryan Hamilton <[email protected]>
Cr-Commit-Position: refs/heads/master@{#510467}diff --git a/net/quic/test_tools/quic_test_utils.cc b/net/quic/test_tools/quic_test_utils.cc
index b54d35d..6708fe08 100644
--- a/net/quic/test_tools/quic_test_utils.cc
+++ b/net/quic/test_tools/quic_test_utils.cc
@@ -369,7 +369,7 @@
: QuicSession(connection, nullptr, DefaultQuicConfig()) {
crypto_stream_.reset(new MockQuicCryptoStream(this));
Initialize();
- ON_CALL(*this, WritevData(_, _, _, _, _, _))
+ ON_CALL(*this, WritevData(_, _, _, _, _))
.WillByDefault(testing::Return(QuicConsumedData(0, false)));
}
@@ -386,14 +386,11 @@
}
// static
-QuicConsumedData MockQuicSession::ConsumeAllData(
- QuicStream* /*stream*/,
- QuicStreamId /*id*/,
- const QuicIOVector& data,
- QuicStreamOffset /*offset*/,
- StreamSendingState state,
- const QuicReferenceCountedPointer<
- QuicAckListenerInterface>& /*ack_listener*/) {
+QuicConsumedData MockQuicSession::ConsumeAllData(QuicStream* /*stream*/,
+ QuicStreamId /*id*/,
+ const QuicIOVector& data,
+ QuicStreamOffset /*offset*/,
+ StreamSendingState state) {
return QuicConsumedData(data.total_length, state != NO_FIN);
}
@@ -423,7 +420,7 @@
: QuicSpdySession(connection, nullptr, DefaultQuicConfig()) {
crypto_stream_.reset(new MockQuicCryptoStream(this));
Initialize();
- ON_CALL(*this, WritevData(_, _, _, _, _, _))
+ ON_CALL(*this, WritevData(_, _, _, _, _))
.WillByDefault(testing::Return(QuicConsumedData(0, false)));
}
