Index: media/test/pipeline_integration_test_base.cc |
diff --git a/media/test/pipeline_integration_test_base.cc b/media/test/pipeline_integration_test_base.cc |
index b75a04c82c009a745f9593d74cedc0eac7f73c4c..a2e4254dc91eabe7442606167800fb1b12908ad0 100644 |
--- a/media/test/pipeline_integration_test_base.cc |
+++ b/media/test/pipeline_integration_test_base.cc |
@@ -4,6 +4,8 @@ |
#include "media/test/pipeline_integration_test_base.h" |
+#include <utility> |
+ |
#include "base/bind.h" |
#include "base/memory/scoped_vector.h" |
#include "media/base/cdm_context.h" |
@@ -267,7 +269,7 @@ scoped_ptr<Renderer> PipelineIntegrationTestBase::CreateRenderer() { |
// Disable frame dropping if hashing is enabled. |
scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( |
message_loop_.task_runner(), message_loop_.task_runner().get(), |
- video_sink_.get(), video_decoders.Pass(), false, nullptr, |
+ video_sink_.get(), std::move(video_decoders), false, nullptr, |
new MediaLog())); |
if (!clockless_playback_) { |
@@ -301,7 +303,7 @@ scoped_ptr<Renderer> PipelineIntegrationTestBase::CreateRenderer() { |
(clockless_playback_) |
? static_cast<AudioRendererSink*>(clockless_audio_sink_.get()) |
: audio_sink_.get(), |
- audio_decoders.Pass(), hardware_config_, new MediaLog())); |
+ std::move(audio_decoders), hardware_config_, new MediaLog())); |
if (hashing_enabled_) { |
if (clockless_playback_) |
clockless_audio_sink_->StartAudioHashForTesting(); |
@@ -310,9 +312,8 @@ scoped_ptr<Renderer> PipelineIntegrationTestBase::CreateRenderer() { |
} |
scoped_ptr<RendererImpl> renderer_impl( |
- new RendererImpl(message_loop_.task_runner(), |
- audio_renderer.Pass(), |
- video_renderer.Pass())); |
+ new RendererImpl(message_loop_.task_runner(), std::move(audio_renderer), |
+ std::move(video_renderer))); |
// Prevent non-deterministic buffering state callbacks from firing (e.g., slow |
// machine, valgrind). |
@@ -321,7 +322,7 @@ scoped_ptr<Renderer> PipelineIntegrationTestBase::CreateRenderer() { |
if (clockless_playback_) |
renderer_impl->EnableClocklessVideoPlaybackForTesting(); |
- return renderer_impl.Pass(); |
+ return std::move(renderer_impl); |
} |
void PipelineIntegrationTestBase::OnVideoFramePaint( |