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

content/browser/frame_host/navigation_handle_impl.cc

 // Copyright 2015 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/navigation_handle_impl.h"
 
 #include <utility>
 
 #include "base/debug/dump_without_crashing.h"
 #include "base/logging.h"
@@ skipping 26 matching lines @@
     NavigationThrottle::ThrottleCheckResult* to_update,
     NavigationThrottle::ThrottleCheckResult result) {
   *to_update = result;
 }
 
 }  // namespace
 
 // static
 std::unique_ptr<NavigationHandleImpl> NavigationHandleImpl::Create(
     const GURL& url,
+    const GURL& site_url,
     FrameTreeNode* frame_tree_node,
     bool is_renderer_initiated,
     bool is_synchronous,
     bool is_srcdoc,
     const base::TimeTicks& navigation_start,
     int pending_nav_entry_id,
     bool started_from_context_menu) {
   return std::unique_ptr<NavigationHandleImpl>(new NavigationHandleImpl(
-      url, frame_tree_node, is_renderer_initiated, is_synchronous, is_srcdoc,
-      navigation_start, pending_nav_entry_id, started_from_context_menu));
+      url, site_url, frame_tree_node, is_renderer_initiated, is_synchronous,
+      is_srcdoc, navigation_start, pending_nav_entry_id,
+      started_from_context_menu));
 }
 
 NavigationHandleImpl::NavigationHandleImpl(
     const GURL& url,
+    const GURL& site_url,
     FrameTreeNode* frame_tree_node,
     bool is_renderer_initiated,
     bool is_synchronous,
     bool is_srcdoc,
     const base::TimeTicks& navigation_start,
     int pending_nav_entry_id,
     bool started_from_context_menu)
     : url_(url),
+      site_url_(site_url),
       has_user_gesture_(false),
       transition_(ui::PAGE_TRANSITION_LINK),
       is_external_protocol_(false),
       net_error_code_(net::OK),
       render_frame_host_(nullptr),
       is_renderer_initiated_(is_renderer_initiated),
       is_same_page_(false),
       is_synchronous_(is_synchronous),
       is_srcdoc_(is_srcdoc),
       was_redirected_(false),
@@ skipping 42 matching lines @@
 
 RequestContextType NavigationHandleImpl::GetRequestContextType() const {
   DCHECK_GE(state_, WILL_SEND_REQUEST);
   return request_context_type_;
 }
 
 const GURL& NavigationHandleImpl::GetURL() {
   return url_;
 }
 
+const GURL& NavigationHandleImpl::GetSiteURL() {
+  return site_url_;
+}
+
 bool NavigationHandleImpl::IsInMainFrame() {
   return frame_tree_node_->IsMainFrame();
 }
 
 bool NavigationHandleImpl::IsParentMainFrame() {
   if (frame_tree_node_->parent())
     return frame_tree_node_->parent()->IsMainFrame();
 
   return false;
 }
@@ skipping 604 matching lines @@
                       throttles_to_register.end());
     throttles_to_register.weak_clear();
   }
 }
 
 bool NavigationHandleImpl::WasStartedFromContextMenu() const {
   return started_from_context_menu_;
 }
 
 }  // namespace content