| 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 34209da6fa6f31abaa12063b1539c48c9f41b18e..3e5aa17d7c9547fc69e07aa4614c3d4b0a0c1b85 100644
|
| --- a/chromecast/browser/media/media_pipeline_host.cc
|
| +++ b/chromecast/browser/media/media_pipeline_host.cc
|
| @@ -50,7 +50,7 @@ MediaPipelineHost::~MediaPipelineHost() {
|
|
|
| for (MediaTrackMap::iterator it = media_track_map_.begin();
|
| it != media_track_map_.end(); ++it) {
|
| - scoped_ptr<MediaTrackHost> media_track(it->second);
|
| + std::unique_ptr<MediaTrackHost> media_track(it->second);
|
| }
|
| media_track_map_.clear();
|
| }
|
| @@ -75,19 +75,19 @@ void MediaPipelineHost::Initialize(
|
|
|
| void MediaPipelineHost::SetAvPipe(
|
| TrackId track_id,
|
| - scoped_ptr<base::SharedMemory> shared_mem,
|
| + std::unique_ptr<base::SharedMemory> shared_mem,
|
| const base::Closure& pipe_read_activity_cb,
|
| const base::Closure& av_pipe_set_cb) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| CHECK(track_id == kAudioTrackId || track_id == kVideoTrackId);
|
|
|
| size_t shared_mem_size = shared_mem->requested_size();
|
| - scoped_ptr<MediaMemoryChunk> shared_memory_chunk(
|
| + std::unique_ptr<MediaMemoryChunk> shared_memory_chunk(
|
| new SharedMemoryChunk(std::move(shared_mem), shared_mem_size));
|
| - scoped_ptr<MediaMessageFifo> media_message_fifo(
|
| + std::unique_ptr<MediaMessageFifo> media_message_fifo(
|
| new MediaMessageFifo(std::move(shared_memory_chunk), shared_mem_size));
|
| media_message_fifo->ObserveReadActivity(pipe_read_activity_cb);
|
| - scoped_ptr<CodedFrameProviderHost> frame_provider_host(
|
| + std::unique_ptr<CodedFrameProviderHost> frame_provider_host(
|
| new CodedFrameProviderHost(std::move(media_message_fifo)));
|
|
|
| MediaTrackMap::iterator it = media_track_map_.find(track_id);
|
|
|