diff options
author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 17:39:15 +0000 |
---|---|---|
committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 17:39:15 +0000 |
commit | a164f4156567ca3eda7edd6e1cebfe856c0cd1c0 (patch) | |
tree | c24cd9c5deb837d84965a8b63546579a3d25b911 /media/audio/win | |
parent | fcc7a32ca3feb781af28e23ad9acb20a66008581 (diff) | |
download | chromium_src-a164f4156567ca3eda7edd6e1cebfe856c0cd1c0.zip chromium_src-a164f4156567ca3eda7edd6e1cebfe856c0cd1c0.tar.gz chromium_src-a164f4156567ca3eda7edd6e1cebfe856c0cd1c0.tar.bz2 |
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
Diffstat (limited to 'media/audio/win')
-rw-r--r-- | media/audio/win/audio_output_win_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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<float, base::ScopedPtrAlignedFree> data_; + scoped_ptr<float, base::AlignedFreeDeleter> data_; scoped_ptr<AudioBus> audio_bus_; }; @@ -620,7 +620,7 @@ DWORD __stdcall SyncSocketThread(void* context) { SyncThreadContext& ctx = *(reinterpret_cast<SyncThreadContext*>(context)); // Setup AudioBus wrapping data we'll pass over the sync socket. - scoped_ptr_malloc<float, base::ScopedPtrAlignedFree> data(static_cast<float*>( + scoped_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()); |