| Index: chromecast/renderer/media/chromecast_media_renderer_factory.cc
|
| diff --git a/chromecast/renderer/media/chromecast_media_renderer_factory.cc b/chromecast/renderer/media/chromecast_media_renderer_factory.cc
|
| index e14df67cd1f33354ca9c6647af79107d964244fe..817e9d5bdf4381f3aa91288336505cbe8ee7dd60 100644
|
| --- a/chromecast/renderer/media/chromecast_media_renderer_factory.cc
|
| +++ b/chromecast/renderer/media/chromecast_media_renderer_factory.cc
|
| @@ -22,7 +22,8 @@ ChromecastMediaRendererFactory::ChromecastMediaRendererFactory(
|
| ChromecastMediaRendererFactory::~ChromecastMediaRendererFactory() {
|
| }
|
|
|
| -scoped_ptr<::media::Renderer> ChromecastMediaRendererFactory::CreateRenderer(
|
| +std::unique_ptr<::media::Renderer>
|
| +ChromecastMediaRendererFactory::CreateRenderer(
|
| const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
|
| const scoped_refptr<base::TaskRunner>& worker_task_runner,
|
| ::media::AudioRendererSink* audio_renderer_sink,
|
| @@ -30,11 +31,10 @@ scoped_ptr<::media::Renderer> ChromecastMediaRendererFactory::CreateRenderer(
|
| const ::media::RequestSurfaceCB& request_surface_cb) {
|
| // TODO(erickung): crbug.com/443956. Need to provide right LoadType.
|
| LoadType cma_load_type = kLoadTypeMediaSource;
|
| - scoped_ptr<MediaPipelineProxy> cma_media_pipeline(new MediaPipelineProxy(
|
| - render_frame_id_,
|
| - content::RenderThread::Get()->GetIOMessageLoopProxy(),
|
| + std::unique_ptr<MediaPipelineProxy> cma_media_pipeline(new MediaPipelineProxy(
|
| + render_frame_id_, content::RenderThread::Get()->GetIOMessageLoopProxy(),
|
| cma_load_type));
|
| - scoped_ptr<CmaRenderer> cma_renderer(new CmaRenderer(
|
| + std::unique_ptr<CmaRenderer> cma_renderer(new CmaRenderer(
|
| std::move(cma_media_pipeline), video_renderer_sink, gpu_factories_));
|
| return std::move(cma_renderer);
|
| }
|
|
|