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

trunk/src/chrome/browser/guestview/guestview.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/guestview.h"
 
 #include "base/lazy_instance.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/guestview/guestview_constants.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 25 matching lines @@
 }
 
 scoped_ptr<DictionaryValue> GuestView::Event::GetArguments() {
   return args_.Pass();
 }
 
 GuestView::GuestView(WebContents* guest_web_contents)
     : guest_web_contents_(guest_web_contents),
       embedder_web_contents_(NULL),
       embedder_render_process_id_(0),
+      embedder_routing_id_(MSG_ROUTING_NONE),
       browser_context_(guest_web_contents->GetBrowserContext()),
       guest_instance_id_(guest_web_contents->GetEmbeddedInstanceID()),
       view_instance_id_(guestview::kInstanceIDNone) {
   webcontents_guestview_map.Get().insert(
       std::make_pair(guest_web_contents, this));
 }
 
 // static
 GuestView* GuestView::FromWebContents(WebContents* web_contents) {
   WebContentsGuestViewMap* guest_map = webcontents_guestview_map.Pointer();
   WebContentsGuestViewMap::iterator it = guest_map->find(web_contents);
   return it == guest_map->end() ? NULL : it->second;
 }
 
 // static
 GuestView* GuestView::From(int embedder_process_id, int guest_instance_id) {
   EmbedderGuestViewMap* guest_map = embedder_guestview_map.Pointer();
   EmbedderGuestViewMap::iterator it = guest_map->find(
       std::make_pair(embedder_process_id, guest_instance_id));
   return it == guest_map->end() ? NULL : it->second;
 }
 
 void GuestView::Attach(content::WebContents* embedder_web_contents,
                        const std::string& extension_id,
                        const base::DictionaryValue& args) {
   embedder_web_contents_ = embedder_web_contents;
   embedder_render_process_id_ =
       embedder_web_contents->GetRenderProcessHost()->GetID();
+  embedder_routing_id_ = embedder_web_contents->GetRoutingID();
   extension_id_ = extension_id;
   args.GetInteger(guestview::kParameterInstanceId, &view_instance_id_);
 
   std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_);
   embedder_guestview_map.Get().insert(std::make_pair(key, this));
 
   // GuestView::Attach is called prior to initialization (and initial
   // navigation) of the guest in the content layer in order to permit mapping
   // the necessary associations between the <*view> element and its guest. This
   // is needed by the <webview> WebRequest API to allow intercepting resource
@@ skipping 55 matching lines @@
 void GuestView::SendQueuedEvents() {
   if (!attached())
     return;
 
   while (!pending_events_.empty()) {
     Event* event = pending_events_.front();
     pending_events_.pop();
     DispatchEvent(event);
   }
 }