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

net/quic/test_tools/mock_quic_dispatcher.cc

Index: net/quic/test_tools/mock_quic_dispatcher.cc
diff --git a/net/quic/test_tools/mock_quic_dispatcher.cc b/net/quic/test_tools/mock_quic_dispatcher.cc
index a31365198c872028f4b66dbaa5d13d3d8d56c83c..dc8098cd7c5a4220ca99fd3f8c697c42ad618281 100644
--- a/net/quic/test_tools/mock_quic_dispatcher.cc
+++ b/net/quic/test_tools/mock_quic_dispatcher.cc
@@ -12,8 +12,13 @@ namespace test {
 MockQuicDispatcher::MockQuicDispatcher(
     const QuicConfig& config,
     const QuicCryptoServerConfig* crypto_config,
-    QuicConnectionHelperInterface* helper)
-    : QuicDispatcher(config, crypto_config, QuicSupportedVersions(), helper) {}
+    std::unique_ptr<QuicConnectionHelperInterface> helper,
+    std::unique_ptr<QuicAlarmFactory> alarm_factory)
+    : QuicDispatcher(config,
+                     crypto_config,
+                     QuicSupportedVersions(),
+                     std::move(helper),
+                     std::move(alarm_factory)) {}
 
 MockQuicDispatcher::~MockQuicDispatcher() {}