Remove stl_util's deletion functions from:

net/quic/core/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/core/quic_crypto_server_stream.h"
 
 #include <map>
 #include <memory>
 #include <vector>
 
-#include "base/stl_util.h"
+#include "base/memory/ptr_util.h"
 #include "net/quic/core/crypto/aes_128_gcm_12_encrypter.h"
 #include "net/quic/core/crypto/crypto_framer.h"
 #include "net/quic/core/crypto/crypto_handshake.h"
 #include "net/quic/core/crypto/crypto_protocol.h"
 #include "net/quic/core/crypto/crypto_utils.h"
 #include "net/quic/core/crypto/quic_crypto_server_config.h"
 #include "net/quic/core/crypto/quic_decrypter.h"
 #include "net/quic/core/crypto/quic_encrypter.h"
 #include "net/quic/core/crypto/quic_random.h"
 #include "net/quic/core/quic_crypto_client_stream.h"
@@ skipping 65 matching lines @@
       strike_register_client_->StartDelayingVerification();
       server_crypto_config_.SetStrikeRegisterClient(strike_register_client_);
     }
   }
 
   ~QuicCryptoServerStreamTest() override {
     // Ensure that anything that might reference |helpers_| is destroyed before
     // |helpers_| is destroyed.
     server_session_.reset();
     client_session_.reset();
-    base::STLDeleteElements(&helpers_);
-    base::STLDeleteElements(&alarm_factories_);
+    helpers_.clear();
+    alarm_factories_.clear();
   }
 
   // Initializes the crypto server stream state for testing.  May be
   // called multiple times.
   void InitializeServer() {
     TestQuicSpdyServerSession* server_session = nullptr;
-    helpers_.push_back(new MockQuicConnectionHelper);
-    alarm_factories_.push_back(new MockAlarmFactory);
+    helpers_.push_back(base::MakeUnique<MockQuicConnectionHelper>());
+    alarm_factories_.push_back(base::MakeUnique<MockAlarmFactory>());
     CreateServerSessionForTest(
         server_id_, QuicTime::Delta::FromSeconds(100000), supported_versions_,
-        helpers_.back(), alarm_factories_.back(), &server_crypto_config_,
-        &server_compressed_certs_cache_, &server_connection_, &server_session);
+        helpers_.back().get(), alarm_factories_.back().get(),
+        &server_crypto_config_, &server_compressed_certs_cache_,
+        &server_connection_, &server_session);
     CHECK(server_session);
     server_session_.reset(server_session);
     CryptoTestUtils::FakeServerOptions options;
     options.token_binding_params = QuicTagVector{kTB10};
     CryptoTestUtils::SetupCryptoServerConfigForTest(
         server_connection_->clock(), server_connection_->random_generator(),
         server_session_->config(), &server_crypto_config_, options);
   }
 
   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 MockQuicConnectionHelper);
-    alarm_factories_.push_back(new MockAlarmFactory);
+    helpers_.push_back(base::MakeUnique<MockQuicConnectionHelper>());
+    alarm_factories_.push_back(base::MakeUnique<MockAlarmFactory>());
     CreateClientSessionForTest(
         server_id_, supports_stateless_rejects,
         QuicTime::Delta::FromSeconds(100000), supported_versions_,
-
-        helpers_.back(), alarm_factories_.back(), &client_crypto_config_,
-        &client_connection_, &client_session);
+        helpers_.back().get(), alarm_factories_.back().get(),
+        &client_crypto_config_, &client_connection_, &client_session);
     CHECK(client_session);
     client_session_.reset(client_session);
   }
 
   bool AsyncStrikeRegisterVerification() {
     if (server_connection_->version() > QUIC_VERSION_32) {
       return false;
     }
     return GetParam();
   }
 
   void ConstructHandshakeMessage() {
     CryptoFramer framer;
     message_data_.reset(framer.ConstructHandshakeMessage(message_));
   }
 
   int CompleteCryptoHandshake() {
     CHECK(server_connection_);
     CHECK(server_session_ != nullptr);
     return CryptoTestUtils::HandshakeWithFakeClient(
-        helpers_.back(), alarm_factories_.back(), server_connection_,
-        server_stream(), server_id_, client_options_);
+        helpers_.back().get(), alarm_factories_.back().get(),
+        server_connection_, server_stream(), server_id_, client_options_);
   }
 
   // Performs a single round of handshake message-exchange between the
   // client and server.
   void AdvanceHandshakeWithFakeClient() {
     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:
   QuicFlagSaver flags_;  // Save/restore all QUIC flag values.
 
   // Every connection gets its own MockQuicConnectionHelper and
-  // MockAlarmFactory,
-  // tracked separately from
-  // the server and client state so their lifetimes persist through the whole
-  // test.
-  std::vector<MockQuicConnectionHelper*> helpers_;
-  std::vector<MockAlarmFactory*> alarm_factories_;
+  // MockAlarmFactory, tracked separately from the server and client state so
+  // their lifetimes persist through the whole test.
+  std::vector<std::unique_ptr<MockQuicConnectionHelper>> helpers_;
+  std::vector<std::unique_ptr<MockAlarmFactory>> alarm_factories_;
 
-  // Server state
+  // Server state.
   PacketSavingConnection* server_connection_;
   std::unique_ptr<TestQuicSpdyServerSession> server_session_;
   QuicCryptoServerConfig server_crypto_config_;
   QuicCompressedCertsCache server_compressed_certs_cache_;
   QuicServerId server_id_;
 
-  // Client state
+  // Client state.
   PacketSavingConnection* client_connection_;
   QuicCryptoClientConfig client_crypto_config_;
   std::unique_ptr<TestQuicSpdyClientSession> client_session_;
 
   CryptoHandshakeMessage message_;
   std::unique_ptr<QuicData> message_data_;
   CryptoTestUtils::FakeClientOptions client_options_;
   DelayedVerifyStrikeRegisterClient* strike_register_client_;
 
   // Which QUIC versions the client and server support.
@@ skipping 415 matching lines @@
   // Regression test for b/31521252, in which a crash would happen here.
   AdvanceHandshakeWithFakeClient();
   EXPECT_FALSE(server_stream()->encryption_established());
   EXPECT_FALSE(server_stream()->handshake_confirmed());
 }
 
 }  // namespace
 
 }  // namespace test
 }  // namespace net