Pepper: always delete ResourceMessageFilter objects on the creation thread.

ppapi/host/resource_message_filter.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 "ppapi/host/resource_message_filter.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/task_runner.h"
 #include "ipc/ipc_message.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/host/resource_host.h"
 
 namespace ppapi {
 namespace host {
 
+namespace internal {
+
+// static
+void ResourceMessageFilterDeleteTraits::Destruct(
+    const ResourceMessageFilter* filter) {
+  filter->InternalDestruct();
+}
+
+}  // namespace internal
+
 ResourceMessageFilter::ResourceMessageFilter()
-    : reply_thread_message_loop_proxy_(
+    : deletion_message_loop_proxy_(
           base::MessageLoop::current()->message_loop_proxy()),
-      resource_host_(NULL) {}
+      reply_thread_message_loop_proxy_(
+          base::MessageLoop::current()->message_loop_proxy()),
+      resource_host_(NULL) {
+}
 
 ResourceMessageFilter::ResourceMessageFilter(
     scoped_refptr<base::MessageLoopProxy> reply_thread_message_loop_proxy)
-    : reply_thread_message_loop_proxy_(reply_thread_message_loop_proxy),
+    : deletion_message_loop_proxy_(
+          base::MessageLoop::current()->message_loop_proxy()),
+      reply_thread_message_loop_proxy_(reply_thread_message_loop_proxy),
       resource_host_(NULL) {
 }
 
 ResourceMessageFilter::~ResourceMessageFilter() {
 }
 
 void ResourceMessageFilter::OnFilterAdded(ResourceHost* resource_host) {
   resource_host_ = resource_host;
 }
 
@@ skipping 35 matching lines @@
 scoped_refptr<base::TaskRunner>
 ResourceMessageFilter::OverrideTaskRunnerForMessage(const IPC::Message& msg) {
   return NULL;
 }
 
 void ResourceMessageFilter::DispatchMessage(const IPC::Message& msg,
                                             HostMessageContext context) {
   RunMessageHandlerAndReply(msg, &context);
 }
 
+void ResourceMessageFilter::InternalDestruct() const {
+  if (!deletion_message_loop_proxy_->BelongsToCurrentThread()) {
+    // During shutdown the object may not be deleted, but it should be okay to
+    // leak in that case.
+    deletion_message_loop_proxy_->DeleteSoon(FROM_HERE, this);
+  } else {
+    delete this;
+  }
+}
+
 }  // namespace host
 }  // namespace ppapi