GuestView: Fix message routing across embedder navigations

extensions/browser/guest_view/guest_view_manager.h

 // 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.
 
 #ifndef EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_MANAGER_H_
 #define EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_MANAGER_H_
 
 #include <map>
 
 #include "base/gtest_prod_util.h"
@@ skipping 39 matching lines @@
   // If the embedder is not allowed access, the embedder will be killed, and
   // this method will return NULL. If no WebContents exists with the given
   // instance ID, then NULL will also be returned.
   content::WebContents* GetGuestByInstanceIDSafely(
       int guest_instance_id,
       int embedder_render_process_id);
 
   // Associates the Browser Plugin with |element_instance_id| to a
   // guest that has ID of |guest_instance_id| and sets initialization
   // parameters, |params| for it.
-  void AttachGuest(int embedder_render_process_id,
-                   int embedder_routing_id,
+  void AttachGuest(int embedder_process_id,
                    int element_instance_id,
                    int guest_instance_id,
                    const base::DictionaryValue& attach_params);
 
   // Removes the association between |element_instance_id| and a guest instance
   // ID if one exists.
-  void DetachGuest(GuestViewBase* guest, int element_instance_id);
+  void DetachGuest(GuestViewBase* guest);
 
   int GetNextInstanceID();
   int GetGuestInstanceIDForElementID(
-      content::WebContents* owner_web_contents,
+      int owner_process_id,
       int element_instance_id);
 
   using WebContentsCreatedCallback =
       base::Callback<void(content::WebContents*)>;
   void CreateGuest(const std::string& view_type,
                    content::WebContents* owner_web_contents,
                    const base::DictionaryValue& create_params,
                    const WebContentsCreatedCallback& callback);
 
   content::WebContents* CreateGuestWithWebContentsParams(
       const std::string& view_type,
       content::WebContents* owner_web_contents,
       const content::WebContents::CreateParams& create_params);
 
   content::SiteInstance* GetGuestSiteInstance(
       const GURL& guest_site);
 
   // BrowserPluginGuestManager implementation.
   content::WebContents* GetGuestByInstanceID(
-      content::WebContents* owner_web_contents,
+      int owner_process_id,
       int element_instance_id) override;
   bool ForEachGuest(content::WebContents* owner_web_contents,
                     const GuestCallback& callback) override;
 
  protected:
   friend class GuestViewBase;
   FRIEND_TEST_ALL_PREFIXES(GuestViewManagerTest, AddRemove);
 
   // Can be overriden in tests.
   virtual void AddGuest(int guest_instance_id,
@@ skipping 18 matching lines @@
   bool CanUseGuestInstanceID(int guest_instance_id);
 
   // Static factory instance (always NULL for non-test).
   static GuestViewManagerFactory* factory_;
 
   // Contains guests' WebContents, mapping from their instance ids.
   using GuestInstanceMap = std::map<int, content::WebContents*>;
   GuestInstanceMap guest_web_contents_by_instance_id_;
 
   struct ElementInstanceKey {
-    content::WebContents* owner_web_contents;
+    int embedder_process_id;
     int element_instance_id;
 
     ElementInstanceKey()
-        : owner_web_contents(nullptr),
+        : embedder_process_id(0),

[lazyboy, 2015/02/12 17:41:32]

0 should really be content::ChildProcessHost::kInvalidUniqueID (which is -1)

[Fady Samuel, 2015/02/12 19:00:54]

Done + moved implementation to cc file.

           element_instance_id(0) {}
 
-    ElementInstanceKey(content::WebContents* owner_web_contents,
+    ElementInstanceKey(int embedder_process_id,
                        int element_instance_id)
-        : owner_web_contents(owner_web_contents),
+        : embedder_process_id(embedder_process_id),
           element_instance_id(element_instance_id) {}
 
     bool operator<(const ElementInstanceKey& other) const {
-      if (owner_web_contents != other.owner_web_contents)
-        return owner_web_contents < other.owner_web_contents;
+      if (embedder_process_id != other.embedder_process_id)
+        return embedder_process_id < other.embedder_process_id;
+
       return element_instance_id < other.element_instance_id;
     }
 
     bool operator==(const ElementInstanceKey& other) const {
-      return (owner_web_contents == other.owner_web_contents) &&
+      return (embedder_process_id == other.embedder_process_id) &&
           (element_instance_id == other.element_instance_id);
     }
   };
 
   using GuestInstanceIDMap = std::map<ElementInstanceKey, int>;
   GuestInstanceIDMap instance_id_map_;
 
   // The reverse map of GuestInstanceIDMap.
   using GuestInstanceIDReverseMap = std::map<int, ElementInstanceKey>;
   GuestInstanceIDReverseMap reverse_instance_id_map_;
@@ skipping 10 matching lines @@
   std::set<int> removed_instance_ids_;
 
   content::BrowserContext* context_;
 
   DISALLOW_COPY_AND_ASSIGN(GuestViewManager);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_MANAGER_H_