Landing Recent QUIC changes until Jun 27 19:50:48 2017 +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 9e7b1ae78f62a4155de244234aed1219c0cd7d97..324093b18a3e20d10361d00a42ad9cec54b7f465 100644
--- a/net/quic/core/quic_flags_list.h
+++ b/net/quic/core/quic_flags_list.h
@@ -27,9 +27,6 @@ QUIC_FLAG(bool,
           FLAGS_quic_reloadable_flag_enable_quic_stateless_reject_support,
           true)
 
-// If true, multipath is enabled for the connection.
-QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_enable_multipath, false)
-
 // If true, require handshake confirmation for QUIC connections, functionally
 // disabling 0-rtt handshakes.
 // TODO(rtenneti): Enable this flag after CryptoServerTest's are fixed.
@@ -86,22 +83,10 @@ QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_enable_force_hol_blocking, true)
 // 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 some casts that were causing off-by-one errors in QUIC's cubic
-// "convex" increases.
-QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_fix_cubic_convex_mode, true)
-
 // If true, GFE sends SETTINGS_MAX_HEADER_LIST_SIZE to the client at the
 // beginning of a connection.
 QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_send_max_header_list_size, true)
 
-// If true, fix quantization of CubicBytes while performing convex increases.
-QUIC_FLAG(bool,
-          FLAGS_quic_reloadable_flag_quic_fix_cubic_bytes_quantization,
-          true)
-
-// If true, fix Cubic\'s use of kBetaLastMax for n-connection emulation.
-QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_fix_beta_last_max, true)
-
 // If greater than zero, mean RTT variation is multiplied by the specified
 // factor and added to the congestion window limit.
 QUIC_FLAG(double, FLAGS_quic_bbr_rtt_variation_weight, 0.0f)
@@ -120,12 +105,6 @@ QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_allow_one_address_change, false)
 // faster than the sending rate.
 QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_bbr_ack_aggregation_bytes, true)
 
-// If true, allow cubic updates on every ack, rather than occasionally limiting
-// the frequency to once every 30ms.
-QUIC_FLAG(bool,
-          FLAGS_quic_reloadable_flag_quic_enable_cubic_per_ack_updates,
-          true)
-
 // Support bandwidth resumption in QUIC BBR.
 QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_bbr_bandwidth_resumption, false)
 
@@ -172,7 +151,7 @@ QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_bbr_fix_conservation2, true)
 // client IP for proxied session.
 QUIC_FLAG(bool,
           FLAGS_quic_reloadable_flag_quic_use_client_address_for_stk_in_proxy,
-          false)
+          true)
 
 // If true, export a varz mapping QUIC non 0-rtt handshake with corresponding
 // frontend service.
@@ -189,7 +168,7 @@ QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_enable_pcc, false)
 QUIC_FLAG(bool, FLAGS_quic_enable_version_40, false)
 
 // If true, use the more CPU efficient bandwidth sampler datastructure.
-QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_faster_bandwidth_sampler, false)
+QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_faster_bandwidth_sampler, true)
 
 // In QUIC, QuicSession gets notified when stream frames are acked, discarded or
 // retransmitted.
@@ -197,3 +176,19 @@ QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_use_stream_notifier2, false)
 
 // When true, defaults to BBR congestion control instead of Cubic.
 QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_default_to_bbr, false)
+
+// Allow a new rate based recovery in QUIC BBR to be enabled via connection
+// option.
+QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_bbr_rate_recovery, false)
+
+// If true, allow trailing headers with duplicate keys, and combine the values
+// from duplicate keys into a single delimted header.
+QUIC_FLAG(bool,
+          FLAGS_quic_reloadable_flag_quic_handle_duplicate_trailers,
+          false)
+
+// Allows QUIC BBR up to twice the previously measured ack aggregation to be
+// added to the CWND as long as bytes_in_flight goes below the target recently.
+QUIC_FLAG(bool,
+          FLAGS_quic_reloadable_flag_quic_bbr_ack_aggregation_bytes2,
+          false)