Landing Recent QUIC changes until Sun May 8 00:39:29 2016 +0000

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 42d3caeda5e154e20e0ab5513143432173259757..3cd742cc0ae17745504f760e65756efaa1f403b0 100644
--- a/net/tools/quic/quic_simple_server_test.cc
+++ b/net/tools/quic/quic_simple_server_test.cc
@@ -26,8 +26,8 @@ class QuicChromeServerDispatchPacketTest : public ::testing::Test {
                        CryptoTestUtils::ProofSourceForTesting()),
         dispatcher_(config_,
                     &crypto_config_,
-                    std::unique_ptr<MockConnectionHelper>(
-                        new net::test::MockConnectionHelper),
+                    std::unique_ptr<MockQuicConnectionHelper>(
+                        new net::test::MockQuicConnectionHelper),
                     std::unique_ptr<MockAlarmFactory>(
                         new net::test::MockAlarmFactory)) {
     dispatcher_.InitializeWithWriter(nullptr);