| Index: media/filters/audio_decoder_selector_unittest.cc
|
| diff --git a/media/filters/audio_decoder_selector_unittest.cc b/media/filters/audio_decoder_selector_unittest.cc
|
| index 84b56e6732c66cc0979796491b422acc3058f125..8f2151e7213e09c5fb7fdb5cf5be3f24d32e99c4 100644
|
| --- a/media/filters/audio_decoder_selector_unittest.cc
|
| +++ b/media/filters/audio_decoder_selector_unittest.cc
|
| @@ -3,7 +3,7 @@
|
| // found in the LICENSE file.
|
|
|
| #include <stddef.h>
|
| -
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "base/bind.h"
|
| @@ -86,7 +86,7 @@ class AudioDecoderSelectorTest : public ::testing::Test {
|
| void MockOnDecoderSelected(scoped_ptr<AudioDecoder> decoder,
|
| scoped_ptr<DecryptingDemuxerStream> stream) {
|
| OnDecoderSelected(decoder.get(), stream.get());
|
| - selected_decoder_ = decoder.Pass();
|
| + selected_decoder_ = std::move(decoder);
|
| }
|
|
|
| void UseClearStream() {
|
| @@ -138,9 +138,8 @@ class AudioDecoderSelectorTest : public ::testing::Test {
|
| all_decoders_.erase(
|
| all_decoders_.begin() + num_decoders, all_decoders_.end());
|
|
|
| - decoder_selector_.reset(
|
| - new AudioDecoderSelector(message_loop_.task_runner(),
|
| - all_decoders_.Pass(), new MediaLog()));
|
| + decoder_selector_.reset(new AudioDecoderSelector(
|
| + message_loop_.task_runner(), std::move(all_decoders_), new MediaLog()));
|
| }
|
|
|
| void SelectDecoder() {
|
|
|