| Index: media/test/pipeline_integration_test.cc
|
| diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
|
| index eb0037f2de7810499ee08c9df0ba80485462670d..0644c361dc7a2d938f99a8247f2faa8443cb96c4 100644
|
| --- a/media/test/pipeline_integration_test.cc
|
| +++ b/media/test/pipeline_integration_test.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include <stddef.h>
|
| #include <stdint.h>
|
| +#include <utility>
|
|
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| @@ -236,7 +237,7 @@ class FakeEncryptedMedia {
|
| bool has_additional_usable_key,
|
| CdmKeysInfo keys_info) {
|
| app_->OnSessionKeysChange(session_id, has_additional_usable_key,
|
| - keys_info.Pass());
|
| + std::move(keys_info));
|
| }
|
|
|
| void OnLegacySessionError(const std::string& session_id,
|
| @@ -300,7 +301,7 @@ class KeyProvidingApp : public FakeEncryptedMedia::AppBase {
|
| &KeyProvidingApp::OnResolve, base::Unretained(this), expected),
|
| base::Bind(
|
| &KeyProvidingApp::OnReject, base::Unretained(this), expected)));
|
| - return promise.Pass();
|
| + return promise;
|
| }
|
|
|
| scoped_ptr<NewSessionCdmPromise> CreateSessionPromise(
|
| @@ -312,7 +313,7 @@ class KeyProvidingApp : public FakeEncryptedMedia::AppBase {
|
| expected),
|
| base::Bind(
|
| &KeyProvidingApp::OnReject, base::Unretained(this), expected)));
|
| - return promise.Pass();
|
| + return promise;
|
| }
|
|
|
| void OnSessionMessage(const std::string& session_id,
|
| @@ -492,7 +493,7 @@ class MockMediaSource {
|
|
|
| virtual ~MockMediaSource() {}
|
|
|
| - scoped_ptr<Demuxer> GetDemuxer() { return owned_chunk_demuxer_.Pass(); }
|
| + scoped_ptr<Demuxer> GetDemuxer() { return std::move(owned_chunk_demuxer_); }
|
|
|
| void set_encrypted_media_init_data_cb(
|
| const Demuxer::EncryptedMediaInitDataCB& encrypted_media_init_data_cb) {
|
| @@ -653,7 +654,7 @@ class PipelineIntegrationTestHost : public mojo::test::ApplicationTestBase,
|
| media_service_factory_->CreateRenderer(mojo::GetProxy(&mojo_renderer));
|
|
|
| return make_scoped_ptr(new MojoRendererImpl(message_loop_.task_runner(),
|
| - mojo_renderer.Pass()));
|
| + std::move(mojo_renderer)));
|
| }
|
|
|
| private:
|
| @@ -679,7 +680,7 @@ class PipelineIntegrationTest : public PipelineIntegrationTestHost {
|
| // Encrypted content not used, so this is never called.
|
| EXPECT_CALL(*this, OnWaitingForDecryptionKey()).Times(0);
|
|
|
| - demuxer_ = source->GetDemuxer().Pass();
|
| + demuxer_ = source->GetDemuxer();
|
| pipeline_->Start(
|
| demuxer_.get(), CreateRenderer(),
|
| base::Bind(&PipelineIntegrationTest::OnEnded, base::Unretained(this)),
|
| @@ -726,7 +727,7 @@ class PipelineIntegrationTest : public PipelineIntegrationTestHost {
|
| // never called.
|
| EXPECT_CALL(*this, OnWaitingForDecryptionKey()).Times(0);
|
|
|
| - demuxer_ = source->GetDemuxer().Pass();
|
| + demuxer_ = source->GetDemuxer();
|
|
|
| pipeline_->SetCdm(encrypted_media->GetCdmContext(),
|
| base::Bind(&PipelineIntegrationTest::DecryptorAttached,
|
|
|