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 /net/websockets | |
| 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 'net/websockets')
| -rw-r--r-- | net/websockets/websocket_frame_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/websockets/websocket_frame_test.cc b/net/websockets/websocket_frame_test.cc index 97fac03..cd6567f 100644 --- a/net/websockets/websocket_frame_test.cc +++ b/net/websockets/websocket_frame_test.cc @@ -308,7 +308,7 @@ TEST(WebSocketFrameTest, MaskPayloadAlignment) { }; COMPILE_ASSERT(arraysize(kTestInput) == arraysize(kTestOutput), output_and_input_arrays_have_the_same_length); - scoped_ptr_malloc<char, base::ScopedPtrAlignedFree> scratch( + scoped_ptr<char, base::AlignedFreeDeleter> scratch( static_cast<char*>( base::AlignedAlloc(kScratchBufferSize, kMaxVectorAlignment))); WebSocketMaskingKey masking_key; |