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

net/tools/quic/quic_simple_server_test.cc

Index: net/tools/quic/quic_simple_server_test.cc
diff --git a/net/tools/quic/quic_simple_server_test.cc b/net/tools/quic/quic_simple_server_test.cc
index 3a7c54ee1f93f646b6762ddd1ef6aaa066f00ab3..42d3caeda5e154e20e0ab5513143432173259757 100644
--- a/net/tools/quic/quic_simple_server_test.cc
+++ b/net/tools/quic/quic_simple_server_test.cc
@@ -26,7 +26,10 @@ class QuicChromeServerDispatchPacketTest : public ::testing::Test {
                        CryptoTestUtils::ProofSourceForTesting()),
         dispatcher_(config_,
                     &crypto_config_,
-                    new net::test::MockConnectionHelper) {
+                    std::unique_ptr<MockConnectionHelper>(
+                        new net::test::MockConnectionHelper),
+                    std::unique_ptr<MockAlarmFactory>(
+                        new net::test::MockAlarmFactory)) {
     dispatcher_.InitializeWithWriter(nullptr);
   }