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

Unified Diff: media/cdm/simple_cdm_allocator_unittest.cc

Issue 1915443003: Replace scoped_ptr with std::unique_ptr in //media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptr-media-base
Patch Set: scopedptr-media: rebase Created 4 years, 8 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 | « media/cdm/simple_cdm_allocator.cc ('k') | media/ffmpeg/ffmpeg_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/simple_cdm_allocator_unittest.cc
diff --git a/media/cdm/simple_cdm_allocator_unittest.cc b/media/cdm/simple_cdm_allocator_unittest.cc
index e602d9e50f754600078e6b87377fc6bd1172dc84..6e95c5368f7fdca2e0fc793787ae825889e162c1 100644
--- a/media/cdm/simple_cdm_allocator_unittest.cc
+++ b/media/cdm/simple_cdm_allocator_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include <stdint.h>
+#include <memory>
#include "base/macros.h"
#include "media/base/video_frame.h"
@@ -64,7 +65,8 @@ TEST_F(SimpleCdmAllocatorTest, CreateCdmBuffer) {
}
TEST_F(SimpleCdmAllocatorTest, CreateCdmVideoFrame) {
- scoped_ptr<VideoFrameImpl> video_frame = allocator_.CreateCdmVideoFrame();
+ std::unique_ptr<VideoFrameImpl> video_frame =
+ allocator_.CreateCdmVideoFrame();
EXPECT_EQ(video_frame->FrameBuffer(), nullptr);
video_frame->SetFrameBuffer(TestCdmBuffer::Create(100));
EXPECT_NE(video_frame->FrameBuffer(), nullptr);
@@ -81,7 +83,8 @@ TEST_F(SimpleCdmAllocatorTest, TransformToVideoFrame) {
size_t memory_needed = VideoFrame::AllocationSize(PIXEL_FORMAT_YV12, size);
// Now create a VideoFrameImpl.
- scoped_ptr<VideoFrameImpl> video_frame = allocator_.CreateCdmVideoFrame();
+ std::unique_ptr<VideoFrameImpl> video_frame =
+ allocator_.CreateCdmVideoFrame();
EXPECT_EQ(video_frame->FrameBuffer(), nullptr);
// Fill VideoFrameImpl as if it was a small video frame.
« no previous file with comments | « media/cdm/simple_cdm_allocator.cc ('k') | media/ffmpeg/ffmpeg_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698