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

Unified Diff: media/cdm/cenc_utils.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/cdm_allocator.h ('k') | media/cdm/json_web_key.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/cenc_utils.cc
diff --git a/media/cdm/cenc_utils.cc b/media/cdm/cenc_utils.cc
index a156c9d712bd22c92e078c670ec83be95ec670e4..20267c94ff016b2382fd9782a8d830931e7c51d1 100644
--- a/media/cdm/cenc_utils.cc
+++ b/media/cdm/cenc_utils.cc
@@ -4,8 +4,9 @@
#include "media/cdm/cenc_utils.h"
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "media/formats/mp4/box_definitions.h"
#include "media/formats/mp4/box_reader.h"
@@ -38,7 +39,7 @@ static bool ReadAllPsshBoxes(
// mp4::ProtectionSystemSpecificHeader doesn't validate the 'pssh' contents,
// so this simply verifies that |input| only contains 'pssh' boxes and
// nothing else.
- scoped_ptr<mp4::BoxReader> input_reader(
+ std::unique_ptr<mp4::BoxReader> input_reader(
mp4::BoxReader::ReadConcatentatedBoxes(input.data(), input.size()));
std::vector<mp4::ProtectionSystemSpecificHeader> raw_pssh_boxes;
if (!input_reader->ReadAllChildrenAndCheckFourCC(&raw_pssh_boxes))
@@ -50,7 +51,7 @@ static bool ReadAllPsshBoxes(
// (due to unsupported version, for example), this is done one by one,
// ignoring any boxes that can't be parsed.
for (const auto& raw_pssh_box : raw_pssh_boxes) {
- scoped_ptr<mp4::BoxReader> raw_pssh_reader(
+ std::unique_ptr<mp4::BoxReader> raw_pssh_reader(
mp4::BoxReader::ReadConcatentatedBoxes(raw_pssh_box.raw_box.data(),
raw_pssh_box.raw_box.size()));
// ReadAllChildren() appends any successfully parsed box onto it's
« no previous file with comments | « media/cdm/cdm_allocator.h ('k') | media/cdm/json_web_key.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698