Fix memory leak in IPC::ChannelProxy

ipc/ipc_channel_proxy.cc

 // Copyright (c) 2006-2008 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/message_loop.h"
 #include "base/thread.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_message_utils.h"
 
 namespace IPC {
 
-//-----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+
+// This task ensures the message is deleted if the task is deleted without
+// having been run.
+class SendTask : public Task {
+ public:
+  SendTask(ChannelProxy::Context* context, Message* message)
+      : context_(context),
+        message_(message) {
+  }
+
+  virtual void Run() {
+    context_->OnSendMessage(message_.release());
+  }
+
+ private:
+  scoped_refptr<ChannelProxy::Context> context_;
+  scoped_ptr<Message> message_;
+
+  DISALLOW_COPY_AND_ASSIGN(SendTask);
+};
+
+//------------------------------------------------------------------------------
 
 ChannelProxy::Context::Context(Channel::Listener* listener,
                                MessageFilter* filter,
                                MessageLoop* ipc_message_loop)
     : listener_message_loop_(MessageLoop::current()),
       listener_(listener),
       ipc_message_loop_(ipc_message_loop),
       channel_(NULL),
       peer_pid_(0),
       channel_connected_called_(false) {
@@ skipping 223 matching lines @@
     context_->ipc_message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
         context_.get(), &Context::OnChannelClosed));
   }
 }
 
 bool ChannelProxy::Send(Message* message) {
 #ifdef IPC_MESSAGE_LOG_ENABLED
   Logging::current()->OnSendMessage(message, context_->channel_id());
 #endif
 
-  context_->ipc_message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
-      context_.get(), &Context::OnSendMessage, message));
+  context_->ipc_message_loop()->PostTask(FROM_HERE,
+                                         new SendTask(context_.get(), message));
   return true;
 }
 
 void ChannelProxy::AddFilter(MessageFilter* filter) {
   // We want to addref the filter to prevent it from
   // being destroyed before the OnAddFilter call is invoked.
   filter->AddRef();
   context_->ipc_message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
       context_.get(), &Context::OnAddFilter, filter));
 }
@@ skipping 14 matching lines @@
 int ChannelProxy::GetClientFileDescriptor() const {
   Channel *channel = context_.get()->channel_;
   DCHECK(channel); // Channel must have been created first.
   return channel->GetClientFileDescriptor();
 }
 #endif
 
 //-----------------------------------------------------------------------------
 
 }  // namespace IPC