Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Unified Diff: webrtc/media/engine/webrtcvideoframefactory_unittest.cc

Issue 1728503002: Replace scoped_ptr with unique_ptr in webrtc/media/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up1
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/media/engine/webrtcvideoframefactory.cc ('k') | webrtc/media/engine/webrtcvoe.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/engine/webrtcvideoframefactory_unittest.cc
diff --git a/webrtc/media/engine/webrtcvideoframefactory_unittest.cc b/webrtc/media/engine/webrtcvideoframefactory_unittest.cc
index df9d1f924f52c647f059f3dbeb36410635746185..5ff34f383f10f1f2f2df42895789cd47b65e3fc5 100644
--- a/webrtc/media/engine/webrtcvideoframefactory_unittest.cc
+++ b/webrtc/media/engine/webrtcvideoframefactory_unittest.cc
@@ -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_;
};
« no previous file with comments | « webrtc/media/engine/webrtcvideoframefactory.cc ('k') | webrtc/media/engine/webrtcvoe.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698