Revert of Landing Recent QUIC changes until Sat Apr 29 00:22:04 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 3acd9ad548a231fe2f6a60857cdd86bbddf1411e..59f50729a60fe4bafd77514080b818b5032a33ab 100644
--- a/net/quic/core/quic_flags_list.h
+++ b/net/quic/core/quic_flags_list.h
@@ -186,6 +186,12 @@
 // reordering window for every spurious retransmit.
 QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_fix_adaptive_time_loss, false)
 
+// In QUIC BBR, keep sending at the max bandwidth observed in the previous 2
+// RTTs for another SRTT.
+QUIC_FLAG(bool,
+          FLAGS_quic_reloadable_flag_quic_bbr_keep_sending_at_recent_rate,
+          false)
+
 // Base CWND on SRTT instead of min_rtt for QUIC BBR.
 QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_bbr_base_cwnd_on_srtt, false)
 
@@ -214,9 +220,3 @@
 
 // Fix the algorithm used by packet conservation.
 QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_bbr_fix_conservation, false)
-
-// If enabled, use refactored stream creation methods.
-QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_refactor_stream_creation, false)
-
-// A second take on fixing QUIC BBR packet conservation.
-QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_bbr_fix_conservation2, false)