Remove ScopedVector from content/browser/.

content/browser/renderer_host/media/audio_input_sync_writer.cc

 // 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.
 
 #include "content/browser/renderer_host/media/audio_input_sync_writer.h"
 
 #include <algorithm>
 
 #include "base/format_macros.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 45 matching lines @@
   DVLOG(1) << "shared_memory_size: " << shared_memory_size;
   DVLOG(1) << "shared_memory_segment_count: " << shared_memory_segment_count;
   DVLOG(1) << "audio_bus_memory_size: " << audio_bus_memory_size_;
 
   // Create vector of audio buses by wrapping existing blocks of memory.
   uint8_t* ptr = shared_memory_;
   for (int i = 0; i < shared_memory_segment_count; ++i) {
     CHECK_EQ(0U, reinterpret_cast<uintptr_t>(ptr) &
         (AudioBus::kChannelAlignment - 1));
     AudioInputBuffer* buffer = reinterpret_cast<AudioInputBuffer*>(ptr);
-    std::unique_ptr<AudioBus> audio_bus =
-        AudioBus::WrapMemory(params, buffer->audio);
-    audio_buses_.push_back(std::move(audio_bus));
+    audio_buses_.push_back(AudioBus::WrapMemory(params, buffer->audio));
     ptr += shared_memory_segment_size_;
   }
 }
 
 AudioInputSyncWriter::~AudioInputSyncWriter() {
   // We log the following:
   // - Percentage of data written to fifo (and not to shared memory).
   // - Percentage of data dropped (fifo reached max size or socket buffer full).
   // - Glitch yes/no (at least 1 drop).
   //
@@ skipping 67 matching lines @@
 
   bool write_error = !WriteDataFromFifoToSharedMemory();
 
   // Write the current data to the shared memory if there is room, otherwise
   // put it in the fifo.
   if (number_of_filled_segments_ <
       static_cast<int>(shared_memory_segment_count_)) {
     WriteParametersToCurrentSegment(volume, key_pressed, hardware_delay_bytes);
 
     // Copy data into shared memory using pre-allocated audio buses.
-    AudioBus* audio_bus = audio_buses_[current_segment_id_];
-    data->CopyTo(audio_bus);
+    data->CopyTo(audio_buses_[current_segment_id_].get());
 
     if (!SignalDataWrittenAndUpdateCounters())
       write_error = true;
 
     trailing_write_to_fifo_count_ = 0;
   } else {
     if (!PushDataToFifo(data, volume, key_pressed, hardware_delay_bytes))
       write_error = true;
 
     ++write_to_fifo_count_;
@@ skipping 116 matching lines @@
 
   while (audio_bus_it != overflow_buses_.end() &&
          number_of_filled_segments_ < segment_count) {
     // Write parameters to shared memory.
     WriteParametersToCurrentSegment((*params_it).volume,
                                     (*params_it).key_pressed,
                                     (*params_it).hardware_delay_bytes);
 
     // Copy data from the fifo into shared memory using pre-allocated audio
     // buses.
-    (*audio_bus_it)->CopyTo(audio_buses_[current_segment_id_]);
+    (*audio_bus_it)->CopyTo(audio_buses_[current_segment_id_].get());
 
     if (!SignalDataWrittenAndUpdateCounters())
       write_error = true;
 
     ++params_it;
     ++audio_bus_it;
   }
 
   // Erase all copied data from fifo.
   overflow_params_.erase(overflow_params_.begin(), params_it);
@@ skipping 39 matching lines @@
     current_segment_id_ = 0;
   ++number_of_filled_segments_;
   CHECK_LE(number_of_filled_segments_,
            static_cast<int>(shared_memory_segment_count_));
   ++next_buffer_id_;
 
   return true;
 }
 
 }  // namespace content