Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5156)

Unified Diff: chromecast/browser/media/cast_mojo_media_client.cc

Issue 1875623002: Convert //chromecast from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromecast/browser/media/cast_mojo_media_client.h ('k') | chromecast/browser/media/cast_renderer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/browser/media/cast_mojo_media_client.cc
diff --git a/chromecast/browser/media/cast_mojo_media_client.cc b/chromecast/browser/media/cast_mojo_media_client.cc
index 0f97694f0c512ef23ce72c872edff079ee40bf4e..19a6921407f7d13df8f42b61ad85e2c2a2417c3c 100644
--- a/chromecast/browser/media/cast_mojo_media_client.cc
+++ b/chromecast/browser/media/cast_mojo_media_client.cc
@@ -4,6 +4,7 @@
#include "chromecast/browser/media/cast_mojo_media_client.h"
+#include "base/memory/ptr_util.h"
#include "chromecast/browser/media/cast_renderer.h"
namespace {
@@ -15,14 +16,14 @@ class CastRendererFactory : public media::RendererFactory {
: create_backend_cb_(create_backend_cb), media_log_(media_log) {}
~CastRendererFactory() final {}
- scoped_ptr<media::Renderer> CreateRenderer(
+ std::unique_ptr<media::Renderer> CreateRenderer(
const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
const scoped_refptr<base::TaskRunner>& worker_task_runner,
media::AudioRendererSink* audio_renderer_sink,
media::VideoRendererSink* video_renderer_sink,
const media::RequestSurfaceCB& request_surface_cb) final {
DCHECK(!audio_renderer_sink && !video_renderer_sink);
- return make_scoped_ptr(new chromecast::media::CastRenderer(
+ return base::WrapUnique(new chromecast::media::CastRenderer(
create_backend_cb_, media_task_runner));
}
@@ -42,9 +43,10 @@ CastMojoMediaClient::CastMojoMediaClient(
CastMojoMediaClient::~CastMojoMediaClient() {}
-scoped_ptr<::media::RendererFactory> CastMojoMediaClient::CreateRendererFactory(
+std::unique_ptr<::media::RendererFactory>
+CastMojoMediaClient::CreateRendererFactory(
const scoped_refptr<::media::MediaLog>& media_log) {
- return make_scoped_ptr(
+ return base::WrapUnique(
new CastRendererFactory(create_backend_cb_, media_log));
}
« no previous file with comments | « chromecast/browser/media/cast_mojo_media_client.h ('k') | chromecast/browser/media/cast_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698