Replace scoped_ptr with unique_ptr in webrtc/modules/video_coding/

webrtc/modules/video_coding/test/vcm_payload_sink_factory.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/modules/video_coding/test/vcm_payload_sink_factory.h"
 
 #include <assert.h>
 
 #include <algorithm>
 
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
 #include "webrtc/modules/video_coding/test/test_util.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 
 namespace webrtc {
 namespace rtpplayer {
 
 class VcmPayloadSinkFactory::VcmPayloadSink : public PayloadSinkInterface,
                                               public VCMPacketRequestCallback {
  public:
   VcmPayloadSink(VcmPayloadSinkFactory* factory,
                  RtpStreamInterface* stream,
-                 rtc::scoped_ptr<VideoCodingModule>* vcm,
-                 rtc::scoped_ptr<FileOutputFrameReceiver>* frame_receiver)
+                 std::unique_ptr<VideoCodingModule>* vcm,
+                 std::unique_ptr<FileOutputFrameReceiver>* frame_receiver)
       : factory_(factory), stream_(stream), vcm_(), frame_receiver_() {
     assert(factory);
     assert(stream);
     assert(vcm);
     assert(vcm->get());
     assert(frame_receiver);
     assert(frame_receiver->get());
     vcm_.swap(*vcm);
     frame_receiver_.swap(*frame_receiver);
     vcm_->RegisterPacketRequestCallback(this);
@@ skipping 40 matching lines @@
   }
 
   bool Decode() {
     vcm_->Decode(10000);
     return true;
   }
 
  private:
   VcmPayloadSinkFactory* factory_;
   RtpStreamInterface* stream_;
-  rtc::scoped_ptr<VideoCodingModule> vcm_;
-  rtc::scoped_ptr<FileOutputFrameReceiver> frame_receiver_;
+  std::unique_ptr<VideoCodingModule> vcm_;
+  std::unique_ptr<FileOutputFrameReceiver> frame_receiver_;
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(VcmPayloadSink);
 };
 
 VcmPayloadSinkFactory::VcmPayloadSinkFactory(
     const std::string& base_out_filename,
     Clock* clock,
     bool protection_enabled,
     VCMVideoProtection protection_method,
     int64_t rtt_ms,
@@ skipping 15 matching lines @@
 
 VcmPayloadSinkFactory::~VcmPayloadSinkFactory() {
   assert(sinks_.empty());
 }
 
 PayloadSinkInterface* VcmPayloadSinkFactory::Create(
     RtpStreamInterface* stream) {
   assert(stream);
   CriticalSectionScoped cs(crit_sect_.get());
 
-  rtc::scoped_ptr<VideoCodingModule> vcm(
+  std::unique_ptr<VideoCodingModule> vcm(
       VideoCodingModule::Create(clock_, null_event_factory_.get()));
   if (vcm.get() == NULL) {
     return NULL;
   }
 
   const PayloadTypes& plt = stream->payload_types();
   for (PayloadTypesIterator it = plt.begin(); it != plt.end(); ++it) {
     if (it->codec_type() != kVideoCodecULPFEC &&
         it->codec_type() != kVideoCodecRED) {
       VideoCodec codec;
       VideoCodingModule::Codec(it->codec_type(), &codec);
       codec.plType = it->payload_type();
       if (vcm->RegisterReceiveCodec(&codec, 1) < 0) {
         return NULL;
       }
     }
   }
 
   vcm->SetChannelParameters(0, 0, rtt_ms_);
   vcm->SetVideoProtection(protection_method_, protection_enabled_);
   vcm->SetRenderDelay(render_delay_ms_);
   vcm->SetMinimumPlayoutDelay(min_playout_delay_ms_);
   vcm->SetNackSettings(kMaxNackListSize, kMaxPacketAgeToNack, 0);
 
-  rtc::scoped_ptr<FileOutputFrameReceiver> frame_receiver(
+  std::unique_ptr<FileOutputFrameReceiver> frame_receiver(
       new FileOutputFrameReceiver(base_out_filename_, stream->ssrc()));
-  rtc::scoped_ptr<VcmPayloadSink> sink(
+  std::unique_ptr<VcmPayloadSink> sink(
       new VcmPayloadSink(this, stream, &vcm, &frame_receiver));
 
   sinks_.push_back(sink.get());
   return sink.release();
 }
 
 int VcmPayloadSinkFactory::DecodeAndProcessAll(bool decode_dual_frame) {
   CriticalSectionScoped cs(crit_sect_.get());
   assert(clock_);
   bool should_decode = (clock_->TimeInMilliseconds() % 5) == 0;
@@ skipping 28 matching lines @@
 void VcmPayloadSinkFactory::Remove(VcmPayloadSink* sink) {
   assert(sink);
   CriticalSectionScoped cs(crit_sect_.get());
   Sinks::iterator it = std::find(sinks_.begin(), sinks_.end(), sink);
   assert(it != sinks_.end());
   sinks_.erase(it);
 }
 
 }  // namespace rtpplayer
 }  // namespace webrtc