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

Unified Diff: chromecast/media/cma/backend/media_pipeline_backend_manager.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
Index: chromecast/media/cma/backend/media_pipeline_backend_manager.cc
diff --git a/chromecast/media/cma/backend/media_pipeline_backend_manager.cc b/chromecast/media/cma/backend/media_pipeline_backend_manager.cc
index 2013384a75c97a28e40f70c430235e3fa2c05137..49227383e414f2b37af46db4d778c4db3cec5e49 100644
--- a/chromecast/media/cma/backend/media_pipeline_backend_manager.cc
+++ b/chromecast/media/cma/backend/media_pipeline_backend_manager.cc
@@ -6,6 +6,7 @@
#include <algorithm>
+#include "base/memory/ptr_util.h"
#include "chromecast/media/cma/backend/media_pipeline_backend_wrapper.h"
#include "chromecast/public/cast_media_shlib.h"
@@ -20,22 +21,23 @@ MediaPipelineBackendManager::MediaPipelineBackendManager(
MediaPipelineBackendManager::~MediaPipelineBackendManager() {
}
-scoped_ptr<MediaPipelineBackend>
+std::unique_ptr<MediaPipelineBackend>
MediaPipelineBackendManager::CreateMediaPipelineBackend(
const media::MediaPipelineDeviceParams& params) {
DCHECK(media_task_runner_->BelongsToCurrentThread());
return CreateMediaPipelineBackend(params, 0);
}
-scoped_ptr<MediaPipelineBackend>
+std::unique_ptr<MediaPipelineBackend>
MediaPipelineBackendManager::CreateMediaPipelineBackend(
const media::MediaPipelineDeviceParams& params,
int stream_type) {
DCHECK(media_task_runner_->BelongsToCurrentThread());
- scoped_ptr<MediaPipelineBackend> backend_ptr(new MediaPipelineBackendWrapper(
- make_scoped_ptr(
- media::CastMediaShlib::CreateMediaPipelineBackend(params)),
- stream_type, GetVolumeMultiplier(stream_type), this));
+ std::unique_ptr<MediaPipelineBackend> backend_ptr(
+ new MediaPipelineBackendWrapper(
+ base::WrapUnique(
+ media::CastMediaShlib::CreateMediaPipelineBackend(params)),
+ stream_type, GetVolumeMultiplier(stream_type), this));
media_pipeline_backends_.push_back(backend_ptr.get());
return backend_ptr;
}

Powered by Google App Engine
This is Rietveld 408576698