Reland of Remove ScopedVector from all other codes in media/

media/formats/webm/opus_packet_builder.cc

 // Copyright (c) 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/formats/webm/opus_packet_builder.h"
+
 #include "base/logging.h"
-#include "media/formats/webm/opus_packet_builder.h"
+#include "base/memory/ptr_util.h"
 #include "media/formats/webm/webm_cluster_parser.h"
 
 namespace media {
 
 OpusPacket::OpusPacket(uint8_t config, uint8_t frame_count, bool is_VBR) {
   DCHECK_GE(config, 0);
   DCHECK_LT(config, kNumPossibleOpusConfigs);
   DCHECK_GE(frame_count, kMinOpusPacketFrameCount);
   DCHECK_LE(frame_count, kMaxOpusPacketFrameCount);
 
@@ skipping 38 matching lines @@
 }
 
 int OpusPacket::size() const {
   return data_.size();
 }
 
 double OpusPacket::duration_ms() const {
   return duration_ms_;
 }
 
-ScopedVector<OpusPacket> BuildAllOpusPackets() {
-  ScopedVector<OpusPacket> opus_packets;
+std::vector<std::unique_ptr<OpusPacket>> BuildAllOpusPackets() {
+  std::vector<std::unique_ptr<OpusPacket>> opus_packets;
 
   for (int frame_count = kMinOpusPacketFrameCount;
        frame_count <= kMaxOpusPacketFrameCount; frame_count++) {
     for (int opus_config_num = 0; opus_config_num < kNumPossibleOpusConfigs;
          opus_config_num++) {
       bool is_VBR = false;
       opus_packets.push_back(
-          new OpusPacket(opus_config_num, frame_count, is_VBR));
+          base::MakeUnique<OpusPacket>(opus_config_num, frame_count, is_VBR));
 
       if (frame_count >= 2) {
         // Add another packet with VBR flag toggled. For frame counts >= 2,
         // VBR triggers changes to packet framing.
         is_VBR = true;
         opus_packets.push_back(
-            new OpusPacket(opus_config_num, frame_count, is_VBR));
+            base::MakeUnique<OpusPacket>(opus_config_num, frame_count, is_VBR));
       }
     }
   }
 
   return opus_packets;
 }
 
 }  // namespace media