GuestView: Fix message routing across embedder navigations

content/browser/frame_host/frame_accessibility.cc

Index: content/browser/frame_host/frame_accessibility.cc
diff --git a/content/browser/frame_host/frame_accessibility.cc b/content/browser/frame_host/frame_accessibility.cc
index 39b1e0e62aa4f05eba47542c389fcf3c08e30c76..172313cbbbad3b75f304461a981e4f7b2a4eee01 100644
--- a/content/browser/frame_host/frame_accessibility.cc
+++ b/content/browser/frame_host/frame_accessibility.cc
@@ -112,6 +112,7 @@ RenderFrameHostImpl* FrameAccessibility::GetChild(
     if (iter->browser_plugin_instance_id) {
       RenderFrameHost* guest =
           parent_frame_host->delegate()->GetGuestByInstanceID(
+              parent_frame_host,

[Charlie Reis, 2015/02/13 21:21:56]

nit: iter->parent_frame_host, here and below.

Should be equivalent given the earlier continue statement, but this makes it
immediately clear that there's no mismatch between RFH and
browser_plugin_instance_id.  (It's also consistent with the GetParent case.)

[Fady Samuel, 2015/02/13 22:31:25]

Done.

               iter->browser_plugin_instance_id);
       if (guest)
         return static_cast<RenderFrameHostImpl*>(guest);
@@ -142,6 +143,7 @@ void FrameAccessibility::GetAllChildFrames(
     if (iter->browser_plugin_instance_id) {
       RenderFrameHost* guest =
           parent_frame_host->delegate()->GetGuestByInstanceID(
+              parent_frame_host,
               iter->browser_plugin_instance_id);
       if (guest)
         child_frame_hosts->push_back(static_cast<RenderFrameHostImpl*>(guest));
@@ -185,6 +187,7 @@ bool FrameAccessibility::GetParent(
     if (iter->browser_plugin_instance_id) {
       RenderFrameHost* guest =
           iter->parent_frame_host->delegate()->GetGuestByInstanceID(
+              iter->parent_frame_host,
               iter->browser_plugin_instance_id);
       if (guest == child_frame_host) {
         if (out_parent_frame_host)