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

trunk/src/content/browser/browser_plugin/browser_plugin_guest.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 "content/browser/browser_plugin/browser_plugin_guest.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 301 matching lines @@
           guest->embedder_web_contents()->GetRenderViewHost()),
         browser_plugin_guest_(guest) {
   }
 
   virtual ~EmbedderRenderViewHostObserver() {
   }
 
   // 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:
   BrowserPluginGuest* browser_plugin_guest_;
 
   DISALLOW_COPY_AND_ASSIGN(EmbedderRenderViewHostObserver);
 };
 
 BrowserPluginGuest::BrowserPluginGuest(
     int instance_id,
@@ skipping 83 matching lines @@
                   AsWeakPtr(),
                   request_id);
   // If BrowserPluginGuestDelegate hasn't handled the permission then we simply
   // reject it immediately.
   if (!delegate_->RequestPermission(permission_type, request_info, callback))
     callback.Run(false, "");
 
   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())
     opener()->pending_new_windows_.erase(this);
   DestroyUnattachedWindows();
   GetWebContents()->GetBrowserPluginGuestManager()->RemoveGuest(instance_id_);
   delete GetWebContents();
 }
 
 bool BrowserPluginGuest::OnMessageReceivedFromEmbedder(
@@ skipping 1250 matching lines @@
   request_info.Set(browser_plugin::kRequestMethod,
                    base::Value::CreateStringValue(request_method));
   request_info.Set(browser_plugin::kURL, base::Value::CreateStringValue(url));
 
   RequestPermission(BROWSER_PLUGIN_PERMISSION_TYPE_DOWNLOAD,
                     new DownloadRequest(callback),
                     request_info);
 }
 
 }  // namespace content