PlzNavigate: Fix the FindInPageControllerTest.SearchWithinSpecialURL browser test.

content/browser/frame_host/navigation_request.cc

 // Copyright 2014 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_request.h"
 
 #include <utility>
 
+#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.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
 #include "content/browser/frame_host/navigation_request_info.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/navigator_impl.h"
 #include "content/browser/loader/navigation_url_loader.h"
+#include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/browser/service_worker/service_worker_navigation_handle.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/common/resource_request_body_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_data.h"
 #include "content/public/browser/navigation_ui_data.h"
 #include "content/public/browser/storage_partition.h"
@@ skipping 477 matching lines @@
           parent_is_main_frame, IsSecureFrame(frame_tree_node_->parent()),
           frame_tree_node_->frame_tree_node_id()),
       std::move(navigation_ui_data),
       navigation_handle_->service_worker_handle(), this);
 }
 
 void NavigationRequest::OnRedirectChecksComplete(
     NavigationThrottle::ThrottleCheckResult result) {
   CHECK(result != NavigationThrottle::DEFER);
 
+  // For non browser initiated navigations we need to check if the source and
+  // target site instances both have access to the URL. We always allow
+  // browser initiated requests.
+  bool source_can_request = true;
+  if (!browser_initiated_ && source_site_instance()) {

[ananta, 2016/10/22 03:47:32]

Verified that the browser_initiated_ field is set to false for renderer
initiated navigations like opening a link in a current tab/new tab/window via a
script. Normal link clicks also have the browser_initiated_ flag set to false.

[jam, 2016/10/24 16:59:16]

actually, we should probably do this before throttles run? i.e. line 337 above
where there's a TODO? And maybe instead of just calling CanRequestURL, we call
FilterURL since that does more checks thatn just CPSP?

[ananta, 2016/10/24 19:53:19]

Done

+    source_can_request =
+        ChildProcessSecurityPolicyImpl::GetInstance()->CanRequestURL(
+            source_site_instance()->GetProcess()->GetID(),
+        common_params_.url);
+  }
+
+  bool renderer_can_request = true;
+  if (!browser_initiated_) {
+    renderer_can_request =
+      ChildProcessSecurityPolicyImpl::GetInstance()->CanRequestURL(
+          frame_tree_node()->current_frame_host()->GetSiteInstance()->
+              GetProcess()->GetID(),
+          common_params_.url);
+  }
+
   // Abort the request if needed. This will destroy the NavigationRequest.
   if (result == NavigationThrottle::CANCEL_AND_IGNORE ||
-      result == NavigationThrottle::CANCEL) {
+      result == NavigationThrottle::CANCEL ||
+      !source_can_request ||
+      !renderer_can_request) {
     // TODO(clamy): distinguish between CANCEL and CANCEL_AND_IGNORE.
     frame_tree_node_->ResetNavigationRequest(false);
     return;
   }
 
   loader_->FollowRedirect();
 }
 
 void NavigationRequest::OnWillProcessResponseChecksComplete(
     NavigationThrottle::ThrottleCheckResult result) {
@@ skipping 33 matching lines @@
   DCHECK_EQ(request_params_.has_user_gesture, begin_params_.has_user_gesture);
 
   render_frame_host->CommitNavigation(response_.get(), std::move(body_),
                                       common_params_, request_params_,
                                       is_view_source_);
 
   frame_tree_node_->ResetNavigationRequest(true);
 }
 
 }  // namespace content