media/audio/virtual_audio_input_stream.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/virtual_audio_input_stream.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

« media/audio/sounds/wav_audio_handler.cc ('K') | « media/audio/sounds/wav_audio_handler_unittest.cc ('k') | media/audio/virtual_audio_input_stream_unittest.cc » ('j') | media/audio/virtual_audio_input_stream_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/audio/virtual_audio_input_stream.h

diff --git a/media/audio/virtual_audio_input_stream.h b/media/audio/virtual_audio_input_stream.h

index 28d8804ef3901ceafa52659557cbc3d683e21d53..fc90bcc95243a423febb8fa3d12036f676723034 100644

--- a/media/audio/virtual_audio_input_stream.h

+++ b/media/audio/virtual_audio_input_stream.h

@@ -8,10 +8,10 @@

#include <stdint.h>

#include <map>

+#include <memory>

#include <set>

#include "base/macros.h"

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

#include "base/synchronization/lock.h"

#include "base/threading/thread_checker.h"

#include "media/audio/audio_io.h"

@@ -108,7 +108,7 @@ class MEDIA_EXPORT VirtualAudioInputStream : public AudioInputStream {

// Handles callback timing for consumption of audio data.

FakeAudioWorker fake_worker_;

- scoped_ptr<AudioBus> audio_bus_;

+ std::unique_ptr<AudioBus> audio_bus_;

base::ThreadChecker thread_checker_;