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

net/quic/quic_client_push_promise_index_test.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_client_push_promise_index.h"
 
 #include <string>
 
 #include "net/quic/spdy_utils.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
@@ skipping 27 matching lines @@
 
  private:
   QuicCryptoClientConfig crypto_config_;
 
   DISALLOW_COPY_AND_ASSIGN(MockQuicClientSession);
 };
 
 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;
     request_[":path"] = "/bar";
     request_[":authority"] = "www.google.com";
     request_[":version"] = "HTTP/1.1";
     request_[":method"] = "GET";
     request_[":scheme"] = "https";
     url_ = SpdyUtils::GetUrlFromHeaderBlock(request_);
   }
 
-  MockConnectionHelper helper_;
+  MockQuicConnectionHelper helper_;
   MockAlarmFactory alarm_factory_;
-  StrictMock<MockConnection>* connection_;
+  StrictMock<MockQuicConnection>* connection_;
   MockQuicClientSession session_;
   QuicClientPushPromiseIndex index_;
   SpdyHeaderBlock request_;
   string url_;
   MockQuicClientPromisedInfo promised_;
   QuicClientPushPromiseIndex::TryHandle* handle_;
 };
 
 TEST_F(QuicClientPushPromiseIndexTest, TryRequestSuccess) {
   (*index_.promised_by_url())[url_] = &promised_;
@@ skipping 25 matching lines @@
 }
 
 TEST_F(QuicClientPushPromiseIndexTest, GetPromise) {
   (*index_.promised_by_url())[url_] = &promised_;
   EXPECT_EQ(index_.GetPromised(url_), &promised_);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net