Use ChromeThread::DeleteOnIOThread in a few places where an object must be de...

chrome/browser/renderer_host/buffered_resource_handler.cc

 // Copyright (c) 2009 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 "chrome/browser/renderer_host/buffered_resource_handler.h"
 
 #include <vector>
 
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/string_util.h"
-#include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/renderer_host/download_throttling_resource_handler.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "chrome/browser/renderer_host/x509_user_cert_resource_handler.h"
 #include "chrome/common/url_constants.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mime_sniffer.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
@@ skipping 366 matching lines @@
   bool need_plugin_list;
   if (!ShouldDownload(&need_plugin_list) || !need_plugin_list)
     return false;
 
   // We don't want to keep buffering as our buffer will fill up.
   ResourceDispatcherHostRequestInfo* info =
       ResourceDispatcherHost::InfoForRequest(request_);
   host_->PauseRequest(info->child_id(), info->request_id(), true);
 
   // Schedule plugin loading on the file thread.
-  // Note: it's possible that the only reference to this object is the task.  If
-  // If the task executes on the file thread, and before it returns, the task it
-  // posts to the IO thread runs, then this object will get destructed on the
-  // file thread.  This breaks assumptions in other message handlers (i.e. when
-  // unregistering with NotificationService in the destructor).
-  AddRef();
   ChromeThread::PostTask(
       ChromeThread::FILE, FROM_HERE,
-      NewRunnableFunction(&BufferedResourceHandler::LoadPlugins, this));
+      NewRunnableMethod(this, &BufferedResourceHandler::LoadPlugins));
   return true;
 }
 
 // This test mirrors the decision that WebKit makes in
 // WebFrameLoaderClient::dispatchDecidePolicyForMIMEType.
 bool BufferedResourceHandler::ShouldDownload(bool* need_plugin_list) {
   if (need_plugin_list)
     *need_plugin_list = false;
   std::string type = StringToLowerASCII(response_->response_head.mime_type);
   std::string disposition;
@@ skipping 43 matching lines @@
     DCHECK(NPAPI::PluginList::Singleton()->PluginsLoaded());
   }
 
   // Finally, check the plugin list.
   WebPluginInfo info;
   bool allow_wildcard = false;
   return !NPAPI::PluginList::Singleton()->GetPluginInfo(
       GURL(), type, allow_wildcard, &info, NULL);
 }
 
-void BufferedResourceHandler::LoadPlugins(BufferedResourceHandler* handler) {
+void BufferedResourceHandler::LoadPlugins() {
   std::vector<WebPluginInfo> plugins;
   NPAPI::PluginList::Singleton()->GetPlugins(false, &plugins);
 
   ChromeThread::PostTask(
       ChromeThread::IO, FROM_HERE,
-      NewRunnableFunction(&BufferedResourceHandler::OnPluginsLoaded,
-          handler));
+      NewRunnableMethod(this, &BufferedResourceHandler::OnPluginsLoaded));
 }
 
-void BufferedResourceHandler::OnPluginsLoaded(
-    BufferedResourceHandler* handler) {
-  handler->wait_for_plugins_ = false;
-  if (handler->request_) {
-    ResourceDispatcherHostRequestInfo* info =
-        ResourceDispatcherHost::InfoForRequest(handler->request_);
-    handler->host_->PauseRequest(info->child_id(), info->request_id(), false);
-    if (!handler->CompleteResponseStarted(info->request_id(), false))
-      handler->host_->CancelRequest(
-          info->child_id(), info->request_id(), false);
-  }
-  handler->Release();
+void BufferedResourceHandler::OnPluginsLoaded() {
+  wait_for_plugins_ = false;
+  if (!request_)
+    return;
+
+  ResourceDispatcherHostRequestInfo* info =
+      ResourceDispatcherHost::InfoForRequest(request_);
+  host_->PauseRequest(info->child_id(), info->request_id(), false);
+  if (!CompleteResponseStarted(info->request_id(), false))
+    host_->CancelRequest(info->child_id(), info->request_id(), false);
 }