Rename MockHelper to the more descriptive (and more consistent with other Mock classes) MockConnect…

net/quic/quic_crypto_server_stream_test.cc

 // Copyright (c) 2012 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_crypto_server_stream.h"
 
 #include <map>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 81 matching lines @@
       server_crypto_config_.SetStrikeRegisterClient(strike_register_client_);
     }
   }
 
   ~QuicCryptoServerStreamTest() override { STLDeleteElements(&helpers_); }
 
   // Initializes the crypto server stream state for testing.  May be
   // called multiple times.
   void InitializeServer() {
     TestQuicSpdyServerSession* server_session = nullptr;
-    helpers_.push_back(new MockHelper);
+    helpers_.push_back(new MockConnectionHelper);
+
     CreateServerSessionForTest(server_id_, QuicTime::Delta::FromSeconds(100000),
                                helpers_.back(), &server_crypto_config_,
                                &server_connection_, &server_session);
     CHECK(server_session);
     server_session_.reset(server_session);
     CryptoTestUtils::SetupCryptoServerConfigForTest(
         server_connection_->clock(), server_connection_->random_generator(),
         server_session_->config(), &server_crypto_config_);
   }
 
   QuicCryptoServerStream* server_stream() {
     return server_session_->GetCryptoStream();
   }
 
   QuicCryptoClientStream* client_stream() {
     return client_session_->GetCryptoStream();
   }
 
   // Initializes a fake client, and all its associated state, for
   // testing.  May be called multiple times.
   void InitializeFakeClient(bool supports_stateless_rejects) {
     TestQuicSpdyClientSession* client_session = nullptr;
-    helpers_.push_back(new MockHelper);
+    helpers_.push_back(new MockConnectionHelper);
     CreateClientSessionForTest(server_id_, supports_stateless_rejects,
                                QuicTime::Delta::FromSeconds(100000),
                                helpers_.back(), &client_crypto_config_,
                                &client_connection_, &client_session);
     CHECK(client_session);
     client_session_.reset(client_session);
   }
 
   bool AsyncStrikeRegisterVerification() {
     if (server_connection_->version() > QUIC_VERSION_26) {
@@ skipping 21 matching lines @@
     CHECK(server_connection_);
     CHECK(client_session_ != nullptr);
 
     EXPECT_CALL(*client_session_, OnProofValid(_)).Times(testing::AnyNumber());
     client_stream()->CryptoConnect();
     CryptoTestUtils::AdvanceHandshake(client_connection_, client_stream(), 0,
                                       server_connection_, server_stream(), 0);
   }
 
  protected:
-  // Every connection gets its own MockHelper, tracked separately from the
-  // server and client state so their lifetimes persist through the whole test.
-  std::vector<MockHelper*> helpers_;
+  // Every connection gets its own MockConnectionHelper, tracked separately
+  // from the server and client state so their lifetimes persist through the
+  // whole test.
+  std::vector<MockConnectionHelper*> helpers_;
 
   // Server state
   PacketSavingConnection* server_connection_;
   scoped_ptr<TestQuicSpdyServerSession> server_session_;
   QuicCryptoServerConfig server_crypto_config_;
   QuicServerId server_id_;
 
   // Client state
   PacketSavingConnection* client_connection_;
   QuicCryptoClientConfig client_crypto_config_;
@@ skipping 241 matching lines @@
   EXPECT_FALSE(
       QuicCryptoServerStreamPeer::DoesPeerSupportStatelessRejects(message_));
 }
 
 }  // namespace
 
 #endif
 
 }  // namespace test
 }  // namespace net