Landing Recent QUIC changes until 4/15/2016 17:20 UTC

net/tools/quic/quic_simple_server.h

Index: net/tools/quic/quic_simple_server.h
diff --git a/net/tools/quic/quic_simple_server.h b/net/tools/quic/quic_simple_server.h
index e9dcdca22a110e8ec6b2d554677564e14bcea954..7fe28a424a9a509c49835ae102d5ec0318e61b87 100644
--- a/net/tools/quic/quic_simple_server.h
+++ b/net/tools/quic/quic_simple_server.h
@@ -15,6 +15,7 @@
 #include "net/base/ip_endpoint.h"
 #include "net/log/net_log.h"
 #include "net/quic/crypto/quic_crypto_server_config.h"
+#include "net/quic/quic_chromium_alarm_factory.h"
 #include "net/quic/quic_chromium_connection_helper.h"
 #include "net/quic/quic_clock.h"
 #include "net/quic/quic_config.h"
@@ -73,6 +74,9 @@ class QuicSimpleServer {
   // Used to manage the message loop. Owned by dispatcher_.
   QuicChromiumConnectionHelper* helper_;
 
+  // Used to manage the message loop. Owned by dispatcher_.
+  QuicChromiumAlarmFactory* alarm_factory_;
+
   // Listening socket. Also used for outbound client communication.
   std::unique_ptr<UDPServerSocket> socket_;