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

content/browser/frame_host/interstitial_page_navigator_impl.cc

 // Copyright 2013 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/interstitial_page_navigator_impl.h"
 
 #include "content/browser/frame_host/interstitial_page_impl.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigator_delegate.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
@@ skipping 16 matching lines @@
   return controller_;
 }
 
 void InterstitialPageNavigatorImpl::DidStartProvisionalLoad(
     RenderFrameHostImpl* render_frame_host,
     const GURL& url,
     const base::TimeTicks& navigation_start) {
   // The interstitial page should only navigate once.
   DCHECK(!navigation_handle_.get());
   navigation_handle_ =
-      NavigationHandleImpl::Create(url, render_frame_host->frame_tree_node(),
-                                   false,  // is_renderer_initiated
-                                   false,  // is_synchronous
-                                   false,  // is_srcdoc
-                                   navigation_start,
-                                   0,       // pending_nav_entry_id
-                                   false);  // started_in_context_menu
+      NavigationHandleImpl::Create(url,
+          render_frame_host->GetSiteInstance()->GetSiteURL(),
+          render_frame_host->frame_tree_node(),
+          false,  // is_renderer_initiated
+          false,  // is_synchronous
+          false,  // is_srcdoc
+          navigation_start,
+          0,       // pending_nav_entry_id
+          false);  // started_in_context_menu
 }
 
 void InterstitialPageNavigatorImpl::DidNavigate(
     RenderFrameHostImpl* render_frame_host,
     const FrameHostMsg_DidCommitProvisionalLoad_Params& input_params) {
   if (navigation_handle_) {
     navigation_handle_->DidCommitNavigation(input_params, false,
                                             render_frame_host);
     navigation_handle_.reset();
   }
 
   // TODO(nasko): Move implementation here, but for the time being call out
   // to the interstitial page code.
   interstitial_->DidNavigate(render_frame_host->render_view_host(),
                              input_params);
 }
 
 NavigationHandleImpl*
 InterstitialPageNavigatorImpl::GetNavigationHandleForFrameHost(
     RenderFrameHostImpl* render_frame_host) {
   return navigation_handle_.get();
 }
 
 }  // namespace content