Land Recent QUIC Changes.

net/quic/quic_flags.cc

Index: net/quic/quic_flags.cc
diff --git a/net/quic/quic_flags.cc b/net/quic/quic_flags.cc
index 58980b343188f17203a4965fa7eb5c7257cd232f..affa27129c3beebf701e343c2ef58eb89f4d5aa7 100644
--- a/net/quic/quic_flags.cc
+++ b/net/quic/quic_flags.cc
@@ -19,20 +19,11 @@ bool FLAGS_track_retransmission_history = false;
 // request pacing for the server to enable it.
 bool FLAGS_enable_quic_pacing = true;
 
-// Do not remove this flag until b/11792453 is marked as Fixed.
-// If true, turns on connection level flow control in QUIC.
-// If this is disabled, all in flight QUIC connections talking QUIC_VERSION_19
-// or higher will timeout. New connections will be fine.
-bool FLAGS_enable_quic_connection_flow_control_2 = true;
-
 bool FLAGS_quic_allow_oversized_packets_for_test = false;
 
 // When true, the use time based loss detection instead of nack.
 bool FLAGS_quic_use_time_loss_detection = false;
 
-// If true, allow peer port migration of established QUIC connections.
-bool FLAGS_quic_allow_port_migration = true;
-
 // If true, it will return as soon as an error is detected while validating
 // CHLO.
 bool FLAGS_use_early_return_when_verifying_chlo = true;
@@ -44,3 +35,6 @@ bool FLAGS_send_quic_crypto_reject_reason = false;
 // packets, to reduce latency of data delivery to the application. The client
 // must also request FEC protection for the server to use FEC.
 bool FLAGS_enable_quic_fec = false;
+
+// If true, a QUIC connection with too many unfinished streams will be closed.
+bool FLAGS_close_quic_connection_unfinished_streams = false;