Convert media/formats to std::unique_ptr

media/formats/mp4/avc.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/formats/mp4/avc.h"
 
 #include <algorithm>
+#include <memory>
 #include <utility>
 
 #include "base/logging.h"
 #include "media/base/decrypt_config.h"
 #include "media/filters/h264_parser.h"
 #include "media/formats/mp4/box_definitions.h"
 #include "media/formats/mp4/box_reader.h"
 
 namespace media {
 namespace mp4 {
@@ skipping 81 matching lines @@
   }
   return pos == temp.size();
 }
 
 // static
 bool AVC::InsertParamSetsAnnexB(const AVCDecoderConfigurationRecord& avc_config,
                                 std::vector<uint8_t>* buffer,
                                 std::vector<SubsampleEntry>* subsamples) {
   DCHECK(AVC::IsValidAnnexB(*buffer, *subsamples));
 
-  scoped_ptr<H264Parser> parser(new H264Parser());
+  std::unique_ptr<H264Parser> parser(new H264Parser());
   const uint8_t* start = &(*buffer)[0];
   parser->SetEncryptedStream(start, buffer->size(), *subsamples);
 
   H264NALU nalu;
   if (parser->AdvanceToNextNALU(&nalu) != H264Parser::kOk)
     return false;
 
   std::vector<uint8_t>::iterator config_insert_point = buffer->begin();
 
   if (nalu.nal_unit_type == H264NALU::kAUD) {
@@ skipping 184 matching lines @@
 
       case H264Parser::kEOStream:
         done = true;
     }
   }
 
   return order_state >= kAfterFirstVCL;
 }
 
 AVCBitstreamConverter::AVCBitstreamConverter(
-    scoped_ptr<AVCDecoderConfigurationRecord> avc_config)
+    std::unique_ptr<AVCDecoderConfigurationRecord> avc_config)
     : avc_config_(std::move(avc_config)) {
-    DCHECK(avc_config_);
+  DCHECK(avc_config_);
 }
 
 AVCBitstreamConverter::~AVCBitstreamConverter() {
 }
 
 bool AVCBitstreamConverter::ConvertFrame(
     std::vector<uint8_t>* frame_buf,
     bool is_keyframe,
     std::vector<SubsampleEntry>* subsamples) const {
   // Convert the AVC NALU length fields to Annex B headers, as expected by
@@ skipping 10 matching lines @@
     // count for that first subsample.
     RCHECK(AVC::InsertParamSetsAnnexB(*avc_config_, frame_buf, subsamples));
   }
 
   DCHECK(AVC::IsValidAnnexB(*frame_buf, *subsamples));
   return true;
 }
 
 }  // namespace mp4
 }  // namespace media