Landing Recent QUIC changes until 12:43 PM, Nov 5, 2016 UTC+8

net/tools/quic/quic_server.cc

Index: net/tools/quic/quic_server.cc
diff --git a/net/tools/quic/quic_server.cc b/net/tools/quic/quic_server.cc
index 8d5640c5f0078717b2b0f8084fa244143035aba4..99ae8cbc3b9f441687f82d25c2bd529da236a6f6 100644
--- a/net/tools/quic/quic_server.cc
+++ b/net/tools/quic/quic_server.cc
@@ -180,8 +180,7 @@ void QuicServer::OnEvent(int fd, EpollEvent* event) {
   if (event->in_events & EPOLLIN) {
     DVLOG(1) << "EPOLLIN";
 
-    if (FLAGS_quic_limit_num_new_sessions_per_epoll_loop &&
-        FLAGS_quic_buffer_packet_till_chlo) {
+    if (FLAGS_quic_limit_num_new_sessions_per_epoll_loop) {
       dispatcher_->ProcessBufferedChlos(kNumSessionsToCreatePerSocketEvent);
     }
 
@@ -193,7 +192,7 @@ void QuicServer::OnEvent(int fd, EpollEvent* event) {
     }
 
     if (FLAGS_quic_limit_num_new_sessions_per_epoll_loop &&
-        FLAGS_quic_buffer_packet_till_chlo && dispatcher_->HasChlosBuffered()) {
+        dispatcher_->HasChlosBuffered()) {
       // Register EPOLLIN event to consume buffered CHLO(s).
       event->out_ready_mask |= EPOLLIN;
     }