Index: chromecast/browser/media/media_pipeline_host.cc |
diff --git a/chromecast/browser/media/media_pipeline_host.cc b/chromecast/browser/media/media_pipeline_host.cc |
index 43d0eb4e62b16148e732b1d6d1405da9fe26b780..8ad5c29f23c27f351c91a23ca416107fc1741994 100644 |
--- a/chromecast/browser/media/media_pipeline_host.cc |
+++ b/chromecast/browser/media/media_pipeline_host.cc |
@@ -69,7 +69,7 @@ void MediaPipelineHost::Initialize(LoadType load_type, |
media_pipeline_->SetClient(client); |
media_pipeline_->Initialize(load_type, |
- create_backend_cb.Run(default_parameters).Pass()); |
+ create_backend_cb.Run(default_parameters)); |
} |
void MediaPipelineHost::SetAvPipe( |
@@ -82,12 +82,12 @@ void MediaPipelineHost::SetAvPipe( |
size_t shared_mem_size = shared_mem->requested_size(); |
scoped_ptr<MediaMemoryChunk> shared_memory_chunk( |
- new SharedMemoryChunk(shared_mem.Pass(), shared_mem_size)); |
+ new SharedMemoryChunk(std::move(shared_mem), shared_mem_size)); |
scoped_ptr<MediaMessageFifo> media_message_fifo( |
- new MediaMessageFifo(shared_memory_chunk.Pass(), shared_mem_size)); |
+ new MediaMessageFifo(std::move(shared_memory_chunk), shared_mem_size)); |
media_message_fifo->ObserveReadActivity(pipe_read_activity_cb); |
scoped_ptr<CodedFrameProviderHost> frame_provider_host( |
- new CodedFrameProviderHost(media_message_fifo.Pass())); |
+ new CodedFrameProviderHost(std::move(media_message_fifo))); |
MediaTrackMap::iterator it = media_track_map_.find(track_id); |
MediaTrackHost* media_track_host; |
@@ -101,9 +101,9 @@ void MediaPipelineHost::SetAvPipe( |
media_track_host->pipe_write_cb = frame_provider_host->GetFifoWriteEventCb(); |
if (track_id == kAudioTrackId) { |
- audio_frame_provider_ = frame_provider_host.Pass(); |
+ audio_frame_provider_ = std::move(frame_provider_host); |
} else { |
- video_frame_provider_ = frame_provider_host.Pass(); |
+ video_frame_provider_ = std::move(frame_provider_host); |
} |
av_pipe_set_cb.Run(); |
} |
@@ -115,8 +115,8 @@ void MediaPipelineHost::AudioInitialize( |
const ::media::PipelineStatusCB& status_cb) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
CHECK(track_id == kAudioTrackId); |
- media_pipeline_->InitializeAudio( |
- config, client, audio_frame_provider_.Pass(), status_cb); |
+ media_pipeline_->InitializeAudio(config, client, |
+ std::move(audio_frame_provider_), status_cb); |
} |
void MediaPipelineHost::VideoInitialize( |
@@ -126,8 +126,8 @@ void MediaPipelineHost::VideoInitialize( |
const ::media::PipelineStatusCB& status_cb) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
CHECK(track_id == kVideoTrackId); |
- media_pipeline_->InitializeVideo( |
- configs, client, video_frame_provider_.Pass(), status_cb); |
+ media_pipeline_->InitializeVideo(configs, client, |
+ std::move(video_frame_provider_), status_cb); |
} |
void MediaPipelineHost::StartPlayingFrom(base::TimeDelta time) { |