Remove stl_util's deletion functions from:

net/quic/test_tools/simple_quic_framer.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/test_tools/simple_quic_framer.h"
 
 #include <memory>
 
 #include "base/macros.h"
-#include "base/stl_util.h"
+#include "base/memory/ptr_util.h"
 #include "net/quic/core/crypto/quic_decrypter.h"
 #include "net/quic/core/crypto/quic_encrypter.h"
 
 using base::StringPiece;
 using std::string;
 using std::vector;
 
 namespace net {
 namespace test {
 
 class SimpleFramerVisitor : public QuicFramerVisitorInterface {
  public:
   SimpleFramerVisitor() : error_(QUIC_NO_ERROR) {}
 
-  ~SimpleFramerVisitor() override {
-    base::STLDeleteElements(&stream_frames_);
-    base::STLDeleteElements(&stream_data_);
-  }
+  ~SimpleFramerVisitor() override {}
 
   void OnError(QuicFramer* framer) override { error_ = framer->error(); }
 
   bool OnProtocolVersionMismatch(QuicVersion version) override { return false; }
 
   void OnPacket() override {}
   void OnPublicResetPacket(const QuicPublicResetPacket& packet) override {
     public_reset_packet_.reset(new QuicPublicResetPacket(packet));
   }
   void OnVersionNegotiationPacket(
@@ skipping 13 matching lines @@
     has_header_ = true;
     header_ = header;
     return true;
   }
 
   bool OnStreamFrame(const QuicStreamFrame& frame) override {
     // Save a copy of the data so it is valid after the packet is processed.
     string* string_data = new string();
     StringPiece(frame.data_buffer, frame.data_length)
         .AppendToString(string_data);
-    stream_data_.push_back(string_data);
+    stream_data_.push_back(base::WrapUnique(string_data));
     // TODO(ianswett): A pointer isn't necessary with emplace_back.
-    stream_frames_.push_back(new QuicStreamFrame(
+    stream_frames_.push_back(base::MakeUnique<QuicStreamFrame>(
         frame.stream_id, frame.fin, frame.offset, StringPiece(*string_data)));
     return true;
   }
 
   bool OnAckFrame(const QuicAckFrame& frame) override {
     ack_frames_.push_back(frame);
     return true;
   }
 
   bool OnStopWaitingFrame(const QuicStopWaitingFrame& frame) override {
@@ skipping 47 matching lines @@
   const vector<QuicAckFrame>& ack_frames() const { return ack_frames_; }
   const vector<QuicConnectionCloseFrame>& connection_close_frames() const {
     return connection_close_frames_;
   }
   const vector<QuicGoAwayFrame>& goaway_frames() const {
     return goaway_frames_;
   }
   const vector<QuicRstStreamFrame>& rst_stream_frames() const {
     return rst_stream_frames_;
   }
-  const vector<QuicStreamFrame*>& stream_frames() const {
+  const vector<std::unique_ptr<QuicStreamFrame>>& stream_frames() const {
     return stream_frames_;
   }
   const vector<QuicStopWaitingFrame>& stop_waiting_frames() const {
     return stop_waiting_frames_;
   }
   const vector<QuicPingFrame>& ping_frames() const { return ping_frames_; }
   const QuicVersionNegotiationPacket* version_negotiation_packet() const {
     return version_negotiation_packet_.get();
   }
 
  private:
   QuicErrorCode error_;
   bool has_header_;
   QuicPacketHeader header_;
   std::unique_ptr<QuicVersionNegotiationPacket> version_negotiation_packet_;
   std::unique_ptr<QuicPublicResetPacket> public_reset_packet_;
   vector<QuicAckFrame> ack_frames_;
   vector<QuicStopWaitingFrame> stop_waiting_frames_;
   vector<QuicPaddingFrame> padding_frames_;
   vector<QuicPingFrame> ping_frames_;
-  vector<QuicStreamFrame*> stream_frames_;
+  vector<std::unique_ptr<QuicStreamFrame>> stream_frames_;
   vector<QuicRstStreamFrame> rst_stream_frames_;
   vector<QuicGoAwayFrame> goaway_frames_;
   vector<QuicConnectionCloseFrame> connection_close_frames_;
   vector<QuicWindowUpdateFrame> window_update_frames_;
   vector<QuicBlockedFrame> blocked_frames_;
   vector<QuicPathCloseFrame> path_close_frames_;
-  vector<string*> stream_data_;
+  vector<std::unique_ptr<string>> stream_data_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleFramerVisitor);
 };
 
 SimpleQuicFramer::SimpleQuicFramer()
     : framer_(AllSupportedVersions(),
               QuicTime::Zero(),
               Perspective::IS_SERVER) {}
 
 SimpleQuicFramer::SimpleQuicFramer(const QuicVersionVector& supported_versions)
@@ skipping 41 matching lines @@
 
 const vector<QuicStopWaitingFrame>& SimpleQuicFramer::stop_waiting_frames()
     const {
   return visitor_->stop_waiting_frames();
 }
 
 const vector<QuicPingFrame>& SimpleQuicFramer::ping_frames() const {
   return visitor_->ping_frames();
 }
 
-const vector<QuicStreamFrame*>& SimpleQuicFramer::stream_frames() const {
+const vector<std::unique_ptr<QuicStreamFrame>>&
+SimpleQuicFramer::stream_frames() const {
   return visitor_->stream_frames();
 }
 
 const vector<QuicRstStreamFrame>& SimpleQuicFramer::rst_stream_frames() const {
   return visitor_->rst_stream_frames();
 }
 
 const vector<QuicGoAwayFrame>& SimpleQuicFramer::goaway_frames() const {
   return visitor_->goaway_frames();
 }
 
 const vector<QuicConnectionCloseFrame>&
 SimpleQuicFramer::connection_close_frames() const {
   return visitor_->connection_close_frames();
 }
 
 }  // namespace test
 }  // namespace net