Landing recent QUIC changes until Sun Mar 5 09:18:09 2017 +0000

net/tools/quic/quic_time_wait_list_manager_test.cc

Index: net/tools/quic/quic_time_wait_list_manager_test.cc
diff --git a/net/tools/quic/quic_time_wait_list_manager_test.cc b/net/tools/quic/quic_time_wait_list_manager_test.cc
index 78fb04defc99ba8bdd45306c907489b8a3257b81..0ff4f8dce793ced42c44de90746be379368bf17b 100644
--- a/net/tools/quic/quic_time_wait_list_manager_test.cc
+++ b/net/tools/quic/quic_time_wait_list_manager_test.cc
@@ -125,7 +125,7 @@ class QuicTimeWaitListManagerTest : public ::testing::Test {
       QuicConnectionId connection_id,
       QuicPacketNumber packet_number) {
     return net::test::ConstructEncryptedPacket(connection_id, false, false,
-                                               false, packet_number, "data");
+                                               packet_number, "data");
   }
 
   QuicFlagSaver flags_;  // Save/restore all QUIC flag values.