Revert 222090 "<webview>: Cleanup WebRequest event listeners whe..."

trunk/src/content/browser/browser_plugin/browser_plugin_guest.cc

Index: trunk/src/content/browser/browser_plugin/browser_plugin_guest.cc
===================================================================
--- trunk/src/content/browser/browser_plugin/browser_plugin_guest.cc	(revision 222122)
+++ trunk/src/content/browser/browser_plugin/browser_plugin_guest.cc	(working copy)
@@ -319,7 +319,8 @@
   // RenderViewHostObserver:
   virtual void RenderViewHostDestroyed(
       RenderViewHost* render_view_host) OVERRIDE {
-    browser_plugin_guest_->EmbedderDestroyed();
+    browser_plugin_guest_->embedder_web_contents_ = NULL;
+    browser_plugin_guest_->Destroy();
   }
 
  private:
@@ -423,13 +424,6 @@
   return request_id;
 }
 
-void BrowserPluginGuest::EmbedderDestroyed() {
-  embedder_web_contents_ = NULL;
-  if (delegate_)
-    delegate_->EmbedderDestroyed();
-  Destroy();
-}
-
 void BrowserPluginGuest::Destroy() {
   is_in_destruction_ = true;
   if (!attached() && opener())