Split out QuicAlarm creation from QuicConnectionHelper to new QuicAlarmFactory. No behavior change,…

net/tools/quic/quic_simple_server.cc

Index: net/tools/quic/quic_simple_server.cc
diff --git a/net/tools/quic/quic_simple_server.cc b/net/tools/quic/quic_simple_server.cc
index 765745bcdad6f71ba3ea8b448da3dcad6a50a485..41b7404d4530af2bf909ede8ad0a8f4d84934119 100644
--- a/net/tools/quic/quic_simple_server.cc
+++ b/net/tools/quic/quic_simple_server.cc
@@ -36,9 +36,11 @@ class SimpleQuicDispatcher : public QuicDispatcher {
   SimpleQuicDispatcher(const QuicConfig& config,
                        const QuicCryptoServerConfig* crypto_config,
                        const QuicVersionVector& supported_versions,
-                       QuicConnectionHelperInterface* helper)
+                       QuicConnectionHelperInterface* helper,
+                       QuicAlarmFactory* alarm_factory)
       : QuicDispatcher(config, crypto_config, supported_versions,
-                       std::unique_ptr<QuicConnectionHelperInterface>(helper)) {}
+                       std::unique_ptr<QuicConnectionHelperInterface>(helper),
+                       std::unique_ptr<QuicAlarmFactory>(alarm_factory)) {}
 
  protected:
   QuicServerSessionBase* CreateQuicSession(
@@ -64,10 +66,11 @@ QuicSimpleServer::QuicSimpleServer(ProofSource* proof_source,
                                    const QuicConfig& config,
                                    const QuicVersionVector& supported_versions)
     : helper_(
-          new QuicChromiumConnectionHelper(base::ThreadTaskRunnerHandle::Get()
-                                               .get(),
-                                           &clock_,
+          new QuicChromiumConnectionHelper(&clock_,
                                            QuicRandom::GetInstance())),
+      alarm_factory_(
+          new QuicChromiumAlarmFactory(base::ThreadTaskRunnerHandle::Get().get(),
+                                       &clock_)),
       config_(config),
       crypto_config_(kSourceAddressTokenSecret,
                      QuicRandom::GetInstance(),
@@ -146,7 +149,7 @@ int QuicSimpleServer::Listen(const IPEndPoint& address) {
   socket_.swap(socket);
 
   dispatcher_.reset(new SimpleQuicDispatcher(config_, &crypto_config_,
-                                             supported_versions_, helper_));
+                                             supported_versions_, helper_, alarm_factory_));
   QuicSimpleServerPacketWriter* writer =
       new QuicSimpleServerPacketWriter(socket_.get(), dispatcher_.get());
   dispatcher_->InitializeWithWriter(writer);