Convert //media/filters from scoped_ptr to std::unique_ptr

media/filters/h264_parser.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/h264_parser.h"
 
 #include <limits>
+#include <memory>
 
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "media/base/decrypt_config.h"
 
 namespace media {
 
 bool H264SliceHeader::IsPSlice() const {
   return (slice_type % 5 == kPSlice);
 }
 
 bool H264SliceHeader::IsBSlice() const {
@@ skipping 754 matching lines @@
       sps->scaling_list8x8[i][j] = 16;
 }
 
 H264Parser::Result H264Parser::ParseSPS(int* sps_id) {
   // See 7.4.2.1.
   int data;
   Result res;
 
   *sps_id = -1;
 
-  scoped_ptr<H264SPS> sps(new H264SPS());
+  std::unique_ptr<H264SPS> sps(new H264SPS());
 
   READ_BITS_OR_RETURN(8, &sps->profile_idc);
   READ_BOOL_OR_RETURN(&sps->constraint_set0_flag);
   READ_BOOL_OR_RETURN(&sps->constraint_set1_flag);
   READ_BOOL_OR_RETURN(&sps->constraint_set2_flag);
   READ_BOOL_OR_RETURN(&sps->constraint_set3_flag);
   READ_BOOL_OR_RETURN(&sps->constraint_set4_flag);
   READ_BOOL_OR_RETURN(&sps->constraint_set5_flag);
   READ_BITS_OR_RETURN(2, &data);  // reserved_zero_2bits
   READ_BITS_OR_RETURN(8, &sps->level_idc);
@@ skipping 98 matching lines @@
   return kOk;
 }
 
 H264Parser::Result H264Parser::ParsePPS(int* pps_id) {
   // See 7.4.2.2.
   const H264SPS* sps;
   Result res;
 
   *pps_id = -1;
 
-  scoped_ptr<H264PPS> pps(new H264PPS());
+  std::unique_ptr<H264PPS> pps(new H264PPS());
 
   READ_UE_OR_RETURN(&pps->pic_parameter_set_id);
   READ_UE_OR_RETURN(&pps->seq_parameter_set_id);
   TRUE_OR_RETURN(pps->seq_parameter_set_id < 32);
 
   if (active_SPSes_.find(pps->seq_parameter_set_id) == active_SPSes_.end()) {
     DVLOG(1) << "Invalid stream, no SPS id: " << pps->seq_parameter_set_id;
     return kInvalidStream;
   }
 
@@ skipping 432 matching lines @@
 
     default:
       DVLOG(4) << "Unsupported SEI message";
       break;
   }
 
   return kOk;
 }
 
 }  // namespace media