Revert "Allow declarative webrequest and webrequest in extensions."

chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc

 // Copyright 2014 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/guest_view/web_view/chrome_web_view_guest_delegate.h"
 
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
 #include "chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h"
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/common/chrome_version_info.h"
 #include "components/pdf/browser/pdf_web_contents_helper.h"
 #include "components/renderer_context_menu/context_menu_delegate.h"
 #include "content/public/common/page_zoom.h"
 #include "extensions/browser/api/web_request/web_request_api.h"
 #include "extensions/browser/guest_view/web_view/web_view_constants.h"
 
 #if defined(ENABLE_PRINTING)
 #if defined(ENABLE_FULL_PRINTING)
 #include "chrome/browser/printing/print_preview_message_handler.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #else
 #include "chrome/browser/printing/print_view_manager_basic.h"
 #endif  // defined(ENABLE_FULL_PRINTING)
 #endif  // defined(ENABLE_PRINTING)
 
+void RemoveWebViewEventListenersOnIOThread(
+    void* profile,
+    const std::string& extension_id,
+    int embedder_process_id,
+    int view_instance_id) {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  ExtensionWebRequestEventRouter::GetInstance()->RemoveWebViewEventListeners(
+      profile,
+      extension_id,
+      embedder_process_id,
+      view_instance_id);
+}
+
 ChromeWebViewGuestDelegate::ChromeWebViewGuestDelegate(
     extensions::WebViewGuest* web_view_guest)
     : pending_context_menu_request_id_(0),
       chromevox_injected_(false),
       current_zoom_factor_(1.0),
       web_view_guest_(web_view_guest) {
 }
 
 ChromeWebViewGuestDelegate::~ChromeWebViewGuestDelegate() {
 }
@@ skipping 45 matching lines @@
 #else
   printing::PrintViewManagerBasic::CreateForWebContents(contents);
 #endif  // defined(ENABLE_FULL_PRINTING)
 #endif  // defined(ENABLE_PRINTING)
   pdf::PDFWebContentsHelper::CreateForWebContentsWithClient(
       contents,
       scoped_ptr<pdf::PDFWebContentsHelperClient>(
           new ChromePDFWebContentsHelperClient()));
 }
 
+void ChromeWebViewGuestDelegate::OnEmbedderDestroyed() {
+  // TODO(fsamuel): WebRequest event listeners for <webview> should survive
+  // reparenting of a <webview> within a single embedder. Right now, we keep
+  // around the browser state for the listener for the lifetime of the embedder.
+  // Ideally, the lifetime of the listeners should match the lifetime of the
+  // <webview> DOM node. Once http://crbug.com/156219 is resolved we can move
+  // the call to RemoveWebViewEventListenersOnIOThread back to
+  // WebViewGuest::WebContentsDestroyed.
+  content::BrowserThread::PostTask(
+      content::BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(
+          &RemoveWebViewEventListenersOnIOThread,
+          web_view_guest()->browser_context(),
+          web_view_guest()->embedder_extension_id(),
+          web_view_guest()->embedder_render_process_id(),
+          web_view_guest()->view_instance_id()));
+}
+
 void ChromeWebViewGuestDelegate::OnDidAttachToEmbedder() {
   // TODO(fsamuel): This code should be implemented in GuestViewBase once the
   // ZoomController moves to the extensions module.
   ZoomController* zoom_controller = ZoomController::FromWebContents(
       web_view_guest()->embedder_web_contents());
   if (!zoom_controller)
     return;
   // Listen to the embedder's zoom changes.
   zoom_controller->AddObserver(this);
   // Set the guest's initial zoom level to be equal to the embedder's.
@@ skipping 115 matching lines @@
       chromevox_injected_ = false;
   }
 }
 #endif
 
 void ChromeWebViewGuestDelegate::OnZoomChanged(
     const ZoomController::ZoomChangedEventData& data) {
   ZoomController::FromWebContents(guest_web_contents())->
       SetZoomLevel(data.new_zoom_level);
 }