Remove stl_util's deletion functions from media/.

media/filters/h264_parser.cc

 // 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.
 
 #include "media/filters/h264_parser.h"
 
 #include <limits>
 #include <memory>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/numerics/safe_math.h"
-#include "base/stl_util.h"
 #include "media/base/decrypt_config.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace media {
 
 bool H264SliceHeader::IsPSlice() const {
   return (slice_type % 5 == kPSlice);
 }
 
@@ skipping 175 matching lines @@
   0, 1, 11, 11, 11, 33, 11, 11, 11, 33, 11, 11, 33, 99, 3, 2, 1
 };
 static_assert(arraysize(kTableSarWidth) == arraysize(kTableSarHeight),
               "sar tables must have the same size");
 
 H264Parser::H264Parser() {
   Reset();
 }
 
 H264Parser::~H264Parser() {
-  base::STLDeleteValues(&active_SPSes_);
-  base::STLDeleteValues(&active_PPSes_);
 }
 
 void H264Parser::Reset() {
   stream_ = NULL;
   bytes_left_ = 0;
   encrypted_ranges_.clear();
 }
 
 void H264Parser::SetStream(const uint8_t* stream, off_t stream_size) {
   std::vector<SubsampleEntry> subsamples;
@@ skipping 23 matching lines @@
   }
 }
 
 const H264PPS* H264Parser::GetPPS(int pps_id) const {
   auto it = active_PPSes_.find(pps_id);
   if (it == active_PPSes_.end()) {
     DVLOG(1) << "Requested a nonexistent PPS id " << pps_id;
     return nullptr;
   }
 
-  return it->second;
+  return it->second.get();
 }
 
 const H264SPS* H264Parser::GetSPS(int sps_id) const {
   auto it = active_SPSes_.find(sps_id);
   if (it == active_SPSes_.end()) {
     DVLOG(1) << "Requested a nonexistent SPS id " << sps_id;
     return nullptr;
   }
 
-  return it->second;
+  return it->second.get();
 }
 
 static inline bool IsStartCode(const uint8_t* data) {
   return data[0] == 0x00 && data[1] == 0x00 && data[2] == 0x01;
 }
 
 // static
 bool H264Parser::FindStartCode(const uint8_t* data,
                                off_t data_size,
                                off_t* offset,
@@ skipping 717 matching lines @@
   READ_BOOL_OR_RETURN(&sps->vui_parameters_present_flag);
   if (sps->vui_parameters_present_flag) {
     DVLOG(4) << "VUI parameters present";
     res = ParseVUIParameters(sps.get());
     if (res != kOk)
       return res;
   }
 
   // If an SPS with the same id already exists, replace it.
   *sps_id = sps->seq_parameter_set_id;
-  delete active_SPSes_[*sps_id];
-  active_SPSes_[*sps_id] = sps.release();
+  active_SPSes_[*sps_id] = std::move(sps);
 
   return kOk;
 }
 
 H264Parser::Result H264Parser::ParsePPS(int* pps_id) {
   // See 7.4.2.2.
   const H264SPS* sps;
   Result res;
 
   *pps_id = -1;
@@ skipping 54 matching lines @@
       res = ParsePPSScalingLists(*sps, pps.get());
       if (res != kOk)
         return res;
     }
 
     READ_SE_OR_RETURN(&pps->second_chroma_qp_index_offset);
   }
 
   // If a PPS with the same id already exists, replace it.
   *pps_id = pps->pic_parameter_set_id;
-  delete active_PPSes_[*pps_id];
-  active_PPSes_[*pps_id] = pps.release();
+  active_PPSes_[*pps_id] = std::move(pps);
 
   return kOk;
 }
 
 H264Parser::Result H264Parser::ParseRefPicListModification(
     int num_ref_idx_active_minus1,
     H264ModificationOfPicNum* ref_list_mods) {
   H264ModificationOfPicNum* pic_num_mod;
 
   if (num_ref_idx_active_minus1 >= 32)
@@ skipping 368 matching lines @@
 
     default:
       DVLOG(4) << "Unsupported SEI message";
       break;
   }
 
   return kOk;
 }
 
 }  // namespace media