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

net/tools/quic/quic_server_session_base_test.cc

Index: net/tools/quic/quic_server_session_base_test.cc
diff --git a/net/tools/quic/quic_server_session_base_test.cc b/net/tools/quic/quic_server_session_base_test.cc
index 7a32d4e01f7b63571ddf58f361cbd2ea4700eb2e..9d79a8663e26defbb9ff8dfe42efd60794bc1815 100644
--- a/net/tools/quic/quic_server_session_base_test.cc
+++ b/net/tools/quic/quic_server_session_base_test.cc
@@ -4,6 +4,9 @@
 
 #include "net/tools/quic/quic_server_session_base.h"
 
+#include <cstdint>
+#include <memory>
+
 #include "base/macros.h"
 #include "net/quic/crypto/quic_crypto_server_config.h"
 #include "net/quic/crypto/quic_random.h"
@@ -131,8 +134,9 @@ class QuicServerSessionBaseTest : public ::testing::TestWithParam<QuicVersion> {
     config_.SetInitialSessionFlowControlWindowToSend(
         kInitialSessionFlowControlWindowForTest);
 
-    connection_ = new StrictMock<MockConnection>(
-        &helper_, Perspective::IS_SERVER, SupportedVersions(GetParam()));
+    connection_ = new StrictMock<MockConnection>(&helper_, &alarm_factory_,
+                                                 Perspective::IS_SERVER,
+                                                 SupportedVersions(GetParam()));
     session_.reset(new TestServerSession(config_, connection_, &owner_,
                                          &crypto_config_,
                                          &compressed_certs_cache_));
@@ -146,6 +150,7 @@ class QuicServerSessionBaseTest : public ::testing::TestWithParam<QuicVersion> {
 
   StrictMock<MockQuicServerSessionVisitor> owner_;
   MockConnectionHelper helper_;
+  MockAlarmFactory alarm_factory_;
   StrictMock<MockConnection>* connection_;
   QuicConfig config_;
   QuicCryptoServerConfig crypto_config_;