From 0917ec4328dc20b59887d78f76b9f075e12e5f7f Mon Sep 17 00:00:00 2001 From: dcheng Date: Wed, 18 Nov 2015 23:00:20 -0800 Subject: Use std::default_delete as the default deleter for scoped_ptr. The aim is to make scoped_ptr and std::unique_ptr functionally identical so scoped_ptr can simply be a typedef. BUG=554298 Review URL: https://codereview.chromium.org/1445003002 Cr-Commit-Position: refs/heads/master@{#360539} --- ipc/ipc_channel_proxy.cc | 4 ++-- ipc/mojo/ipc_channel_mojo.cc | 4 +++- ipc/mojo/ipc_message_pipe_reader.h | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'ipc') diff --git a/ipc/ipc_channel_proxy.cc b/ipc/ipc_channel_proxy.cc index 84f87fc..7c4eb7d 100644 --- a/ipc/ipc_channel_proxy.cc +++ b/ipc/ipc_channel_proxy.cc @@ -419,8 +419,8 @@ void ChannelProxy::Init(scoped_ptr factory, context_->CreateChannel(factory.Pass()); } else { context_->ipc_task_runner()->PostTask( - FROM_HERE, base::Bind(&Context::CreateChannel, - context_.get(), Passed(factory.Pass()))); + FROM_HERE, base::Bind(&Context::CreateChannel, context_.get(), + base::Passed(&factory))); } // complete initialization on the background thread diff --git a/ipc/mojo/ipc_channel_mojo.cc b/ipc/mojo/ipc_channel_mojo.cc index 8ae0de5..97330dc 100644 --- a/ipc/mojo/ipc_channel_mojo.cc +++ b/ipc/mojo/ipc_channel_mojo.cc @@ -4,6 +4,8 @@ #include "ipc/mojo/ipc_channel_mojo.h" +#include + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" @@ -361,7 +363,7 @@ namespace { // ClosingDeleter calls |CloseWithErrorIfPending| before deleting the // |MessagePipeReader|. struct ClosingDeleter { - typedef base::DefaultDeleter DefaultType; + typedef std::default_delete DefaultType; void operator()(internal::MessagePipeReader* ptr) const { ptr->CloseWithErrorIfPending(); diff --git a/ipc/mojo/ipc_message_pipe_reader.h b/ipc/mojo/ipc_message_pipe_reader.h index 01e4fff..01baa37 100644 --- a/ipc/mojo/ipc_message_pipe_reader.h +++ b/ipc/mojo/ipc_message_pipe_reader.h @@ -5,6 +5,7 @@ #ifndef IPC_IPC_MESSAGE_PIPE_READER_H_ #define IPC_IPC_MESSAGE_PIPE_READER_H_ +#include #include #include "base/atomicops.h" @@ -49,7 +50,7 @@ class MessagePipeReader { // This is intended to used by MessagePipeReader owners. class DelayedDeleter { public: - typedef base::DefaultDeleter DefaultType; + typedef std::default_delete DefaultType; static void DeleteNow(MessagePipeReader* ptr) { delete ptr; } -- cgit v1.1