Remove stl_util's deletion functions from media/.

media/formats/mp2t/mp2t_stream_parser.h

 // Copyright 2014 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.
 
 #ifndef MEDIA_FORMATS_MP2T_MP2T_STREAM_PARSER_H_
 #define MEDIA_FORMATS_MP2T_MP2T_STREAM_PARSER_H_
 
 #include <stdint.h>
 
 #include <list>
@@ skipping 28 matching lines @@
             const NewBuffersCB& new_buffers_cb,
             bool ignore_text_tracks,
             const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
             const NewMediaSegmentCB& new_segment_cb,
             const EndMediaSegmentCB& end_of_segment_cb,
             const scoped_refptr<MediaLog>& media_log) override;
   void Flush() override;
   bool Parse(const uint8_t* buf, int size) override;
 
  private:
-  typedef std::map<int, PidState*> PidMap;
-
   struct BufferQueueWithConfig {
     BufferQueueWithConfig(bool is_cfg_sent,
                           const AudioDecoderConfig& audio_cfg,
                           const VideoDecoderConfig& video_cfg);
     BufferQueueWithConfig(const BufferQueueWithConfig& other);
     ~BufferQueueWithConfig();
 
     bool is_config_sent;
     AudioDecoderConfig audio_config;
     StreamParser::BufferQueue audio_queue;
@@ skipping 46 matching lines @@
   scoped_refptr<MediaLog> media_log_;
 
   // True when AAC SBR extension is signalled in the mimetype
   // (mp4a.40.5 in the codecs parameter).
   bool sbr_in_mimetype_;
 
   // Bytes of the TS stream.
   ByteQueue ts_byte_queue_;
 
   // List of PIDs and their state.
-  PidMap pids_;
+  std::map<int, std::unique_ptr<PidState>> pids_;
 
   // Selected audio and video PIDs.
   int selected_audio_pid_;
   int selected_video_pid_;
 
   // Pending audio & video buffers.
   std::list<BufferQueueWithConfig> buffer_queue_chain_;
 
   // Whether |init_cb_| has been invoked.
   bool is_initialized_;
 
   // Indicate whether a segment was started.
   bool segment_started_;
 
   // Timestamp unroller.
   // Timestamps in PES packets must be unrolled using the same offset.
   // So the unroller is global between PES pids.
   TimestampUnroller timestamp_unroller_;
 
   DISALLOW_COPY_AND_ASSIGN(Mp2tStreamParser);
 };
 
 }  // namespace mp2t
 }  // namespace media
 
 #endif  // MEDIA_FORMATS_MP2T_MP2T_STREAM_PARSER_H_