GuestView: Fix message routing across embedder navigations

content/browser/frame_host/frame_accessibility.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 "content/browser/frame_host/frame_accessibility.h"
 
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/render_frame_host_delegate.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
@@ skipping 94 matching lines @@
     }
 
     if (iter->child_frame_tree_node_id) {
       return GetRFHIFromFrameTreeNodeId(
           parent_frame_host, iter->child_frame_tree_node_id);
     }
 
     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);
     }
   }
 
   return nullptr;
 }
 
 void FrameAccessibility::GetAllChildFrames(
@@ skipping 10 matching lines @@
     if (iter->child_frame_tree_node_id) {
       RenderFrameHostImpl* child_frame_host = GetRFHIFromFrameTreeNodeId(
           parent_frame_host, iter->child_frame_tree_node_id);
       if (child_frame_host)
         child_frame_hosts->push_back(child_frame_host);
     }
 
     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));
     }
   }
 }
 
 bool FrameAccessibility::GetParent(
     RenderFrameHostImpl* child_frame_host,
     RenderFrameHostImpl** out_parent_frame_host,
@@ skipping 23 matching lines @@
           *out_parent_frame_host = iter->parent_frame_host;
         if (out_accessibility_node_id)
           *out_accessibility_node_id = iter->accessibility_node_id;
         return true;
       }
     }
 
     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)
           *out_parent_frame_host = iter->parent_frame_host;
         if (out_accessibility_node_id)
           *out_accessibility_node_id = iter->accessibility_node_id;
         return true;
       }
     }
   }
@@ skipping 19 matching lines @@
     child_node_ancestor = child_node_ancestor->parent();
   if (child_node_ancestor != parent_node) {
     NOTREACHED();
     return nullptr;
   }
 
   return child_node->current_frame_host();
 }
 
 }  // namespace content