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

content/browser/frame_host/navigation_handle_impl.h

Index: content/browser/frame_host/navigation_handle_impl.h
diff --git a/content/browser/frame_host/navigation_handle_impl.h b/content/browser/frame_host/navigation_handle_impl.h
index 66b9295e5c75c0d90b7227fceb4984fa9bec802e..e2293fd5eb71ca4b5406a389d4fd8bdf403a31f9 100644
--- a/content/browser/frame_host/navigation_handle_impl.h
+++ b/content/browser/frame_host/navigation_handle_impl.h
@@ -76,6 +76,7 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
   // associated with this navigation.
   static std::unique_ptr<NavigationHandleImpl> Create(
       const GURL& url,
+      const GURL& site_url,
       FrameTreeNode* frame_tree_node,
       bool is_renderer_initiated,
       bool is_synchronous,
@@ -87,6 +88,7 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
 
   // NavigationHandle implementation:
   const GURL& GetURL() override;
+  const GURL& GetSiteURL() override;
   bool IsInMainFrame() override;
   bool IsParentMainFrame() override;
   bool IsRendererInitiated() override;
@@ -298,6 +300,7 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
   };
 
   NavigationHandleImpl(const GURL& url,
+                       const GURL& site_url,
                        FrameTreeNode* frame_tree_node,
                        bool is_renderer_initiated,
                        bool is_synchronous,
@@ -335,6 +338,7 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
 
   // See NavigationHandle for a description of those member variables.
   GURL url_;
+  GURL site_url_;

[nasko, 2016/10/12 17:00:35]

Let's store the SiteInstance here instead of the URL. Just the URL won't be good
enough for process model decisions and we can ask the SiteInstance for its
underlying process.

Also, let's name it something like creator_site_instance_, so it is clear that
this is for the RFH that created the request. We will have to consolidate it
later with support for knowing who initiated the navigation (which can be
different), but that is for other CLs.

[jam, 2016/10/12 22:10:45]

Done.

   Referrer sanitized_referrer_;
   bool has_user_gesture_;
   ui::PageTransition transition_;