Landing Recent QUIC changes until Mon Nov 14 04:43:50 2016 +0000

net/quic/core/quic_flags_list.h

Index: net/quic/core/quic_flags_list.h
diff --git a/net/quic/core/quic_flags_list.h b/net/quic/core/quic_flags_list.h
index 85bd48d220dcf6fd3e26cc38e975125cf9a96c12..08c5b419aa1274abab13df63f002e243b1ea120b 100644
--- a/net/quic/core/quic_flags_list.h
+++ b/net/quic/core/quic_flags_list.h
@@ -55,11 +55,8 @@ QUIC_FLAG(bool, FLAGS_quic_use_cheap_stateless_rejects, true)
 // connection.
 QUIC_FLAG(bool, FLAGS_quic_respect_http2_settings_frame, true)
 
-// If true, enables QUIC_VERSION_35.
-QUIC_FLAG(bool, FLAGS_quic_enable_version_35, true)
-
 // If true, re-enables QUIC_VERSION_36.
-QUIC_FLAG(bool, FLAGS_quic_enable_version_36_v2, true)
+QUIC_FLAG(bool, FLAGS_quic_enable_version_36_v3, false)
 
 // If true, use async codepaths to invoke ProofSource::GetProof.
 QUIC_FLAG(bool, FLAGS_enable_async_get_proof, false)
@@ -72,24 +69,13 @@ QUIC_FLAG(bool, FLAGS_quic_require_handshake_confirmation_pre33, false)
 // rest to next event.
 QUIC_FLAG(bool, FLAGS_quic_limit_num_new_sessions_per_epoll_loop, true)
 
-// If true, disables QUIC version less than 34.
-QUIC_FLAG(bool, FLAGS_quic_disable_pre_34, true)
-
 // Only close the connection on the 5th RTO client side when the 5RTO option
 // is enabled.
-QUIC_FLAG(bool, FLAGS_quic_only_5rto_client_side, true)
+QUIC_FLAG(bool, FLAGS_quic_only_5rto_client_side, false)
 
 // If true, QUIC server push will enabled by default.
 QUIC_FLAG(bool, FLAGS_quic_enable_server_push_by_default, true)
 
-// Only inform the QuicSentPacketManager of packets that were sent,
-// not those that we tried to send.
-QUIC_FLAG(bool, FLAGS_quic_only_track_sent_packets, true)
-
-// As the Linux kernel does, limit QUIC's Cubic congestion control to
-// only increase the CWND 1 packet for every two packets acked.
-QUIC_FLAG(bool, FLAGS_quic_limit_cubic_cwnd_increase, true)
-
 // If true, export reject reasons for all rejects, i.e., rejects,
 // stateless rejects and cheap stateless rejects.
 QUIC_FLAG(bool, FLAGS_quic_export_rej_for_all_rejects, true)
@@ -162,3 +148,11 @@ QUIC_FLAG(bool, FLAGS_quic_more_conservative_retransmission_alarm, true)
 
 // Enable QUIC force HOL blocking experiment.
 QUIC_FLAG(bool, FLAGS_quic_enable_force_hol_blocking, true)
+
+// If true, allows packets to be buffered in anticipation of a future CHLO, and
+// allow CHLO packets to be buffered until next iteration of the event loop.
+QUIC_FLAG(bool, FLAGS_quic_allow_chlo_buffering, true)
+
+// If true, fix version manager bug, in which version flag does not really
+// help.
+QUIC_FLAG(bool, FLAGS_quic_fix_version_manager, false)