Update from https://crrev.com/304418

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 18 matching lines @@
 // must also request FEC protection for the server to use FEC.
 bool FLAGS_enable_quic_fec = false;
 
 // When true, defaults to BBR congestion control instead of Cubic.
 bool FLAGS_quic_use_bbr_congestion_control = false;
 
 // If true, the server will accept slightly more streams than the negotiated
 // limit.
 bool FLAGS_quic_allow_more_open_streams = false;
 
-// If true, then QUIC connections will set both idle and overall timeouts in a
-// single method.
-bool FLAGS_quic_unified_timeouts = true;
-
 // If true, QUIC will be more resilliant to junk packets with valid connection
 // IDs.
 bool FLAGS_quic_drop_junk_packets = true;
 
 // 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;