Landing Recent QUIC changes until 4/22/2016 14:55 UTC

net/tools/quic/quic_epoll_alarm_factory_test.cc

Index: net/tools/quic/quic_epoll_alarm_factory_test.cc
diff --git a/net/tools/quic/quic_epoll_alarm_factory_test.cc b/net/tools/quic/quic_epoll_alarm_factory_test.cc
index 33f74434dd6b8998b8b4e182e4815357b5d44c4b..5dfe70185ecb02c649a3546fd18fd0e986e8d8b7 100644
--- a/net/tools/quic/quic_epoll_alarm_factory_test.cc
+++ b/net/tools/quic/quic_epoll_alarm_factory_test.cc
@@ -3,14 +3,27 @@
 // found in the LICENSE file.
 
 #include "net/tools/quic/quic_epoll_alarm_factory.h"
+
+#include "net/tools/quic/quic_epoll_clock.h"
 #include "net/tools/quic/test_tools/mock_epoll_server.h"
-#include "testing/base/public/gmock.h"
-#include "testing/base/public/gunit.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 namespace test {
 namespace {
 
+class TestDelegate : public QuicAlarm::Delegate {
+ public:
+  TestDelegate() : fired_(false) {}
+
+  void OnAlarm() override { fired_ = true; }
+
+  bool fired() const { return fired_; }
+
+ private:
+  bool fired_;
+};
+
 // The boolean parameter denotes whether or not to use an arena.
 class QuicEpollAlarmFactoryTest : public ::testing::TestWithParam<bool> {
  protected: