Landing Recent QUIC changes until Mon Nov 14 04:43:50 2016 +0000

net/quic/core/quic_buffered_packet_store.cc

Index: net/quic/core/quic_buffered_packet_store.cc
diff --git a/net/quic/core/quic_buffered_packet_store.cc b/net/quic/core/quic_buffered_packet_store.cc
index 494d0982e6e70c6ba97faddf2cdbeb6df3eabf01..81864abe2d8b7d8dc665e9a705fe2b4d086c22a6 100644
--- a/net/quic/core/quic_buffered_packet_store.cc
+++ b/net/quic/core/quic_buffered_packet_store.cc
@@ -8,6 +8,7 @@
 
 #include "base/stl_util.h"
 #include "net/quic/core/quic_bug_tracker.h"
+#include "net/quic/core/quic_flags.h"
 
 namespace net {
 
@@ -82,6 +83,8 @@ EnqueuePacketResult QuicBufferedPacketStore::EnqueuePacket(
     IPEndPoint server_address,
     IPEndPoint client_address,
     bool is_chlo) {
+  QUIC_BUG_IF(!FLAGS_quic_allow_chlo_buffering)
+      << "Shouldn't buffer packets if disabled via flag.";
   QUIC_BUG_IF(is_chlo &&
               base::ContainsKey(connections_with_chlo_, connection_id))
       << "Shouldn't buffer duplicated CHLO on connection " << connection_id;