Revert 115997 - Replace MessageLoop::DeleteSoon implementation with one that uses base::Bind.

content/renderer/webplugin_delegate_proxy.h

 // Copyright (c) 2011 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.
 
 #ifndef CONTENT_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_
 #define CONTENT_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/message_loop_helpers.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_message.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/surface/transport_dib.h"
 #include "webkit/plugins/npapi/webplugin_delegate.h"
 #include "webkit/plugins/webplugininfo.h"
 
 #if defined(OS_MACOSX)
@@ skipping 100 matching lines @@
   virtual void DidFinishManualLoading() OVERRIDE;
   virtual void DidManualLoadFail() OVERRIDE;
   virtual webkit::npapi::WebPluginResourceClient* CreateResourceClient(
       unsigned long resource_id, const GURL& url, int notify_id) OVERRIDE;
   virtual webkit::npapi::WebPluginResourceClient* CreateSeekableResourceClient(
       unsigned long resource_id, int range_request_id) OVERRIDE;
 
   gfx::PluginWindowHandle GetPluginWindowHandle();
 
  protected:
-  friend class base::DeleteHelper<WebPluginDelegateProxy>;
+  template<class WebPluginDelegateProxy> friend class DeleteTask;
   virtual ~WebPluginDelegateProxy();
 
  private:
   struct SharedBitmap {
     SharedBitmap();
     ~SharedBitmap();
 
     scoped_ptr<TransportDIB> dib;
     scoped_ptr<skia::PlatformCanvas> canvas;
   };
@@ skipping 175 matching lines @@
   // back-buffer.
   gfx::Rect front_buffer_diff_;
 
   // The url of the main frame hosting the plugin.
   GURL page_url_;
 
   DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateProxy);
 };
 
 #endif  // CONTENT_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_