Landing Recent QUIC changes until Sat Aug 13 04:32:36 2016 UTC-0

net/tools/quic/quic_dispatcher_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/tools/quic/quic_dispatcher.h"
 
 #include <memory>
 #include <ostream>
 #include <string>
 
@@ skipping 709 matching lines @@
                 client_hello.GetSerialized().AsStringPiece().as_string());
 
   if (GetParam().enable_stateless_rejects_via_flag) {
     EXPECT_EQ(true,
               time_wait_list_manager_->IsConnectionIdInTimeWait(connection_id));
   }
 }
 
 TEST_P(QuicDispatcherStatelessRejectTest, BufferNonChlo) {
   FLAGS_quic_use_cheap_stateless_rejects = true;
-  FLAGS_quic_always_log_bugs_for_tests = true;
   CreateTimeWaitListManager();
 
   const IPEndPoint client_address(net::test::Loopback4(), 1);
   const QuicConnectionId connection_id = 1;
 
   if (!GetParam().enable_stateless_rejects_via_flag &&
       !FLAGS_quic_buffer_packet_till_chlo) {
     // If stateless rejects are not being used and early arrived packets are not
     // buffered, then a connection will be created immediately.
     EXPECT_CALL(*dispatcher_, CreateQuicSession(connection_id, client_address))
         .WillOnce(testing::Return(
             CreateSessionBasedOnTestParams(connection_id, client_address)));
     EXPECT_CALL(*reinterpret_cast<MockQuicConnection*>(session1_->connection()),
                 ProcessUdpPacket(_, client_address, _))
         .WillOnce(testing::WithArg<2>(
             Invoke(CreateFunctor(&QuicDispatcherTest::ValidatePacket,
                                  base::Unretained(this), connection_id))));
   }
   bool first_packet_dropped = GetParam().enable_stateless_rejects_via_flag &&
                               !FLAGS_quic_buffer_packet_till_chlo;
   if (first_packet_dropped) {
     // Never do stateless reject while
     // FLAGS_quic_buffer_packet_till_chlo is off.
-    EXPECT_DFATAL(
+    EXPECT_QUIC_BUG(
         ProcessPacket(client_address, connection_id, true, false,
                       "NOT DATA FOR A CHLO"),
         "Have to drop packet because buffering non-chlo packet is "
         "not supported while trying to do stateless reject. "
         "--gfe2_reloadable_flag_quic_buffer_packet_till_chlo false "
         "--gfe2_reloadable_flag_quic_use_cheap_stateless_rejects true");
   } else {
     ProcessPacket(client_address, connection_id, true, false,
                   "NOT DATA FOR A CHLO");
   }
@@ skipping 513 matching lines @@
   // New arrived CHLO will be dropped because this connection is in time wait
   // list.
   ASSERT_TRUE(time_wait_list_manager_->IsConnectionIdInTimeWait(conn_id));
   EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, conn_id, _, _));
   ProcessPacket(client_address, conn_id, true, false, SerializeFullCHLO());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net