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

net/tools/quic/quic_simple_server_session_test.cc

Index: net/tools/quic/quic_simple_server_session_test.cc
diff --git a/net/tools/quic/quic_simple_server_session_test.cc b/net/tools/quic/quic_simple_server_session_test.cc
index fb402633c3c49454d5ce0d9b7deed7a758ab004e..af742b2452f1de28c801fddfeb6a551167431f0b 100644
--- a/net/tools/quic/quic_simple_server_session_test.cc
+++ b/net/tools/quic/quic_simple_server_session_test.cc
@@ -5,6 +5,7 @@
 #include "net/tools/quic/quic_simple_server_session.h"
 
 #include <algorithm>
+#include <memory>
 
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
@@ -105,9 +106,11 @@ class MockQuicCryptoServerStream : public QuicCryptoServerStream {
 class MockConnectionWithSendStreamData : public MockConnection {
  public:
   MockConnectionWithSendStreamData(MockConnectionHelper* helper,
+                                   MockAlarmFactory* alarm_factory,
                                    Perspective perspective,
                                    const QuicVersionVector& supported_versions)
-      : MockConnection(helper, perspective, supported_versions) {}
+      : MockConnection(helper, alarm_factory, perspective, supported_versions) {
+  }
 
   MOCK_METHOD5(SendStreamData,
                QuicConsumedData(QuicStreamId id,
@@ -167,7 +170,8 @@ class QuicSimpleServerSessionTest
         kInitialSessionFlowControlWindowForTest);
 
     connection_ = new StrictMock<MockConnectionWithSendStreamData>(
-        &helper_, Perspective::IS_SERVER, SupportedVersions(GetParam()));
+        &helper_, &alarm_factory_, Perspective::IS_SERVER,
+        SupportedVersions(GetParam()));
     session_.reset(new QuicSimpleServerSession(config_, connection_, &owner_,
                                                &crypto_config_,
                                                &compressed_certs_cache_));
@@ -185,6 +189,7 @@ class QuicSimpleServerSessionTest
 
   StrictMock<MockQuicServerSessionVisitor> owner_;
   MockConnectionHelper helper_;
+  MockAlarmFactory alarm_factory_;
   StrictMock<MockConnectionWithSendStreamData>* connection_;
   QuicConfig config_;
   QuicCryptoServerConfig crypto_config_;
@@ -402,7 +407,8 @@ class QuicSimpleServerSessionServerPushTest
     QuicConfigPeer::SetReceivedConnectionOptions(&config_, copt);
 
     connection_ = new StrictMock<MockConnectionWithSendStreamData>(
-        &helper_, Perspective::IS_SERVER, SupportedVersions(GetParam()));
+        &helper_, &alarm_factory_, Perspective::IS_SERVER,
+        SupportedVersions(GetParam()));
     session_.reset(new QuicSimpleServerSession(config_, connection_, &owner_,
                                                &crypto_config_,
                                                &compressed_certs_cache_));