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

Unified Diff: media/audio/win/audio_output_win_unittest.cc

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: . 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 | « media/audio/win/audio_manager_win.cc ('k') | media/audio/win/core_audio_util_win_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/win/audio_output_win_unittest.cc
diff --git a/media/audio/win/audio_output_win_unittest.cc b/media/audio/win/audio_output_win_unittest.cc
index 8fca2f5509d0a5ad69b7d4619b14a70ed908fe96..55304c98de6f068b6fce5a3ad6989a99695d4e9f 100644
--- a/media/audio/win/audio_output_win_unittest.cc
+++ b/media/audio/win/audio_output_win_unittest.cc
@@ -7,6 +7,8 @@
#include <stddef.h>
#include <stdint.h>
+#include <memory>
+
#include "base/base_paths.h"
#include "base/memory/aligned_memory.h"
#include "base/message_loop/message_loop.h"
@@ -549,8 +551,8 @@ class SyncSocketSource : public AudioOutputStream::AudioSourceCallback {
private:
base::SyncSocket* socket_;
int data_size_;
- scoped_ptr<float, base::AlignedFreeDeleter> data_;
- scoped_ptr<AudioBus> audio_bus_;
+ std::unique_ptr<float, base::AlignedFreeDeleter> data_;
+ std::unique_ptr<AudioBus> audio_bus_;
};
struct SyncThreadContext {
@@ -572,10 +574,10 @@ DWORD __stdcall SyncSocketThread(void* context) {
SyncThreadContext& ctx = *(reinterpret_cast<SyncThreadContext*>(context));
// Setup AudioBus wrapping data we'll pass over the sync socket.
- scoped_ptr<float, base::AlignedFreeDeleter> data(static_cast<float*>(
+ std::unique_ptr<float, base::AlignedFreeDeleter> data(static_cast<float*>(
base::AlignedAlloc(ctx.packet_size_bytes, AudioBus::kChannelAlignment)));
- scoped_ptr<AudioBus> audio_bus = AudioBus::WrapMemory(
- ctx.channels, ctx.frames, data.get());
+ std::unique_ptr<AudioBus> audio_bus =
+ AudioBus::WrapMemory(ctx.channels, ctx.frames, data.get());
SineWaveAudioSource sine(1, ctx.sine_freq, ctx.sample_rate);
const int kTwoSecFrames = ctx.sample_rate * 2;
« no previous file with comments | « media/audio/win/audio_manager_win.cc ('k') | media/audio/win/core_audio_util_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698