media: Use stl utilities from the base namespace

media/base/android/access_unit_queue.cc

 // Copyright 2015 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/base/android/access_unit_queue.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "media/base/demuxer_stream.h"
 
 namespace media {
 
 namespace {
 // Amount of history chunks we keep by default. The zero size means we do not
 // keep chunks before the current one and the history is limited by the size
 // of one chunk.
 const int kDefaultHistoryChunksAmount = 0;
 }
 
 AccessUnitQueue::AccessUnitQueue()
     : index_in_chunk_(0),
       history_chunks_amount_(kDefaultHistoryChunksAmount),
       has_eos_(false) {
   current_chunk_ = chunks_.end();
 }
 
 AccessUnitQueue::~AccessUnitQueue() {
-  STLDeleteContainerPointers(chunks_.begin(), chunks_.end());
+  base::STLDeleteContainerPointers(chunks_.begin(), chunks_.end());
 }
 
 void AccessUnitQueue::PushBack(const DemuxerData& data) {
   // Media thread
   DCHECK(!data.access_units.empty());
 
 #if DCHECK_IS_ON()
   // If there is an AU with |kConfigChanged| status, it must be the last
   // AU in the chunk and the data should have exactly one corresponding
   // DemuxerConfigs.
@@ skipping 62 matching lines @@
   index_in_chunk_ = 0;
   ++current_chunk_;
 
   // Keep only |history_chunks_amount_| before the current one.
   // std::distance() and std::advance() do not work efficiently with std::list,
   // but the history_size should be small (default is 0).
   size_t num_consumed_chunks = std::distance(chunks_.begin(), current_chunk_);
   if (num_consumed_chunks > history_chunks_amount_) {
     DataChunkQueue::iterator first_to_keep = chunks_.begin();
     std::advance(first_to_keep, num_consumed_chunks - history_chunks_amount_);
-    STLDeleteContainerPointers(chunks_.begin(), first_to_keep);
+    base::STLDeleteContainerPointers(chunks_.begin(), first_to_keep);
     chunks_.erase(chunks_.begin(), first_to_keep);
   }
 }
 
 void AccessUnitQueue::Flush() {
   // Media thread
   base::AutoLock lock(lock_);
 
-  STLDeleteContainerPointers(chunks_.begin(), chunks_.end());
+  base::STLDeleteContainerPointers(chunks_.begin(), chunks_.end());
   chunks_.clear();
 
   current_chunk_ = chunks_.end();
   index_in_chunk_ = 0;
   has_eos_ = false;
 }
 
 bool AccessUnitQueue::RewindToLastKeyFrame() {
   // Media thread
   base::AutoLock lock(lock_);
@@ skipping 71 matching lines @@
       DCHECK((*chunk)->demuxer_configs.size() == 1);
       --(*data_length);
     }
   }
 
   *total_length -= index_in_chunk_;
   *data_length -= index_in_chunk_;
 }
 
 }  // namespace media