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

Unified Diff: media/filters/decoder_selector.cc

Issue 1544313002: Convert Pass()→std::move() in //media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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_unittest.cc ('k') | media/filters/decoder_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/decoder_selector.cc
diff --git a/media/filters/decoder_selector.cc b/media/filters/decoder_selector.cc
index c13fc0ded6c0e9b75bd77f6c0594bfd110cb9083..87e58a695f14598c79d8d61a8495471eb62a3b35 100644
--- a/media/filters/decoder_selector.cc
+++ b/media/filters/decoder_selector.cc
@@ -2,7 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "decoder_selector.h"
+#include "media/filters/decoder_selector.h"
+
+#include <utility>
#include "base/bind.h"
#include "base/callback_helpers.h"
@@ -59,7 +61,7 @@ DecoderSelector<StreamType>::DecoderSelector(
ScopedVector<Decoder> decoders,
const scoped_refptr<MediaLog>& media_log)
: task_runner_(task_runner),
- decoders_(decoders.Pass()),
+ decoders_(std::move(decoders)),
media_log_(media_log),
input_stream_(nullptr),
weak_ptr_factory_(this) {}
@@ -142,7 +144,7 @@ void DecoderSelector<StreamType>::DecryptingDecoderInitDone(bool success) {
if (success) {
base::ResetAndReturn(&select_decoder_cb_)
- .Run(decoder_.Pass(), scoped_ptr<DecryptingDemuxerStream>());
+ .Run(std::move(decoder_), scoped_ptr<DecryptingDemuxerStream>());
return;
}
@@ -220,7 +222,7 @@ void DecoderSelector<StreamType>::DecoderInitDone(bool success) {
}
base::ResetAndReturn(&select_decoder_cb_)
- .Run(decoder_.Pass(), decrypted_stream_.Pass());
+ .Run(std::move(decoder_), std::move(decrypted_stream_));
}
template <DemuxerStream::Type StreamType>
« no previous file with comments | « media/filters/chunk_demuxer_unittest.cc ('k') | media/filters/decoder_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698