From a164f4156567ca3eda7edd6e1cebfe856c0cd1c0 Mon Sep 17 00:00:00 2001 From: "viettrungluu@chromium.org" Date: Sat, 15 Feb 2014 17:39:15 +0000 Subject: Rename base::ScopedPtrAlignedFree to AlignedFreeDeleter. (The new name is consistent with base::FreeDeleter.) Also, update comments to refer to scoped_ptr rather than the deprecated scoped_ptr_malloc, and convert scoped_ptr_malloc<..., ScopedPtrAlignedFree> to scoped_Ptr<..., AlignedFreeDeleter>. R=brettw@chromium.org, dalecurtis@chromium.org, piman@chromium.org, brettw TBR=piman, tyoshino Review URL: https://codereview.chromium.org/167663002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251586 0039d316-1c4b-4281-b951-d872f2087c98 --- media/audio/win/audio_output_win_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'media/audio/win') diff --git a/media/audio/win/audio_output_win_unittest.cc b/media/audio/win/audio_output_win_unittest.cc index 72edad6..1003db0 100644 --- a/media/audio/win/audio_output_win_unittest.cc +++ b/media/audio/win/audio_output_win_unittest.cc @@ -597,7 +597,7 @@ class SyncSocketSource : public AudioOutputStream::AudioSourceCallback { private: base::SyncSocket* socket_; int data_size_; - scoped_ptr_malloc data_; + scoped_ptr data_; scoped_ptr audio_bus_; }; @@ -620,7 +620,7 @@ DWORD __stdcall SyncSocketThread(void* context) { SyncThreadContext& ctx = *(reinterpret_cast(context)); // Setup AudioBus wrapping data we'll pass over the sync socket. - scoped_ptr_malloc data(static_cast( + scoped_ptr data(static_cast( base::AlignedAlloc(ctx.packet_size_bytes, AudioBus::kChannelAlignment))); scoped_ptr audio_bus = AudioBus::WrapMemory( ctx.channels, ctx.frames, data.get()); -- cgit v1.1