Update from https://crrev.com/309415

net/quic/quic_flags.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_flags.h"
 
 // TODO(rtenneti): Remove this.
 // Do not flip this flag until the flakiness of the
 // net/tools/quic/end_to_end_test is fixed.
 // If true, then QUIC connections will track the retransmission history of a
@@ skipping 21 matching lines @@
 // When true, defaults to BBR congestion control instead of Cubic.
 bool FLAGS_quic_use_bbr_congestion_control = false;
 
 // If true, QUIC BBR congestion control may be enabled via Finch and/or via QUIC
 // connection options.
 bool FLAGS_quic_allow_bbr = false;
 
 // If true, truncate QUIC connection IDs if the client requests it.
 bool FLAGS_allow_truncated_connection_ids_for_quic = false;
 
-// If true, close the connection when there are too many outstanding QUIC
-// packets in the sent or received packet managers.
-bool FLAGS_quic_too_many_outstanding_packets = false;
-
-// If true, QUIC connections will delay moving to forward security until the
-// client starts sending foward secure encrypted packets.
-bool FLAGS_enable_quic_delay_forward_security = true;
-
 // Do not flip this flag.  jokulik plans more testing and additional monitoring
 // before the flag can go the auto-flip process.
 //
 // If true, record the timestamp for the last sent new packet before the call to
 // WritePacket, rather than after in QUIC.
 bool FLAGS_quic_record_send_time_before_write = false;
 
 // If true, enables the QUIC bandwidth resumption experiment (triggered by
 // Chrome/Finch).
 bool FLAGS_quic_enable_bandwidth_resumption_experiment = true;
 
 // If true, QUIC congestion control will be paced.  If false, pacing may be
 // controlled by QUIC connection options in the config or by enabling BBR
 // congestion control.
 bool FLAGS_quic_enable_pacing = false;
 
 // If true, the silent close option will be honored.
 bool FLAGS_quic_allow_silent_close = true;
 
 // If true, use std::cbrt instead of custom cube root.
 bool FLAGS_quic_use_std_cbrt = true;
+
+// If true, the QUIC packet generator will not attempt to queue multiple ACK
+// frames.
+bool FLAGS_quic_disallow_multiple_pending_ack_frames = true;
+
+// If true, then the source address tokens generated for QUIC connects will
+// store multiple addresses.
+bool FLAGS_quic_use_multiple_address_in_source_tokens = false;