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

Index: chromecast/media/cma/backend/alsa/stream_mixer_alsa.cc

diff --git a/chromecast/media/cma/backend/alsa/stream_mixer_alsa.cc b/chromecast/media/cma/backend/alsa/stream_mixer_alsa.cc

index 4aa0c06633ef521f306bf8bee524780003a3eb24..9ee6a3b368349ceefe5f055b850e60d736d71a25 100644

--- a/chromecast/media/cma/backend/alsa/stream_mixer_alsa.cc

+++ b/chromecast/media/cma/backend/alsa/stream_mixer_alsa.cc

@@ -546,7 +546,7 @@ void StreamMixerAlsa::SignalError() {

}

void StreamMixerAlsa::SetAlsaWrapperForTest(

- scoped_ptr<AlsaWrapper> alsa_wrapper) {

+ std::unique_ptr<AlsaWrapper> alsa_wrapper) {

if (alsa_) {

Stop();

ClosePcm();

@@ -564,7 +564,7 @@ void StreamMixerAlsa::ClearInputsForTest() {

inputs_.clear();

}

-void StreamMixerAlsa::AddInput(scoped_ptr<InputQueue> input) {

+void StreamMixerAlsa::AddInput(std::unique_ptr<InputQueue> input) {

RUN_ON_MIXER_THREAD(&StreamMixerAlsa::AddInput,

base::Passed(std::move(input)));

if (!alsa_)