summaryrefslogtreecommitdiffstats
path: root/mojo
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-15 17:39:15 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-15 17:39:15 +0000
commita164f4156567ca3eda7edd6e1cebfe856c0cd1c0 (patch)
treec24cd9c5deb837d84965a8b63546579a3d25b911 /mojo
parentfcc7a32ca3feb781af28e23ad9acb20a66008581 (diff)
downloadchromium_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 'mojo')
-rw-r--r--mojo/system/local_data_pipe.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/mojo/system/local_data_pipe.h b/mojo/system/local_data_pipe.h
index 97d108e..973ab68 100644
--- a/mojo/system/local_data_pipe.h
+++ b/mojo/system/local_data_pipe.h
@@ -70,7 +70,7 @@ class MOJO_SYSTEM_IMPL_EXPORT LocalDataPipe : public DataPipe {
void MarkDataAsConsumedNoLock(size_t num_bytes);
// The members below are protected by |DataPipe|'s |lock_|:
- scoped_ptr_malloc<char, base::ScopedPtrAlignedFree> buffer_;
+ scoped_ptr<char, base::AlignedFreeDeleter> buffer_;
// Circular buffer.
size_t start_index_;
size_t current_num_bytes_;