Remove stl_util's deletion functions from media/.

media/filters/chunk_demuxer.h

 // 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.
 
 #ifndef MEDIA_FILTERS_CHUNK_DEMUXER_H_
 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 395 matching lines @@
   // MediaLog for reporting messages and properties to debug content and engine.
   scoped_refptr<MediaLog> media_log_;
 
   PipelineStatusCB init_cb_;
   // Callback to execute upon seek completion.
   // TODO(wolenetz/acolwell): Protect against possible double-locking by first
   // releasing |lock_| before executing this callback. See
   // http://crbug.com/308226
   PipelineStatusCB seek_cb_;
 
-  std::vector<std::unique_ptr<ChunkDemuxerStream>> audio_streams_;
-  std::vector<std::unique_ptr<ChunkDemuxerStream>> video_streams_;
+  using OwnedChunkDemuxerStreamVector =
+      std::vector<std::unique_ptr<ChunkDemuxerStream>>;
+  OwnedChunkDemuxerStreamVector audio_streams_;
+  OwnedChunkDemuxerStreamVector video_streams_;
+  OwnedChunkDemuxerStreamVector text_streams_;
 
   // Keep track of which ids still remain uninitialized so that we transition
   // into the INITIALIZED only after all ids/SourceBuffers got init segment.
   std::set<std::string> pending_source_init_ids_;
 
   base::TimeDelta duration_;
 
   // The duration passed to the last SetDuration(). If
   // SetDuration() is never called or an AppendData() call or
   // a EndOfStream() call changes |duration_|, then this
   // variable is set to < 0 to indicate that the |duration_| represents
   // the actual duration instead of a user specified value.
   double user_specified_duration_;
 
   base::Time timeline_offset_;
   DemuxerStream::Liveness liveness_;
 
-  typedef std::map<std::string, MediaSourceState*> MediaSourceStateMap;
-  MediaSourceStateMap source_state_map_;
+  std::map<std::string, std::unique_ptr<MediaSourceState>> source_state_map_;
 
   std::map<std::string, std::vector<ChunkDemuxerStream*>> id_to_streams_map_;
   // Used to hold alive the demuxer streams that were created for removed /
   // released MediaSourceState objects. Demuxer clients might still have
   // references to these streams, so we need to keep them alive. But they'll be
   // in a shut down state, so reading from them will return EOS.
   std::vector<std::unique_ptr<ChunkDemuxerStream>> removed_streams_;
 
   // Indicates that splice frame generation is enabled.
   const bool splice_frames_enabled_;
 
   // Accumulate, by type, detected track counts across the SourceBuffers.
   int detected_audio_track_count_;
   int detected_video_track_count_;
   int detected_text_track_count_;
 
   std::map<MediaTrack::Id, DemuxerStream*> track_id_to_demux_stream_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_CHUNK_DEMUXER_H_