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

Unified Diff: media/cdm/simple_cdm_allocator.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.h ('k') | media/cdm/simple_cdm_allocator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/simple_cdm_allocator.cc
diff --git a/media/cdm/simple_cdm_allocator.cc b/media/cdm/simple_cdm_allocator.cc
index 2ae4dd890a1a46012c582ba05f670b703781653f..45a5a38f83d75b57e6372464cdfa476eee16bf02 100644
--- a/media/cdm/simple_cdm_allocator.cc
+++ b/media/cdm/simple_cdm_allocator.cc
@@ -4,6 +4,7 @@
#include "media/cdm/simple_cdm_allocator.h"
+#include "base/memory/ptr_util.h"
#include "media/base/video_frame.h"
#include "media/cdm/cdm_helpers.h"
#include "media/cdm/simple_cdm_buffer.h"
@@ -66,8 +67,8 @@ cdm::Buffer* SimpleCdmAllocator::CreateCdmBuffer(size_t capacity) {
}
// Creates a new SimpleCdmVideoFrame on every request.
-scoped_ptr<VideoFrameImpl> SimpleCdmAllocator::CreateCdmVideoFrame() {
- return make_scoped_ptr(new SimpleCdmVideoFrame());
+std::unique_ptr<VideoFrameImpl> SimpleCdmAllocator::CreateCdmVideoFrame() {
+ return base::WrapUnique(new SimpleCdmVideoFrame());
}
} // namespace media
« no previous file with comments | « media/cdm/simple_cdm_allocator.h ('k') | media/cdm/simple_cdm_allocator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698