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

Unified Diff: chromecast/media/audio/cast_audio_manager_factory.cc

Issue 1911913002: Convert //media/audio from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix cast + windows build 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
Index: chromecast/media/audio/cast_audio_manager_factory.cc
diff --git a/chromecast/media/audio/cast_audio_manager_factory.cc b/chromecast/media/audio/cast_audio_manager_factory.cc
index c6b77940525be6b534dfe58b1a01641585be3e96..3e62411bcee8fa2e9a460c9e2281bdf0c2fb5d7e 100644
--- a/chromecast/media/audio/cast_audio_manager_factory.cc
+++ b/chromecast/media/audio/cast_audio_manager_factory.cc
@@ -17,12 +17,12 @@ CastAudioManagerFactory::CastAudioManagerFactory(
CastAudioManagerFactory::~CastAudioManagerFactory() {}
-scoped_ptr<::media::AudioManager, ::media::AudioManagerDeleter>
+std::unique_ptr<::media::AudioManager, ::media::AudioManagerDeleter>
CastAudioManagerFactory::CreateInstance(
scoped_refptr<base::SingleThreadTaskRunner> task_runner,
scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
::media::AudioLogFactory* audio_log_factory) {
- return scoped_ptr<::media::AudioManager, ::media::AudioManagerDeleter>(
+ return std::unique_ptr<::media::AudioManager, ::media::AudioManagerDeleter>(
danakj 2016/04/22 22:47:35 include memory, or use WrapUnique
dcheng 2016/04/22 23:13:19 Can't use WrapUnique due to the custom deleter. He
danakj 2016/04/22 23:15:16 The algorithm I used in my head is to look where t
new CastAudioManager(std::move(task_runner),
std::move(worker_task_runner), audio_log_factory,
backend_manager_));

Powered by Google App Engine
This is Rietveld 408576698