Landing Recent QUIC changes until Sun May 8 00:39:29 2016 +0000

net/quic/quic_flags.h

Index: net/quic/quic_flags.h
diff --git a/net/quic/quic_flags.h b/net/quic/quic_flags.h
index 62ad1b486863aa8ba9f497da10e75d7f708a95e0..64e9eeff0c7ad4495be45d097866699aac045cf6 100644
--- a/net/quic/quic_flags.h
+++ b/net/quic/quic_flags.h
@@ -25,7 +25,6 @@ NET_EXPORT_PRIVATE extern bool FLAGS_quic_measure_headers_hol_blocking_time;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_disable_pacing;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_never_write_unencrypted_data;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_require_fix;
-NET_EXPORT_PRIVATE extern bool FLAGS_quic_stateless_version_negotiation;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_supports_push_promise;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_supports_push_promise;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_cede_correctly;
@@ -33,9 +32,7 @@ NET_EXPORT_PRIVATE extern bool
     FLAGS_quic_crypto_server_config_default_has_chacha20;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_use_new_tcp_sender;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_connection_defer_ack_response;
-NET_EXPORT_PRIVATE extern bool FLAGS_quic_use_socket_timestamp;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_reply_to_rej;
-NET_EXPORT_PRIVATE extern bool FLAGS_quic_ignore_invalid_error_code;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_no_lower_bw_resumption_limit;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_sslr_limit_reduction;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_simplify_loss_detection;
@@ -46,4 +43,6 @@ NET_EXPORT_PRIVATE extern bool FLAGS_quic_auto_tune_receive_window;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_adaptive_loss_recovery;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_enable_autotune_by_default;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_loss_recovery_use_largest_acked;
+NET_EXPORT_PRIVATE extern bool FLAGS_quic_only_one_sending_alarm;
+
 #endif  // NET_QUIC_QUIC_FLAGS_H_