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"
 #include "content/browser/browsing_data/clear_site_data_throttle.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/navigator_delegate.h"
+#include "content/browser/frame_host/render_frame_host_manager.h"

[alexmos, 2016/10/13 00:46:27]

nit: is this still necessary?

[jam, 2016/10/13 03:12:28]

Done.

 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/browser/service_worker/service_worker_navigation_handle.h"
 #include "content/common/frame_messages.h"
 #include "content/common/resource_request_body_impl.h"
 #include "content/common/site_isolation_policy.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/navigation_ui_data.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/content_client.h"
@@ skipping 57 matching lines @@
       navigation_start_(navigation_start),
       pending_nav_entry_id_(pending_nav_entry_id),
       request_context_type_(REQUEST_CONTEXT_TYPE_UNSPECIFIED),
       should_replace_current_entry_(false),
       is_download_(false),
       is_stream_(false),
       started_from_context_menu_(started_from_context_menu),
       weak_factory_(this) {
   DCHECK(!navigation_start.is_null());
   redirect_chain_.push_back(url);
+
+  starting_site_instance_ =
+      frame_tree_node_->current_frame_host()->GetSiteInstance();
+
   GetDelegate()->DidStartNavigation(this);
 
   if (IsInMainFrame()) {
     TRACE_EVENT_ASYNC_BEGIN_WITH_TIMESTAMP1(
         "navigation", "Navigation StartToCommit", this,
         navigation_start, "Initial URL", url_.spec());
   }
 }
 
 NavigationHandleImpl::~NavigationHandleImpl() {
@@ skipping 17 matching lines @@
 
 RequestContextType NavigationHandleImpl::GetRequestContextType() const {
   DCHECK_GE(state_, WILL_SEND_REQUEST);
   return request_context_type_;
 }
 
 const GURL& NavigationHandleImpl::GetURL() {
   return url_;
 }
 
+SiteInstance* NavigationHandleImpl::GetStartingSiteInstance() {
+  return starting_site_instance_.get();
+}
+
 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