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

net/quic/quic_client_push_promise_index_test.cc

Index: net/quic/quic_client_push_promise_index_test.cc
diff --git a/net/quic/quic_client_push_promise_index_test.cc b/net/quic/quic_client_push_promise_index_test.cc
index 672fcfc432b1d1c7f1e02ad334dac9468baea145..a06379a43aaa3cdf5dfe2245612175efe7f13cd2 100644
--- a/net/quic/quic_client_push_promise_index_test.cc
+++ b/net/quic/quic_client_push_promise_index_test.cc
@@ -45,9 +45,9 @@ class MockQuicClientSession : public QuicClientSession {
 class QuicClientPushPromiseIndexTest : public ::testing::Test {
  public:
   QuicClientPushPromiseIndexTest()
-      : connection_(new StrictMock<MockConnection>(&helper_,
-                                                   &alarm_factory_,
-                                                   Perspective::IS_CLIENT)),
+      : connection_(new StrictMock<MockQuicConnection>(&helper_,
+                                                       &alarm_factory_,
+                                                       Perspective::IS_CLIENT)),
         session_(connection_, &index_),
         promised_(&session_, kServerDataStreamId1, url_) {
     FLAGS_quic_supports_push_promise = true;
@@ -59,9 +59,9 @@ class QuicClientPushPromiseIndexTest : public ::testing::Test {
     url_ = SpdyUtils::GetUrlFromHeaderBlock(request_);
   }
 
-  MockConnectionHelper helper_;
+  MockQuicConnectionHelper helper_;
   MockAlarmFactory alarm_factory_;
-  StrictMock<MockConnection>* connection_;
+  StrictMock<MockQuicConnection>* connection_;
   MockQuicClientSession session_;
   QuicClientPushPromiseIndex index_;
   SpdyHeaderBlock request_;