Landing recent QUIC changes until 6/24/2016 14:00 UTC

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 83b49ea5f11ba0272e32f24d0ff248cd826a75b3..3d8e279c2d2a1df5d18a351247c6ae86b5ea5c09 100644
--- a/net/quic/quic_flags.h
+++ b/net/quic/quic_flags.h
@@ -36,11 +36,9 @@ 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;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_use_hash_in_scup;
-NET_EXPORT_PRIVATE extern bool FLAGS_quic_detect_memory_corrpution;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_use_old_public_reset_packets;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_ignore_srbf;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_allow_noprr;
-NET_EXPORT_PRIVATE extern bool FLAGS_quic_disallow_multi_packet_chlo;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_use_optimized_write_path;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_dispatcher_creates_id;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_enable_chlo_policy;
@@ -52,5 +50,9 @@ NET_EXPORT_PRIVATE extern bool FLAGS_quic_use_cheap_stateless_rejects;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_socket_walltimestamps;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_default_immediate_forward_secure;
 NET_EXPORT_PRIVATE extern bool FLAGS_quic_disable_pre_30;
+NET_EXPORT_PRIVATE extern bool FLAGS_quic_respect_http2_settings_frame;
+NET_EXPORT_PRIVATE extern bool FLAGS_quic_no_mtu_discovery_ack_listener;
+NET_EXPORT_PRIVATE extern bool FLAGS_quic_simple_packet_number_length;
+NET_EXPORT_PRIVATE extern bool FLAGS_quic_enable_version_35;
 
 #endif  // NET_QUIC_QUIC_FLAGS_H_