Remove ScopedVector from media/base/

media/base/audio_converter_unittest.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.
 
 // MSVC++ requires this to be set before any other includes to get M_PI.
 #define _USE_MATH_DEFINES
 
 #include "media/base/audio_converter.h"
 
 #include <stddef.h>
 
 #include <cmath>
 #include <memory>
 
 #include "base/macros.h"
-#include "base/memory/scoped_vector.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "media/base/audio_timestamp_helper.h"
 #include "media/base/fake_audio_render_callback.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 // Parameters which control the many input case tests.
 static const int kConvertInputs = 8;
@@ skipping 38 matching lines @@
 
   // Creates |count| input callbacks to be used for conversion testing.
   void InitializeInputs(int count) {
     // Setup FakeAudioRenderCallback step to compensate for resampling.
     double scale_factor = input_parameters_.sample_rate() /
         static_cast<double>(output_parameters_.sample_rate());
     double step = kSineCycles / (scale_factor *
         static_cast<double>(output_parameters_.frames_per_buffer()));
 
     for (int i = 0; i < count; ++i) {
-      fake_callbacks_.push_back(new FakeAudioRenderCallback(step, kSampleRate));
-      converter_->AddInput(fake_callbacks_[i]);
+      fake_callbacks_.push_back(
+          base::MakeUnique<FakeAudioRenderCallback>(step, kSampleRate));
+      converter_->AddInput(fake_callbacks_[i].get());
     }
   }
 
   // Resets all input callbacks to a pristine state.
   void Reset() {
     converter_->Reset();
     for (size_t i = 0; i < fake_callbacks_.size(); ++i)
       fake_callbacks_[i]->reset();
     expected_callback_->reset();
   }
@@ skipping 68 matching lines @@
       total_scale += volume;
       fake_callbacks_[i]->set_volume(volume);
     }
     for (int i = 0; i < kConvertCycles; ++i)
       ASSERT_TRUE(RenderAndValidateAudioData(total_scale));
 
     Reset();
 
     // Remove every other input.
     for (size_t i = 1; i < fake_callbacks_.size(); i += 2)
-      converter_->RemoveInput(fake_callbacks_[i]);
+      converter_->RemoveInput(fake_callbacks_[i].get());
 
     SetVolume(1);
     float scale = inputs > 1 ? inputs / 2.0f : inputs;
     for (int i = 0; i < kConvertCycles; ++i)
       ASSERT_TRUE(RenderAndValidateAudioData(scale));
   }
 
  protected:
   virtual ~AudioConverterTest() {}
 
   // Converter under test.
   std::unique_ptr<AudioConverter> converter_;
 
   // Input and output parameters used for AudioConverter construction.
   AudioParameters input_parameters_;
   AudioParameters output_parameters_;
 
   // Destination AudioBus for AudioConverter output.
   std::unique_ptr<AudioBus> audio_bus_;
 
   // AudioBus containing expected results for comparison with |audio_bus_|.
   std::unique_ptr<AudioBus> expected_audio_bus_;
 
   // Vector of all input callbacks used to drive AudioConverter::Convert().
-  ScopedVector<FakeAudioRenderCallback> fake_callbacks_;
+  std::vector<std::unique_ptr<FakeAudioRenderCallback>> fake_callbacks_;
 
   // Parallel input callback which generates the expected output.
   std::unique_ptr<FakeAudioRenderCallback> expected_callback_;
 
   // Epsilon value with which to perform comparisons between |audio_bus_| and
   // |expected_audio_bus_|.
   double epsilon_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioConverterTest);
 };
@@ skipping 60 matching lines @@
         // No resampling. No channel mixing.
         std::tr1::make_tuple(44100, 44100, CHANNEL_LAYOUT_STEREO, 0.00000048),
 
         // Upsampling. Channel upmixing.
         std::tr1::make_tuple(44100, 48000, CHANNEL_LAYOUT_QUAD, 0.033),
 
         // Downsampling. Channel downmixing.
         std::tr1::make_tuple(48000, 41000, CHANNEL_LAYOUT_MONO, 0.042)));
 
 }  // namespace media