Introduce SubframeNavigationFilteringThrottle

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 <iterator>
 
 #include "base/debug/dump_without_crashing.h"
 #include "base/logging.h"
@@ skipping 24 matching lines @@
 #include "net/base/net_errors.h"
 #include "net/url_request/redirect_info.h"
 #include "third_party/WebKit/public/platform/WebMixedContentContextType.h"
 #include "url/gurl.h"
 #include "url/url_constants.h"
 
 namespace content {
 
 namespace {
 
-void UpdateThrottleCheckResult(
-    NavigationThrottle::ThrottleCheckResult* to_update,
-    NavigationThrottle::ThrottleCheckResult result) {
-  *to_update = result;
-}
-
 void NotifyAbandonedTransferNavigation(const GlobalRequestID& id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get())
     rdh->CancelRequest(id.child_id, id.request_id);
 }
 
 }  // namespace
 
 // static
 std::unique_ptr<NavigationHandleImpl> NavigationHandleImpl::Create(
@@ skipping 286 matching lines @@
     std::unique_ptr<NavigationThrottle> navigation_throttle) {
   throttles_.push_back(std::move(navigation_throttle));
 }
 
 NavigationThrottle::ThrottleCheckResult
 NavigationHandleImpl::CallWillStartRequestForTesting(
     bool is_post,
     const Referrer& sanitized_referrer,
     bool has_user_gesture,
     ui::PageTransition transition,
-    bool is_external_protocol) {
-  NavigationThrottle::ThrottleCheckResult result = NavigationThrottle::DEFER;
-
+    bool is_external_protocol,
+    const ThrottleChecksFinishedCallback& complete_callback) {
   scoped_refptr<ResourceRequestBodyImpl> resource_request_body;
   std::string method = "GET";
   if (is_post) {
     method = "POST";
 
     std::string body = "test=body";
     resource_request_body = new ResourceRequestBodyImpl();
     resource_request_body->AppendBytes(body.data(), body.size());
   }
-
-  WillStartRequest(method, resource_request_body, sanitized_referrer,
-                   has_user_gesture, transition, is_external_protocol,
-                   REQUEST_CONTEXT_TYPE_LOCATION,
-                   blink::WebMixedContentContextType::Blockable,
-                   base::Bind(&UpdateThrottleCheckResult, &result));
-
-  // Reset the callback to ensure it will not be called later.
-  complete_callback_.Reset();
-  return result;
+  return WillStartRequest(
+      method, resource_request_body, sanitized_referrer, has_user_gesture,
+      transition, is_external_protocol, REQUEST_CONTEXT_TYPE_LOCATION,
+      blink::WebMixedContentContextType::Blockable, complete_callback);
 }
 
 NavigationThrottle::ThrottleCheckResult
 NavigationHandleImpl::CallWillRedirectRequestForTesting(
     const GURL& new_url,
     bool new_method_is_post,
     const GURL& new_referrer_url,
-    bool new_is_external_protocol) {
-  NavigationThrottle::ThrottleCheckResult result = NavigationThrottle::DEFER;
-  WillRedirectRequest(new_url, new_method_is_post ? "POST" : "GET",
-                      new_referrer_url, new_is_external_protocol,
-                      scoped_refptr<net::HttpResponseHeaders>(),
-                      net::HttpResponseInfo::CONNECTION_INFO_UNKNOWN,
-                      base::Bind(&UpdateThrottleCheckResult, &result));
-
-  // Reset the callback to ensure it will not be called later.
-  complete_callback_.Reset();
-  return result;
+    bool new_is_external_protocol,
+    const ThrottleChecksFinishedCallback& complete_callback) {
+  return WillRedirectRequest(
+      new_url, new_method_is_post ? "POST" : "GET", new_referrer_url,
+      new_is_external_protocol, scoped_refptr<net::HttpResponseHeaders>(),
+      net::HttpResponseInfo::CONNECTION_INFO_UNKNOWN, complete_callback);
 }
 
 NavigationThrottle::ThrottleCheckResult
 NavigationHandleImpl::CallWillProcessResponseForTesting(
     content::RenderFrameHost* render_frame_host,
-    const std::string& raw_response_headers) {
+    const std::string& raw_response_headers,
+    const ThrottleChecksFinishedCallback& complete_callback) {
   scoped_refptr<net::HttpResponseHeaders> headers =
       new net::HttpResponseHeaders(raw_response_headers);
-  NavigationThrottle::ThrottleCheckResult result = NavigationThrottle::DEFER;
-  WillProcessResponse(static_cast<RenderFrameHostImpl*>(render_frame_host),
-                      headers, net::HttpResponseInfo::CONNECTION_INFO_UNKNOWN,
-                      SSLStatus(), GlobalRequestID(), false, false, false,
-                      base::Closure(),
-                      base::Bind(&UpdateThrottleCheckResult, &result));
-
-  // Reset the callback to ensure it will not be called later.
-  complete_callback_.Reset();
-  return result;
+  return WillProcessResponse(
+      static_cast<RenderFrameHostImpl*>(render_frame_host), headers,
+      net::HttpResponseInfo::CONNECTION_INFO_UNKNOWN, SSLStatus(),
+      GlobalRequestID(), false, false, false, base::Closure(),
+      complete_callback);
 }
 
 void NavigationHandleImpl::CallDidCommitNavigationForTesting(const GURL& url) {
   FrameHostMsg_DidCommitProvisionalLoad_Params params;
 
   params.nav_entry_id = 1;
   params.url = url;
   params.referrer = content::Referrer();
   params.transition = ui::PAGE_TRANSITION_TYPED;
   params.redirects = std::vector<GURL>();
@@ skipping 43 matching lines @@
   service_worker_handle_.reset(
       new ServiceWorkerNavigationHandle(service_worker_context));
 }
 
 void NavigationHandleImpl::InitAppCacheHandle(
     ChromeAppCacheService* appcache_service) {
   DCHECK(IsBrowserSideNavigationEnabled());
   appcache_handle_.reset(new AppCacheNavigationHandle(appcache_service));
 }
 
-void NavigationHandleImpl::WillStartRequest(
+NavigationThrottle::ThrottleCheckResult NavigationHandleImpl::WillStartRequest(
     const std::string& method,
     scoped_refptr<content::ResourceRequestBodyImpl> resource_request_body,
     const Referrer& sanitized_referrer,
     bool has_user_gesture,
     ui::PageTransition transition,
     bool is_external_protocol,
     RequestContextType request_context_type,
     blink::WebMixedContentContextType mixed_content_context_type,
     const ThrottleChecksFinishedCallback& callback) {
   if (method != "POST")
@@ skipping 24 matching lines @@
 
   if (IsBrowserSideNavigationEnabled())
     navigation_ui_data_ = GetDelegate()->GetNavigationUIData(this);
 
   // Notify each throttle of the request.
   NavigationThrottle::ThrottleCheckResult result = CheckWillStartRequest();
 
   // If the navigation is not deferred, run the callback.
   if (result != NavigationThrottle::DEFER)
     RunCompleteCallback(result);
+  return result;
 }
 
-void NavigationHandleImpl::WillRedirectRequest(
+NavigationThrottle::ThrottleCheckResult
+NavigationHandleImpl::WillRedirectRequest(
     const GURL& new_url,
     const std::string& new_method,
     const GURL& new_referrer_url,
     bool new_is_external_protocol,
     scoped_refptr<net::HttpResponseHeaders> response_headers,
     net::HttpResponseInfo::ConnectionInfo connection_info,
     const ThrottleChecksFinishedCallback& callback) {
   // Update the navigation parameters.
   url_ = new_url;
   method_ = new_method;
@@ skipping 14 matching lines @@
 
   state_ = WILL_REDIRECT_REQUEST;
   complete_callback_ = callback;
 
   // Notify each throttle of the request.
   NavigationThrottle::ThrottleCheckResult result = CheckWillRedirectRequest();
 
   // If the navigation is not deferred, run the callback.
   if (result != NavigationThrottle::DEFER)
     RunCompleteCallback(result);
+  return result;
 }
 
-void NavigationHandleImpl::WillProcessResponse(
+NavigationThrottle::ThrottleCheckResult
+NavigationHandleImpl::WillProcessResponse(
     RenderFrameHostImpl* render_frame_host,
     scoped_refptr<net::HttpResponseHeaders> response_headers,
     net::HttpResponseInfo::ConnectionInfo connection_info,
     const SSLStatus& ssl_status,
     const GlobalRequestID& request_id,
     bool should_replace_current_entry,
     bool is_download,
     bool is_stream,
     const base::Closure& transfer_callback,
     const ThrottleChecksFinishedCallback& callback) {
@@ skipping 12 matching lines @@
 
   // Notify each throttle of the response.
   NavigationThrottle::ThrottleCheckResult result = CheckWillProcessResponse();
 
   // If the navigation is done processing the response, then it's ready to
   // commit. Determine which RenderFrameHost should render the response, based
   // on its site (after any redirects).
   // Note: if MaybeTransferAndProceed returns false, this means that this
   // NavigationHandle was deleted, so return immediately.
   if (result == NavigationThrottle::PROCEED && !MaybeTransferAndProceed())
-    return;
+    return result;
 
   // If the navigation is not deferred, run the callback.
   if (result != NavigationThrottle::DEFER)
     RunCompleteCallback(result);
+  return result;
 }
 
 void NavigationHandleImpl::ReadyToCommitNavigation(
     RenderFrameHostImpl* render_frame_host) {
   DCHECK(!render_frame_host_ || render_frame_host_ == render_frame_host);
   render_frame_host_ = render_frame_host;
   state_ = READY_TO_COMMIT;
 
   if (!IsRendererDebugURL(url_) && !IsSamePage())
     GetDelegate()->ReadyToCommitNavigation(this);
@@ skipping 273 matching lines @@
       content::AncestorThrottle::MaybeCreateThrottleFor(this);
   if (ancestor_throttle)
     throttles_.push_back(std::move(ancestor_throttle));
 
   throttles_.insert(throttles_.begin(),
                     std::make_move_iterator(throttles_to_register.begin()),
                     std::make_move_iterator(throttles_to_register.end()));
 }
 
 }  // namespace content