OOPIF: Fix cross-process navigations in new windows.

We were putting the wrong FrameTreeNode ID on the OpenURLParams
when a navigation was destined for a different WebContents.

BUG=464944
TEST=Shift click a link to https://chrome.google.com/webstore
     in --site-per-process mode.

Review URL: https://codereview.chromium.org/988953003

Cr-Commit-Position: refs/heads/master@{#319690}

1 files changed, 8 insertions, 1 deletions

diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index 2f63284..7194bbe 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -627,11 +627,18 @@ void NavigatorImpl::RequestTransferURL(
   }
 
   int64 frame_tree_node_id = -1;
+
+  // Send the navigation to the current FrameTreeNode if it's destined for a
+  // subframe in the current tab.  We'll assume it's for the main frame
+  // (possibly of a new or different WebContents) otherwise.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kSitePerProcess)) {
+          switches::kSitePerProcess) &&
+      disposition == CURRENT_TAB &&
+      render_frame_host->GetParent()) {
     frame_tree_node_id =
         render_frame_host->frame_tree_node()->frame_tree_node_id();
   }
+
   OpenURLParams params(
       dest_url, referrer, frame_tree_node_id, disposition, page_transition,
       true /* is_renderer_initiated */);