Landing Recent QUIC changes until Sat Aug 13 04:32:36 2016 UTC-0

net/quic/core/quic_flags.cc

Index: net/quic/core/quic_flags.cc
diff --git a/net/quic/core/quic_flags.cc b/net/quic/core/quic_flags.cc
index ab5ceb8c9970b5e56c98d81afba7a0fc06365cd4..49b8c7a307e6df035d9fa7b4fe2abd0094f270d2 100644
--- a/net/quic/core/quic_flags.cc
+++ b/net/quic/core/quic_flags.cc
@@ -86,10 +86,6 @@ bool FLAGS_quic_respect_http2_settings_frame = true;
 // Do not use a QuicAckListener in order to confirm a larger Path MTU.
 bool FLAGS_quic_no_mtu_discovery_ack_listener = true;
 
-// Deprecate QuicPacketCreator::next_packet_number_length_ because it's no
-// longer necessary.
-bool FLAGS_quic_simple_packet_number_length = true;
-
 // If true, enables QUIC_VERSION_35.
 bool FLAGS_quic_enable_version_35 = true;
 
@@ -162,3 +158,10 @@ bool FLAGS_quic_buffer_packet_till_chlo = false;
 // If true, the connection will check whether it is application-limited, and
 // notify the congestion controller about it.
 bool FLAGS_quic_enable_app_limited_check = true;
+
+// Deprecate QuicPacketCreator::next_packet_number_length_ because it's no
+// longer necessary.
+bool FLAGS_quic_simple_packet_number_length_2 = true;
+
+// If true, disables QUIC version less than 32.
+bool FLAGS_quic_disable_pre_32 = true;