Index: chromecast/renderer/media/audio_pipeline_proxy.cc |
diff --git a/chromecast/renderer/media/audio_pipeline_proxy.cc b/chromecast/renderer/media/audio_pipeline_proxy.cc |
index 2ab68345ec119362035901dfccb4da7906eb196f..f6d72a76baa451c6f26392761cf06a4c620a7861 100644 |
--- a/chromecast/renderer/media/audio_pipeline_proxy.cc |
+++ b/chromecast/renderer/media/audio_pipeline_proxy.cc |
@@ -4,6 +4,8 @@ |
#include "chromecast/renderer/media/audio_pipeline_proxy.h" |
+#include <utility> |
+ |
#include "base/bind.h" |
#include "base/callback_helpers.h" |
#include "base/macros.h" |
@@ -234,7 +236,7 @@ void AudioPipelineProxy::Initialize( |
const ::media::PipelineStatusCB& status_cb) { |
CMALOG(kLogControl) << "AudioPipelineProxy::Initialize"; |
DCHECK(thread_checker_.CalledOnValidThread()); |
- audio_streamer_->SetCodedFrameProvider(frame_provider.Pass()); |
+ audio_streamer_->SetCodedFrameProvider(std::move(frame_provider)); |
AudioPipelineProxyInternal::SharedMemCB shared_mem_cb = |
::media::BindToCurrentLoop(base::Bind( |
@@ -257,13 +259,13 @@ void AudioPipelineProxy::OnAvPipeCreated( |
CHECK(shared_memory->memory()); |
scoped_ptr<MediaMemoryChunk> shared_memory_chunk( |
- new SharedMemoryChunk(shared_memory.Pass(), kAppAudioBufferSize)); |
+ new SharedMemoryChunk(std::move(shared_memory), kAppAudioBufferSize)); |
scoped_ptr<MediaMessageFifo> audio_pipe( |
- new MediaMessageFifo(shared_memory_chunk.Pass(), false)); |
+ new MediaMessageFifo(std::move(shared_memory_chunk), false)); |
audio_pipe->ObserveWriteActivity( |
base::Bind(&AudioPipelineProxy::OnPipeWrite, weak_this_)); |
- audio_streamer_->SetMediaMessageFifo(audio_pipe.Pass()); |
+ audio_streamer_->SetMediaMessageFifo(std::move(audio_pipe)); |
// Now proceed to the decoder/renderer initialization. |
FORWARD_ON_IO_THREAD(Initialize, config, status_cb); |