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

trunk/src/chrome/browser/guestview/webview/webview_guest.cc

 // Copyright 2013 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/guestview/webview/webview_guest.h"
 
 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
 #include "chrome/browser/extensions/extension_renderer_state.h"
 #include "chrome/browser/extensions/script_executor.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
@@ skipping 53 matching lines @@
       NOTREACHED();
       break;
   }
   return std::string();
 }
 
 void RemoveWebViewEventListenersOnIOThread(
     void* profile,
     const std::string& extension_id,
     int embedder_process_id,
-    int view_instance_id) {
+    int embedder_routing_id,
+    int guest_instance_id) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   ExtensionWebRequestEventRouter::GetInstance()->RemoveWebViewEventListeners(
       profile,
       extension_id,
       embedder_process_id,
-      view_instance_id);
+      embedder_routing_id,
+      guest_instance_id);
 }
 
 void AttachWebViewHelpers(WebContents* contents) {
   FaviconTabHelper::CreateForWebContents(contents);
 }
 
 }  // namespace
 
 WebViewGuest::WebViewGuest(WebContents* guest_web_contents)
     : GuestView(guest_web_contents),
@@ skipping 54 matching lines @@
   args->SetString(webview::kSourceId, source_id);
   DispatchEvent(
       new GuestView::Event(webview::kEventConsoleMessage, args.Pass()));
 }
 
 void WebViewGuest::Close() {
   scoped_ptr<DictionaryValue> args(new DictionaryValue());
   DispatchEvent(new GuestView::Event(webview::kEventClose, args.Pass()));
 }
 
-void WebViewGuest::EmbedderDestroyed() {
-  // 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,
-          browser_context(), extension_id(),
-          embedder_render_process_id(),
-          view_instance_id()));
-}
-
 void WebViewGuest::GuestProcessGone(base::TerminationStatus status) {
   scoped_ptr<DictionaryValue> args(new DictionaryValue());
   args->SetInteger(webview::kProcessId,
                    web_contents()->GetRenderProcessHost()->GetID());
   args->SetString(webview::kReason, TerminationStatusToString(status));
   DispatchEvent(
       new GuestView::Event(webview::kEventExit, args.Pass()));
 }
 
 bool WebViewGuest::HandleKeyboardEvent(
@@ skipping 225 matching lines @@
   DispatchEvent(new GuestView::Event(webview::kEventLoadStart, args.Pass()));
 }
 
 void WebViewGuest::DidStopLoading(content::RenderViewHost* render_view_host) {
   scoped_ptr<DictionaryValue> args(new DictionaryValue());
   DispatchEvent(new GuestView::Event(webview::kEventLoadStop, args.Pass()));
 }
 
 void WebViewGuest::WebContentsDestroyed(WebContents* web_contents) {
   RemoveWebViewFromExtensionRendererState(web_contents);
+  // TODO(fsamuel): WebRequest event listeners for <webview> should survive
+  // reparenting of a <webview> within a single embedder. The lifetime of
+  // WebRequest event listeners should be equal to the lifetime of the embedder
+  // WebContents rather than the guest until http://crbug.com/156219 is
+  // resolved.
+  content::BrowserThread::PostTask(
+      content::BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(
+          &RemoveWebViewEventListenersOnIOThread,
+          browser_context(), extension_id(),
+          embedder_render_process_id(),
+          embedder_routing_id(),
+          view_instance_id()));
 }
 
 void WebViewGuest::LoadHandlerCalled() {
   scoped_ptr<DictionaryValue> args(new DictionaryValue());
   DispatchEvent(new GuestView::Event(webview::kEventContentLoad, args.Pass()));
 }
 
 void WebViewGuest::LoadRedirect(const GURL& old_url,
                                 const GURL& new_url,
                                 bool is_top_level) {
   scoped_ptr<DictionaryValue> args(new DictionaryValue());
   args->SetBoolean(guestview::kIsTopLevel, is_top_level);
   args->SetString(webview::kNewURL, new_url.spec());
   args->SetString(webview::kOldURL, old_url.spec());
   DispatchEvent(new GuestView::Event(webview::kEventLoadRedirect, args.Pass()));
 }
 
 void WebViewGuest::AddWebViewToExtensionRendererState() {
   ExtensionRendererState::WebViewInfo webview_info;
   webview_info.embedder_process_id = embedder_render_process_id();
+  webview_info.embedder_routing_id = embedder_web_contents()->GetRoutingID();
   webview_info.instance_id = view_instance_id();
 
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(
           &ExtensionRendererState::AddWebView,
           base::Unretained(ExtensionRendererState::GetInstance()),
           guest_web_contents()->GetRenderProcessHost()->GetID(),
           guest_web_contents()->GetRoutingID(),
           webview_info));
@@ skipping 13 matching lines @@
 
 void WebViewGuest::SizeChanged(const gfx::Size& old_size,
                                const gfx::Size& new_size) {
   scoped_ptr<DictionaryValue> args(new DictionaryValue());
   args->SetInteger(webview::kOldHeight, old_size.height());
   args->SetInteger(webview::kOldWidth, old_size.width());
   args->SetInteger(webview::kNewHeight, new_size.height());
   args->SetInteger(webview::kNewWidth, new_size.width());
   DispatchEvent(new GuestView::Event(webview::kEventSizeChanged, args.Pass()));
 }