Split out QuicAlarm creation from QuicConnectionHelper to new QuicAlarmFactory.

net/tools/quic/test_tools/quic_test_server.cc

Index: net/tools/quic/test_tools/quic_test_server.cc
diff --git a/net/tools/quic/test_tools/quic_test_server.cc b/net/tools/quic/test_tools/quic_test_server.cc
index dc5fc45141d60470c9a63c2549bdff2dfff59e52..6f10b47d2035d299faec04cea1ed3d24fc43c083 100644
--- a/net/tools/quic/test_tools/quic_test_server.cc
+++ b/net/tools/quic/test_tools/quic_test_server.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "net/tools/quic/test_tools/quic_test_server.h"
-
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "base/synchronization/lock.h"
@@ -13,12 +12,14 @@
 #include "net/quic/crypto/crypto_handshake.h"
 #include "net/quic/crypto/quic_crypto_server_config.h"
 #include "net/quic/crypto/quic_random.h"
+#include "net/quic/quic_chromium_alarm_factory.h"
 #include "net/quic/quic_chromium_connection_helper.h"
 #include "net/quic/quic_config.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_packet_writer.h"
 #include "net/quic/quic_protocol.h"
 #include "net/tools/quic/quic_dispatcher.h"
+#include "net/tools/quic/quic_epoll_alarm_factory.h"
 #include "net/tools/quic/quic_epoll_connection_helper.h"
 #include "net/tools/quic/quic_simple_server_session.h"
 #include "net/tools/quic/quic_simple_server_stream.h"
@@ -76,8 +77,9 @@ class QuicTestDispatcher : public QuicDispatcher {
   QuicTestDispatcher(const QuicConfig& config,
                      const QuicCryptoServerConfig* crypto_config,
                      const QuicVersionVector& versions,
-                     QuicConnectionHelperInterface* helper)
-      : QuicDispatcher(config, crypto_config, versions, helper),
+                     QuicConnectionHelperInterface* helper,
+                     QuicAlarmFactory* factory)
+      : QuicDispatcher(config, crypto_config, versions, helper, factory),
         session_factory_(nullptr),
         stream_factory_(nullptr),
         crypto_stream_factory_(nullptr) {}
@@ -90,7 +92,7 @@ class QuicTestDispatcher : public QuicDispatcher {
       return QuicDispatcher::CreateQuicSession(id, client);
     }
     QuicConnection* connection = new QuicConnection(
-        id, client, helper(), CreatePerConnectionWriter(),
+        id, client, helper(), alarm_factory(), CreatePerConnectionWriter(),
         /* owns_writer= */ true, Perspective::IS_SERVER, supported_versions());
 
     QuicServerSessionBase* session = nullptr;
@@ -150,8 +152,8 @@ QuicTestServer::QuicTestServer(ProofSource* proof_source,
 QuicDispatcher* QuicTestServer::CreateQuicDispatcher() {
   return new QuicTestDispatcher(
       config(), &crypto_config(), supported_versions(),
-      new QuicEpollConnectionHelper(epoll_server(),
-                                    QuicAllocator::BUFFER_POOL));
+      new QuicEpollConnectionHelper(epoll_server(), QuicAllocator::BUFFER_POOL),
+      new QuicEpollAlarmFactory(epoll_server()));
 }
 
 void QuicTestServer::SetSessionFactory(SessionFactory* factory) {