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

net/tools/quic/quic_epoll_connection_helper.h

Index: net/tools/quic/quic_epoll_connection_helper.h
diff --git a/net/tools/quic/quic_epoll_connection_helper.h b/net/tools/quic/quic_epoll_connection_helper.h
index fd18fb3432d0fc6f3035ed125bdd085fdb8a1416..ccd7536b2bc58c56a25cf1259a24dddbfb6a5e4a 100644
--- a/net/tools/quic/quic_epoll_connection_helper.h
+++ b/net/tools/quic/quic_epoll_connection_helper.h
@@ -25,12 +25,6 @@ namespace net {
 class EpollServer;
 class QuicRandom;
 
-
-class AckAlarm;
-class RetransmissionAlarm;
-class SendAlarm;
-class TimeoutAlarm;
-
 using QuicStreamBufferAllocator = SimpleBufferAllocator;
 
 enum class QuicAllocator { SIMPLE, BUFFER_POOL };
@@ -43,20 +37,12 @@ class QuicEpollConnectionHelper : public QuicConnectionHelperInterface {
   // QuicEpollConnectionHelperInterface
   const QuicClock* GetClock() const override;
   QuicRandom* GetRandomGenerator() override;
-  QuicAlarm* CreateAlarm(QuicAlarm::Delegate* delegate) override;
-  QuicArenaScopedPtr<QuicAlarm> CreateAlarm(
-      QuicArenaScopedPtr<QuicAlarm::Delegate> delegate,
-      QuicConnectionArena* arena) override;
 
   QuicBufferAllocator* GetBufferAllocator() override;
 
-  EpollServer* epoll_server() { return epoll_server_; }
-
  private:
   friend class QuicConnectionPeer;
 
-  EpollServer* epoll_server_;  // Not owned.
-
   const QuicEpollClock clock_;
   QuicRandom* random_generator_;
   // Set up both allocators.  They take up minimal memory before use.