commit 3f55dea259ba2a4f7c541ea4718fd879f6ae49e4
author kwiberg <kwiberg@webrtc.org> Mon Feb 29 05:51:59 2016 -0800
committer Commit bot <commit-bot@chromium.org> Mon Feb 29 13:52:06 2016 +0000
tree a53a617dbb223ec55eba25f9186736863e0facc2
parent a4f31bd03a7bf52470ae7143fa25cddef2cbf02c

Replace scoped_ptr with unique_ptr in webrtc/modules/video_coding/

BUG=webrtc:5520

Review URL: https://codereview.webrtc.org/1721353002

Cr-Commit-Position: refs/heads/master@{#11814}

webrtc/modules/video_coding/codec_database.h

diff --git a/webrtc/modules/video_coding/codec_database.h b/webrtc/modules/video_coding/codec_database.h
index 62ec30a..4ba72f7 100644
--- a/webrtc/modules/video_coding/codec_database.h
+++ b/webrtc/modules/video_coding/codec_database.h
@@ -12,8 +12,8 @@
 #define WEBRTC_MODULES_VIDEO_CODING_CODEC_DATABASE_H_
 
 #include <map>
+#include <memory>
 
-#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
 #include "webrtc/modules/video_coding/include/video_coding.h"
 #include "webrtc/modules/video_coding/generic_decoder.h"
@@ -28,7 +28,7 @@
                     int number_of_cores,
                     bool require_key_frame);
 
-  rtc::scoped_ptr<VideoCodec> settings;
+  std::unique_ptr<VideoCodec> settings;
   int number_of_cores;
   bool require_key_frame;
 };
@@ -156,7 +156,7 @@
   bool internal_source_;
   VideoEncoderRateObserver* const encoder_rate_observer_;
   VCMEncodedFrameCallback* const encoded_frame_callback_;
-  rtc::scoped_ptr<VCMGenericEncoder> ptr_encoder_;
+  std::unique_ptr<VCMGenericEncoder> ptr_encoder_;
   VCMGenericDecoder* ptr_decoder_;
   DecoderMap dec_map_;
   ExternalDecoderMap dec_external_map_;