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

Unified Diff: media/filters/decoder_selector.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: 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
Index: media/filters/decoder_selector.cc
diff --git a/media/filters/decoder_selector.cc b/media/filters/decoder_selector.cc
index 732dd53c6b62ff79ce6f2433eaa38fdcce351a3e..cd4ac28d3695c0bf86845caf2fb36b4803710bdb 100644
--- a/media/filters/decoder_selector.cc
+++ b/media/filters/decoder_selector.cc
@@ -145,7 +145,7 @@ void DecoderSelector<StreamType>::DecryptingDecoderInitDone(bool success) {
if (success) {
base::ResetAndReturn(&select_decoder_cb_)
- .Run(std::move(decoder_), scoped_ptr<DecryptingDemuxerStream>());
+ .Run(std::move(decoder_), std::unique_ptr<DecryptingDemuxerStream>());
return;
}
@@ -231,8 +231,8 @@ void DecoderSelector<StreamType>::ReturnNullDecoder() {
DVLOG(2) << __FUNCTION__;
DCHECK(task_runner_->BelongsToCurrentThread());
base::ResetAndReturn(&select_decoder_cb_)
- .Run(scoped_ptr<Decoder>(),
- scoped_ptr<DecryptingDemuxerStream>());
+ .Run(std::unique_ptr<Decoder>(),
+ std::unique_ptr<DecryptingDemuxerStream>());
}
// These forward declarations tell the compiler that we will use

Powered by Google App Engine
This is Rietveld 408576698