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

net/tools/quic/quic_server_test.cc

Index: net/tools/quic/quic_server_test.cc
diff --git a/net/tools/quic/quic_server_test.cc b/net/tools/quic/quic_server_test.cc
index 6cd0d49d024685deb4e6f4269347a1a8d3026e18..e478cc7da694c21058ec7a8250c14ca4e5aee1f3 100644
--- a/net/tools/quic/quic_server_test.cc
+++ b/net/tools/quic/quic_server_test.cc
@@ -8,6 +8,7 @@
 #include "net/quic/quic_utils.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/quic/test_tools/mock_quic_dispatcher.h"
+#include "net/tools/quic/quic_epoll_alarm_factory.h"
 #include "net/tools/quic/quic_epoll_connection_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -29,7 +30,11 @@ class QuicServerDispatchPacketTest : public ::testing::Test {
         dispatcher_(
             config_,
             &crypto_config_,
-            new QuicEpollConnectionHelper(&eps_, QuicAllocator::BUFFER_POOL)) {
+            std::unique_ptr<QuicEpollConnectionHelper>(
+                new QuicEpollConnectionHelper(&eps_,
+                                              QuicAllocator::BUFFER_POOL)),
+            std::unique_ptr<QuicEpollAlarmFactory>(
+                new QuicEpollAlarmFactory(&eps_))) {
     dispatcher_.InitializeWithWriter(new QuicDefaultPacketWriter(1234));
   }