media/audio/pulse/pulse_output.h - Issue 1911913002: Convert //media/audio 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: media/audio/pulse/pulse_output.h

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: media/audio/pulse/pulse_output.h

diff --git a/media/audio/pulse/pulse_output.h b/media/audio/pulse/pulse_output.h

index 49f6abf28d1106789ab452cf21bffa65a4d0725c..408c7850b6d89ab0d4e98b538efa51c2dc29a237 100644

--- a/media/audio/pulse/pulse_output.h

+++ b/media/audio/pulse/pulse_output.h

@@ -23,10 +23,10 @@

#include <pulse/pulseaudio.h>

#include <stddef.h>

+#include <memory>

#include <string>

#include "base/macros.h"

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

#include "base/threading/thread_checker.h"

#include "media/audio/audio_io.h"

#include "media/audio/audio_parameters.h"

@@ -111,7 +111,7 @@ class PulseAudioOutputStream : public AudioOutputStream {

AudioSourceCallback* source_callback_;

// Container for retrieving data from AudioSourceCallback::OnMoreData().

- scoped_ptr<AudioBus> audio_bus_;

+ std::unique_ptr<AudioBus> audio_bus_;

base::ThreadChecker thread_checker_;

« media/audio/mock_audio_manager.cc ('K') | « media/audio/null_audio_sink.h ('k') | media/audio/simple_sources.h » ('j') | media/audio/simple_sources.h » ('J')