Land Recent QUIC Changes

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 ad6fa20156ccd11b7f90488eae15dffaed25a439..cbeaf77c083054b0293c5528d37a1912a693d04a 100644
--- a/net/tools/quic/test_tools/quic_test_utils.h
+++ b/net/tools/quic/test_tools/quic_test_utils.h
@@ -152,9 +152,24 @@ class MockTimeWaitListManager : public QuicTimeWaitListManager {
  public:
   MockTimeWaitListManager(QuicPacketWriter* writer,
                           QuicServerSessionVisitor* visitor,
-                          EpollServer* eps);
+                          QuicConnectionHelperInterface* helper);
+
   ~MockTimeWaitListManager() override;
 
+  MOCK_METHOD3(AddConnectionIdToTimeWait,
+               void(QuicConnectionId connection_id,
+                    QuicVersion version,
+                    QuicEncryptedPacket* close_packet));
+
+  void QuicTimeWaitListManager_AddConnectionIdToTimeWait(
+           QuicConnectionId connection_id,
+           QuicVersion version,
+           QuicEncryptedPacket* close_packet) {
+    QuicTimeWaitListManager::AddConnectionIdToTimeWait(connection_id,
+                                                       version,
+                                                       close_packet);
+  }
+
   MOCK_METHOD5(ProcessPacket,
                void(const IPEndPoint& server_address,
                     const IPEndPoint& client_address,