Remove stl_util's deletion functions from media/.

media/filters/media_source_state.h

 // Copyright (c) 2016 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_MEDIA_SOURCE_STATE_H_
 #define MEDIA_FILTERS_MEDIA_SOURCE_STATE_H_
 
 #include <list>
 
 #include "base/bind.h"
@@ skipping 176 matching lines @@
   std::map<StreamParser::TrackId, bool> media_segment_has_data_for_track_;
 
   // The object used to parse appended data.
   std::unique_ptr<StreamParser> stream_parser_;
 
   // Note that ChunkDemuxerStreams are created and owned by the parent
   // ChunkDemuxer. They are not owned by |this|.
   using DemuxerStreamMap = std::map<StreamParser::TrackId, ChunkDemuxerStream*>;
   DemuxerStreamMap audio_streams_;
   DemuxerStreamMap video_streams_;
-
-  typedef std::map<StreamParser::TrackId, ChunkDemuxerStream*> TextStreamMap;
-  TextStreamMap text_stream_map_;  // |this| owns the map's stream pointers.
+  DemuxerStreamMap text_streams_;

[Avi (use Gerrit), 2016/09/26 21:07:26]

The old ownership here, where the audio and video streams weren't owned but the
text streams were, was hard to reason about. What made it worse was that the
CreateDemuxerStreamCB sometimes returned owned objects and sometimes didn't.

So I made all streams the same.

When reviewing, please carefully review and verify the main ownership change
here, which is removing ownership of the text streams from the MediaSourceState
and having the ChunkDemuxer own them.

[wolenetz, 2016/09/27 22:01:11]

Acknowledged.

 
   std::unique_ptr<FrameProcessor> frame_processor_;
   scoped_refptr<MediaLog> media_log_;
   StreamParser::InitCB init_cb_;
 
   State state_;
 
   // During Append(), OnNewConfigs() will trigger the initialization segment
   // received algorithm. Note, the MSE spec explicitly disallows this algorithm
   // during an Abort(), since Abort() is allowed only to emit coded frames, and
@@ skipping 12 matching lines @@
   // TODO(wolenetz): Refactor this function while integrating April 29, 2014
   // changes to MSE spec. See http://crbug.com/371499.
   bool auto_update_timestamp_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSourceState);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_MEDIA_SOURCE_STATE_H_