Land Recent QUIC Changes until 2/21/2015.

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 5c123536bf8ea2f41e7cba529d99a33bd020ce5a..e19d9263417e645dc70ed343aacb872aa1ad15ad 100644
--- a/net/quic/quic_flags.cc
+++ b/net/quic/quic_flags.cc
@@ -25,13 +25,6 @@ bool FLAGS_quic_use_bbr_congestion_control = false;
 // connection options.
 bool FLAGS_quic_allow_bbr = false;
 
-// Do not flip this flag.  jokulik plans more testing and additional monitoring
-// before the flag can go the auto-flip process.
-//
-// If true, record the timestamp for the last sent new packet before the call to
-// WritePacket, rather than after in QUIC.
-bool FLAGS_quic_record_send_time_before_write = false;
-
 // If true, enables the QUIC bandwidth resumption experiment (triggered by
 // Chrome/Finch).
 bool FLAGS_quic_enable_bandwidth_resumption_experiment = true;
@@ -45,10 +38,6 @@ bool FLAGS_quic_enable_pacing = true;
 // store multiple addresses.
 bool FLAGS_quic_use_multiple_address_in_source_tokens = false;
 
-// If true, attach QuicAckNotifiers to packets rather than individual stream
-// frames.
-bool FLAGS_quic_attach_ack_notifiers_to_packets = true;
-
 // Time period for which a given connection_id should live in the time-wait
 // state.
 int64 FLAGS_quic_time_wait_list_seconds = 5;