Remove ScopedVector from media/base/

media/base/audio_block_fifo.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 <stdint.h>
 
 #include <algorithm>
 
 #include "media/base/audio_block_fifo.h"
 
@@ skipping 18 matching lines @@
                           int bytes_per_sample) {
   PushInternal(source, frames, bytes_per_sample);
 }
 
 void AudioBlockFifo::PushSilence(int frames) {
   PushInternal(nullptr, frames, 0);
 }
 
 const AudioBus* AudioBlockFifo::Consume() {
   DCHECK(available_blocks_);
-  AudioBus* audio_bus = audio_blocks_[read_block_];
+  AudioBus* audio_bus = audio_blocks_[read_block_].get();
   read_block_ = (read_block_ + 1) % audio_blocks_.size();
   --available_blocks_;
   return audio_bus;
 }
 
 void AudioBlockFifo::Clear() {
   write_pos_ = 0;
   write_block_ = 0;
   read_block_ = 0;
   available_blocks_ = 0;
@@ skipping 10 matching lines @@
   return unfilled_frames;
 }
 
 void AudioBlockFifo::IncreaseCapacity(int blocks) {
   DCHECK_GT(blocks, 0);
 
   // Create |blocks| of audio buses and insert them to the containers.
   audio_blocks_.reserve(audio_blocks_.size() + blocks);
 
   const int original_size = audio_blocks_.size();
-  for (int i = 0; i < blocks; ++i) {
-    audio_blocks_.push_back(
-        AudioBus::Create(channels_, block_frames_).release());
-  }
+  for (int i = 0; i < blocks; ++i)
+    audio_blocks_.push_back(AudioBus::Create(channels_, block_frames_));
 
   if (!original_size)
     return;
 
   std::rotate(audio_blocks_.begin() + read_block_,
               audio_blocks_.begin() + original_size, audio_blocks_.end());
 
   // Update the write pointer if it is on top of the new inserted blocks.
   if (write_block_ >= read_block_)
     write_block_ += blocks;
@@ skipping 12 matching lines @@
   // we inject silence.
   DCHECK((source && bytes_per_sample > 0) || (!source && !bytes_per_sample));
   DCHECK_GT(frames, 0);
   DCHECK_LT(available_blocks_, static_cast<int>(audio_blocks_.size()));
   CHECK_LE(frames, GetUnfilledFrames());
 
   const uint8_t* source_ptr = static_cast<const uint8_t*>(source);
   int frames_to_push = frames;
   while (frames_to_push) {
     // Get the current write block.
-    AudioBus* current_block = audio_blocks_[write_block_];
+    AudioBus* current_block = audio_blocks_[write_block_].get();
 
     // Figure out what segment sizes we need when adding the new content to
     // the FIFO.
     const int push_frames =
         std::min(block_frames_ - write_pos_, frames_to_push);
 
     if (source) {
       // Deinterleave the content to the FIFO and update the |write_pos_|.
       current_block->FromInterleavedPartial(source_ptr, write_pos_, push_frames,
                                             bytes_per_sample);
     } else {
       current_block->ZeroFramesPartial(write_pos_, push_frames);
     }
     write_pos_ = (write_pos_ + push_frames) % block_frames_;
     if (!write_pos_) {
       // The current block is completely filled, increment |write_block_| and
       // |available_blocks_|.
       write_block_ = (write_block_ + 1) % audio_blocks_.size();
       ++available_blocks_;
     }
 
     if (source_ptr)
       source_ptr += push_frames * bytes_per_sample * channels_;
     frames_to_push -= push_frames;
     DCHECK_GE(frames_to_push, 0);
   }
 }
 
 }  // namespace media