Landing Recent QUIC changes until: Fri Oct 30 22:23:58 2015 +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 c401c407152b6ac7387dc5045257ce3cdd63eff0..dea0a72d390b943ef379c41d3c8790725c42f59c 100644
--- a/net/tools/quic/quic_simple_server_test.cc
+++ b/net/tools/quic/quic_simple_server_test.cc
@@ -28,7 +28,7 @@ class QuicChromeServerDispatchPacketTest : public ::testing::Test {
         dispatcher_(config_,
                     &crypto_config_,
                     new tools::QuicDispatcher::DefaultPacketWriterFactory(),
-                    new net::test::MockHelper) {
+                    new net::test::MockConnectionHelper) {
     dispatcher_.InitializeWithWriter(nullptr);
   }