Move blocking of top-level navigations to nested URLs with extension origins from non-extension pro…

content/browser/frame_host/navigator_impl.cc

Index: content/browser/frame_host/navigator_impl.cc
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index 571387d591b0916a709bc081c52a1f5741d191a5..d2b8dbf4d2d3f96e6416fea53f283e82ec50d4fb 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -195,7 +195,9 @@ void NavigatorImpl::DidStartProvisionalLoad(
   }
 
   render_frame_host->SetNavigationHandle(NavigationHandleImpl::Create(
-      validated_url, render_frame_host->frame_tree_node(),
+      validated_url,
+      render_frame_host->GetSiteInstance()->GetSiteURL(),

[alexmos, 2016/10/12 17:18:16]

Similar concern here about whether this picks the right SiteInstance on the
non-PlzNav path.  Isn't this also going get the RFH in which the navigation will
commit, rather than the one in which it originated?

+      render_frame_host->frame_tree_node(),
       is_renderer_initiated,
       false,             // is_synchronous
       is_iframe_srcdoc,  // is_srcdoc