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

Unified Diff: media/filters/chunk_demuxer.cc

Issue 1904213003: Convert //media/filters from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove include 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/filters/chunk_demuxer.h ('k') | media/filters/chunk_demuxer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer.cc
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index 554c9cfd75c76bcbfe9d00158d8dbc140d1c83de..eee0bb495a4b24ed10555faaedb373c29dd492f8 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -513,8 +513,9 @@ ChunkDemuxer::Status ChunkDemuxer::AddId(const std::string& id,
bool has_audio = false;
bool has_video = false;
- scoped_ptr<media::StreamParser> stream_parser(StreamParserFactory::Create(
- type, codecs, media_log_, &has_audio, &has_video));
+ std::unique_ptr<media::StreamParser> stream_parser(
+ StreamParserFactory::Create(type, codecs, media_log_, &has_audio,
+ &has_video));
if (!stream_parser)
return ChunkDemuxer::kNotSupported;
@@ -529,12 +530,12 @@ ChunkDemuxer::Status ChunkDemuxer::AddId(const std::string& id,
if (has_video)
source_id_video_ = id;
- scoped_ptr<FrameProcessor> frame_processor(
+ std::unique_ptr<FrameProcessor> frame_processor(
new FrameProcessor(base::Bind(&ChunkDemuxer::IncreaseDurationIfNecessary,
base::Unretained(this)),
media_log_));
- scoped_ptr<MediaSourceState> source_state(new MediaSourceState(
+ std::unique_ptr<MediaSourceState> source_state(new MediaSourceState(
std::move(stream_parser), std::move(frame_processor),
base::Bind(&ChunkDemuxer::CreateDemuxerStream, base::Unretained(this)),
media_log_));
« no previous file with comments | « media/filters/chunk_demuxer.h ('k') | media/filters/chunk_demuxer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698