Remove stl_util's deletion functions from media/.

media/filters/frame_processor.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_FILTERS_FRAME_PROCESSOR_H_
 #define MEDIA_FILTERS_FRAME_PROCESSOR_H_
 
 #include <map>
+#include <memory>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "media/base/media_export.h"
 #include "media/base/media_log.h"
 #include "media/base/stream_parser.h"
 #include "media/filters/chunk_demuxer.h"
 
 namespace media {
@@ skipping 54 matching lines @@
   void Reset();
 
   // Must be called when the audio config is updated.  Used to manage when
   // the preroll buffer is cleared and the allowed "fudge" factor between
   // preroll buffers.
   void OnPossibleAudioConfigUpdate(const AudioDecoderConfig& config);
 
  private:
   friend class FrameProcessorTest;
 
-  typedef std::map<StreamParser::TrackId, MseTrackBuffer*> TrackBufferMap;
-
   // If |track_buffers_| contains |id|, returns a pointer to the associated
   // MseTrackBuffer. Otherwise, returns NULL.
   MseTrackBuffer* FindTrack(StreamParser::TrackId id);
 
   // Signals all track buffers' streams that a coded frame group is starting
   // with decode timestamp |start_timestamp|.
   void NotifyStartOfCodedFrameGroup(DecodeTimestamp start_timestamp);
 
   // Helper that signals each track buffer to append any processed, but not yet
   // appended, frames to its stream. Returns true on success, or false if one or
@@ skipping 22 matching lines @@
       const scoped_refptr<StreamParserBuffer>& buffer);
 
   // Helper that processes one frame with the coded frame processing algorithm.
   // Returns false on error or true on success.
   bool ProcessFrame(const scoped_refptr<StreamParserBuffer>& frame,
                     base::TimeDelta append_window_start,
                     base::TimeDelta append_window_end,
                     base::TimeDelta* timestamp_offset);
 
   // TrackId-indexed map of each track's stream.
-  TrackBufferMap track_buffers_;
+  std::map<StreamParser::TrackId, std::unique_ptr<MseTrackBuffer>>
+      track_buffers_;
 
   // The last audio buffer seen by the frame processor that was removed because
   // it was entirely before the start of the append window.
   scoped_refptr<StreamParserBuffer> audio_preroll_buffer_;
 
   // The AudioDecoderConfig associated with buffers handed to ProcessFrames().
   AudioDecoderConfig current_audio_config_;
   base::TimeDelta sample_duration_;
 
   // The AppendMode of the associated SourceBuffer.
@@ skipping 33 matching lines @@
   // Counters that limit spam to |media_log_| for frame processor warnings.
   int num_dropped_preroll_warnings_ = 0;
   int num_dts_beyond_pts_warnings_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(FrameProcessor);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FRAME_PROCESSOR_H_