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

net/tools/quic/quic_spdy_client_stream_test.cc

Index: net/tools/quic/quic_spdy_client_stream_test.cc
diff --git a/net/tools/quic/quic_spdy_client_stream_test.cc b/net/tools/quic/quic_spdy_client_stream_test.cc
index d8ec57d39a3bdd02d6b96142f0d2341c8f8a78f3..af3cb3c8cde72476828efe5af77f74c7423d7956 100644
--- a/net/tools/quic/quic_spdy_client_stream_test.cc
+++ b/net/tools/quic/quic_spdy_client_stream_test.cc
@@ -19,8 +19,8 @@
 
 using net::test::CryptoTestUtils;
 using net::test::DefaultQuicConfig;
-using net::test::MockConnection;
-using net::test::MockConnectionHelper;
+using net::test::MockQuicConnection;
+using net::test::MockQuicConnectionHelper;
 using net::test::SupportedVersions;
 using net::test::kClientDataStreamId1;
 using net::test::kServerDataStreamId1;
@@ -63,9 +63,9 @@ class QuicSpdyClientStreamTest : public ::testing::Test {
   class StreamVisitor;
 
   QuicSpdyClientStreamTest()
-      : connection_(new StrictMock<MockConnection>(&helper_,
-                                                   &alarm_factory_,
-                                                   Perspective::IS_CLIENT)),
+      : connection_(new StrictMock<MockQuicConnection>(&helper_,
+                                                       &alarm_factory_,
+                                                       Perspective::IS_CLIENT)),
         session_(connection_, &push_promise_index_),
         body_("hello world") {
     session_.Initialize();
@@ -86,9 +86,9 @@ class QuicSpdyClientStreamTest : public ::testing::Test {
     }
   };
 
-  MockConnectionHelper helper_;
+  MockQuicConnectionHelper helper_;
   MockAlarmFactory alarm_factory_;
-  StrictMock<MockConnection>* connection_;
+  StrictMock<MockQuicConnection>* connection_;
   QuicClientPushPromiseIndex push_promise_index_;
 
   MockQuicClientSession session_;