Replace scoped_ptr with unique_ptr in webrtc/media/

BUG=webrtc:5520

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

Cr-Commit-Position: refs/heads/master@{#11779}
This commit is contained in:
kwiberg
2016-02-26 03:00:35 -08:00
committed by Commit bot
parent 029e220593
commit 686a8efad9
46 changed files with 273 additions and 234 deletions

View File

@ -10,6 +10,8 @@
#include <string.h>
#include <memory>
#include "webrtc/media/base/videoframe_unittest.h"
#include "webrtc/media/engine/webrtcvideoframe.h"
#include "webrtc/media/engine/webrtcvideoframefactory.h"
@ -68,7 +70,7 @@ class WebRtcVideoFrameFactoryTest
InitFrame(webrtc::kVideoRotation_270);
const cricket::CapturedFrame& captured_frame = get_captured_frame();
// Create the new frame from the CapturedFrame.
rtc::scoped_ptr<cricket::VideoFrame> frame;
std::unique_ptr<cricket::VideoFrame> frame;
int new_width = captured_frame.width / 2;
int new_height = captured_frame.height / 2;
frame.reset(factory.CreateAliasedFrame(&captured_frame, new_width,
@ -94,7 +96,7 @@ class WebRtcVideoFrameFactoryTest
private:
cricket::CapturedFrame captured_frame_;
rtc::scoped_ptr<uint8_t[]> captured_frame_buffer_;
std::unique_ptr<uint8_t[]> captured_frame_buffer_;
cricket::WebRtcVideoFrameFactory factory_;
};