RefCounted types should not have public destructors, ipc/ edition

ipc/ipc_channel_proxy.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/debug/trace_event.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_message_utils.h"
 
 namespace IPC {
 
-// This helper ensures the message is deleted if the task is deleted without
-// having been run.
-class SendCallbackHelper
-    : public base::RefCountedThreadSafe<SendCallbackHelper> {
- public:
-  SendCallbackHelper(ChannelProxy::Context* context, Message* message)
-      : context_(context),
-        message_(message) {
-  }
-
-  void Send() {
-    context_->OnSendMessage(message_.release());
-  }
-
- private:
-  scoped_refptr<ChannelProxy::Context> context_;
-  scoped_ptr<Message> message_;
-
-  DISALLOW_COPY_AND_ASSIGN(SendCallbackHelper);
-};
-
 //------------------------------------------------------------------------------
 
 ChannelProxy::MessageFilter::MessageFilter() {}
 
-ChannelProxy::MessageFilter::~MessageFilter() {}
-
 void ChannelProxy::MessageFilter::OnFilterAdded(Channel* channel) {}
 
 void ChannelProxy::MessageFilter::OnFilterRemoved() {}
 
 void ChannelProxy::MessageFilter::OnChannelConnected(int32 peer_pid) {}
 
 void ChannelProxy::MessageFilter::OnChannelError() {}
 
 void ChannelProxy::MessageFilter::OnChannelClosing() {}
 
 bool ChannelProxy::MessageFilter::OnMessageReceived(const Message& message) {
   return false;
 }
 
 void ChannelProxy::MessageFilter::OnDestruct() const {
   delete this;
 }
 
+ChannelProxy::MessageFilter::~MessageFilter() {}
+
 //------------------------------------------------------------------------------
 
 ChannelProxy::Context::Context(Channel::Listener* listener,
                                base::MessageLoopProxy* ipc_message_loop)
     : listener_message_loop_(base::MessageLoopProxy::current()),
       listener_(listener),
       ipc_message_loop_(ipc_message_loop),
       channel_connected_called_(false),
       peer_pid_(base::kNullProcessId) {
 }
@@ skipping 107 matching lines @@
   filters_.clear();
 
   channel_.reset();
 
   // Balance with the reference taken during startup.  This may result in
   // self-destruction.
   Release();
 }
 
 // Called on the IPC::Channel thread
-void ChannelProxy::Context::OnSendMessage(Message* message) {
+void ChannelProxy::Context::OnSendMessage(scoped_ptr<Message> message) {
   if (!channel_.get()) {
-    delete message;
     OnChannelClosed();
     return;
   }
-  if (!channel_->Send(message))
+  if (!channel_->Send(message.release()))
     OnChannelError();
 }
 
 // Called on the IPC::Channel thread
 void ChannelProxy::Context::OnAddFilter() {
   std::vector<scoped_refptr<MessageFilter> > new_filters;
   {
     base::AutoLock auto_lock(pending_filters_lock_);
     new_filters.swap(pending_filters_);
   }
@@ skipping 155 matching lines @@
   DCHECK(did_init_);
   if (outgoing_message_filter())
     message = outgoing_message_filter()->Rewrite(message);
 
 #ifdef IPC_MESSAGE_LOG_ENABLED
   Logging::GetInstance()->OnSendMessage(message, context_->channel_id());
 #endif
 
   context_->ipc_message_loop()->PostTask(
       FROM_HERE,
-      base::Bind(&SendCallbackHelper::Send,
-                 new SendCallbackHelper(context_.get(), message)));
+      base::Bind(&ChannelProxy::Context::OnSendMessage,
+                 context_, base::Passed(scoped_ptr<Message>(message))));
   return true;
 }
 
 void ChannelProxy::AddFilter(MessageFilter* filter) {
   context_->AddFilter(filter);
 }
 
 void ChannelProxy::RemoveFilter(MessageFilter* filter) {
   context_->ipc_message_loop()->PostTask(
       FROM_HERE, base::Bind(&Context::OnRemoveFilter, context_.get(),
@@ skipping 25 matching lines @@
   Channel* channel = context_.get()->channel_.get();
   // Channel must have been created first.
   DCHECK(channel) << context_.get()->channel_id_;
   return channel->GetClientEuid(client_euid);
 }
 #endif
 
 //-----------------------------------------------------------------------------
 
 }  // namespace IPC