chromecast/media/cma/backend/alsa/stream_mixer_alsa_input_impl.h - Issue 1875623002: Convert //chromecast from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromecast/media/cma/backend/alsa/stream_mixer_alsa_input_impl.h

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/media/cma/backend/alsa/stream_mixer_alsa_input.cc ('k') | chromecast/media/cma/backend/alsa/stream_mixer_alsa_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromecast/media/cma/backend/alsa/stream_mixer_alsa_input_impl.h

diff --git a/chromecast/media/cma/backend/alsa/stream_mixer_alsa_input_impl.h b/chromecast/media/cma/backend/alsa/stream_mixer_alsa_input_impl.h

index f31e1fa9d980bf4e8a44217fe0b7f6939bdede4a..882e2ffaa9e7edb888c4fedf63e6afd35ac4dddf 100644

--- a/chromecast/media/cma/backend/alsa/stream_mixer_alsa_input_impl.h

+++ b/chromecast/media/cma/backend/alsa/stream_mixer_alsa_input_impl.h

@@ -6,10 +6,10 @@

#define CHROMECAST_MEDIA_CMA_BACKEND_ALSA_STREAM_MIXER_ALSA_INPUT_IMPL_H_

#include <deque>

+#include <memory>

#include "base/macros.h"

#include "base/memory/ref_counted.h"

-#include "base/memory/scoped_ptr.h"

#include "base/memory/weak_ptr.h"

#include "base/synchronization/lock.h"

#include "chromecast/media/cma/backend/alsa/media_pipeline_backend_alsa.h"

@@ -164,7 +164,7 @@ class StreamMixerAlsaInputImpl : public StreamMixerAlsa::InputQueue {

OnReadyToDeleteCb delete_cb_;

- scoped_ptr<::media::MultiChannelResampler> resampler_;

+ std::unique_ptr<::media::MultiChannelResampler> resampler_;

base::WeakPtr<StreamMixerAlsaInputImpl> weak_this_;

base::WeakPtrFactory<StreamMixerAlsaInputImpl> weak_factory_;