| Index: net/quic/test_tools/quic_test_utils.cc
|
| diff --git a/net/quic/test_tools/quic_test_utils.cc b/net/quic/test_tools/quic_test_utils.cc
|
| index a6c1a915cf8ad9c0c4e7adaa2f18016d92d56641..1ef7a6e758a071342f9befccb31e4c51ee44bd5e 100644
|
| --- a/net/quic/test_tools/quic_test_utils.cc
|
| +++ b/net/quic/test_tools/quic_test_utils.cc
|
| @@ -554,48 +554,44 @@ QuicVersion QuicVersionMin() {
|
|
|
| QuicEncryptedPacket* ConstructEncryptedPacket(QuicConnectionId connection_id,
|
| bool version_flag,
|
| - bool multipath_flag,
|
| bool reset_flag,
|
| QuicPacketNumber packet_number,
|
| const string& data) {
|
| return ConstructEncryptedPacket(
|
| - connection_id, version_flag, multipath_flag, reset_flag, packet_number,
|
| - data, PACKET_8BYTE_CONNECTION_ID, PACKET_6BYTE_PACKET_NUMBER);
|
| + connection_id, version_flag, reset_flag, packet_number, data,
|
| + PACKET_8BYTE_CONNECTION_ID, PACKET_6BYTE_PACKET_NUMBER);
|
| }
|
|
|
| QuicEncryptedPacket* ConstructEncryptedPacket(
|
| QuicConnectionId connection_id,
|
| bool version_flag,
|
| - bool multipath_flag,
|
| bool reset_flag,
|
| QuicPacketNumber packet_number,
|
| const string& data,
|
| QuicConnectionIdLength connection_id_length,
|
| QuicPacketNumberLength packet_number_length) {
|
| - return ConstructEncryptedPacket(
|
| - connection_id, version_flag, multipath_flag, reset_flag, packet_number,
|
| - data, connection_id_length, packet_number_length, nullptr);
|
| + return ConstructEncryptedPacket(connection_id, version_flag, reset_flag,
|
| + packet_number, data, connection_id_length,
|
| + packet_number_length, nullptr);
|
| }
|
|
|
| QuicEncryptedPacket* ConstructEncryptedPacket(
|
| QuicConnectionId connection_id,
|
| bool version_flag,
|
| - bool multipath_flag,
|
| bool reset_flag,
|
| QuicPacketNumber packet_number,
|
| const string& data,
|
| QuicConnectionIdLength connection_id_length,
|
| QuicPacketNumberLength packet_number_length,
|
| QuicVersionVector* versions) {
|
| - return ConstructEncryptedPacket(connection_id, version_flag, multipath_flag,
|
| - reset_flag, packet_number, data,
|
| - connection_id_length, packet_number_length,
|
| - versions, Perspective::IS_CLIENT);
|
| + return ConstructEncryptedPacket(connection_id, version_flag, reset_flag,
|
| + packet_number, data, connection_id_length,
|
| + packet_number_length, versions,
|
| + Perspective::IS_CLIENT);
|
| }
|
| QuicEncryptedPacket* ConstructEncryptedPacket(
|
| QuicConnectionId connection_id,
|
| bool version_flag,
|
| - bool multipath_flag,
|
| bool reset_flag,
|
| QuicPacketNumber packet_number,
|
| const string& data,
|
| @@ -607,7 +603,7 @@ QuicEncryptedPacket* ConstructEncryptedPacket(
|
| header.public_header.connection_id = connection_id;
|
| header.public_header.connection_id_length = connection_id_length;
|
| header.public_header.version_flag = version_flag;
|
| - header.public_header.multipath_flag = multipath_flag;
|
| + header.public_header.multipath_flag = false;
|
| header.public_header.reset_flag = reset_flag;
|
| header.public_header.packet_number_length = packet_number_length;
|
| header.packet_number = packet_number;
|
|
|