Remove ScopedVector from audio/video renderer related code in media/

media/filters/decoder_selector.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/decoder_selector.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 184 matching lines @@
 }
 
 template <DemuxerStream::Type StreamType>
 void DecoderSelector<StreamType>::InitializeDecoder() {
   DVLOG(2) << __func__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(!decoder_);
 
   // Select the next non-blacklisted decoder.
   while (!decoders_.empty()) {
-    std::unique_ptr<Decoder> decoder(decoders_.front());
-    decoders_.weak_erase(decoders_.begin());
+    std::unique_ptr<Decoder> decoder(std::move(decoders_.front()));
+    decoders_.erase(decoders_.begin());
     // When |decrypted_stream_| is selected, the |config_| has changed so ignore
     // the blacklist.
     if (decrypted_stream_ ||
         decoder->GetDisplayName() != blacklisted_decoder_) {
       decoder_ = std::move(decoder);
       break;
     }
   }
 
   if (!decoder_) {
@@ skipping 41 matching lines @@
 
 // These forward declarations tell the compiler that we will use
 // DecoderSelector with these arguments, allowing us to keep these definitions
 // in our .cc without causing linker errors. This also means if anyone tries to
 // instantiate a DecoderSelector with anything but these two specializations
 // they'll most likely get linker errors.
 template class DecoderSelector<DemuxerStream::AUDIO>;
 template class DecoderSelector<DemuxerStream::VIDEO>;
 
 }  // namespace media