Land Recent QUIC Changes until 05/13/2015

net/tools/quic/test_tools/quic_test_utils.h

Index: net/tools/quic/test_tools/quic_test_utils.h
diff --git a/net/tools/quic/test_tools/quic_test_utils.h b/net/tools/quic/test_tools/quic_test_utils.h
index e7884680c12aa8d6b1c146eb8e9175621b38288d..dac5f5c56a371b5d42e5baa1002f26563cc75f53 100644
--- a/net/tools/quic/test_tools/quic_test_utils.h
+++ b/net/tools/quic/test_tools/quic_test_utils.h
@@ -154,20 +154,21 @@ class MockTimeWaitListManager : public QuicTimeWaitListManager {
   MockTimeWaitListManager(QuicPacketWriter* writer,
                           QuicServerSessionVisitor* visitor,
                           QuicConnectionHelperInterface* helper);
-
   ~MockTimeWaitListManager() override;
 
-  MOCK_METHOD3(AddConnectionIdToTimeWait,
+  MOCK_METHOD4(AddConnectionIdToTimeWait,
                void(QuicConnectionId connection_id,
                     QuicVersion version,
+                    bool connection_rejected_statelessly,
                     QuicEncryptedPacket* close_packet));
 
   void QuicTimeWaitListManager_AddConnectionIdToTimeWait(
       QuicConnectionId connection_id,
       QuicVersion version,
+      bool connection_rejected_statelessly,
       QuicEncryptedPacket* close_packet) {
-    QuicTimeWaitListManager::AddConnectionIdToTimeWait(connection_id, version,
-                                                       close_packet);
+    QuicTimeWaitListManager::AddConnectionIdToTimeWait(
+        connection_id, version, connection_rejected_statelessly, close_packet);
   }
 
   MOCK_METHOD5(ProcessPacket,