NavigationThrottle: allow customization of net::Error when blocking

content/public/test/navigation_simulator.cc

 // Copyright 2017 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/public/test/navigation_simulator.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "content/browser/frame_host/navigation_handle_impl.h"
@@ skipping 138 matching lines @@
         true /* user_gesture */, transition_, false /* is_external_protocol */,
         REQUEST_CONTEXT_TYPE_LOCATION,
         blink::WebMixedContentContextType::kNotMixedContent,
         base::Callback<void(NavigationThrottle::ThrottleCheckResult)>());
   }
 
   CHECK(handle_);
   WaitForThrottleChecksComplete();
 
   CHECK_EQ(1, num_did_start_navigation_called_);
-  if (GetLastThrottleCheckResult() == NavigationThrottle::PROCEED) {
+  NavigationThrottle::ThrottleCheckResult result = GetLastThrottleCheckResult();
+  if (result.action() == NavigationThrottle::PROCEED) {
     CHECK_EQ(1, num_will_start_request_called_);
   } else {
-    FailFromThrottleCheck(GetLastThrottleCheckResult());
+    FailFromThrottleCheck(result);
   }
 }
 
 void NavigationSimulator::Redirect(const GURL& new_url) {
   CHECK(state_ <= STARTED) << "NavigationSimulator::Redirect should be "
                               "called before Fail or Commit";
   CHECK_EQ(0, num_did_finish_navigation_called_)
       << "NavigationSimulator::Redirect cannot be called after the "
          "navigation has finished";
 
@@ skipping 31 matching lines @@
         redirect_info, scoped_refptr<ResourceResponse>(new ResourceResponse));
   } else {
     handle_->WillRedirectRequest(
         new_url, "GET", referrer_.url, false /* is_external_protocol */,
         scoped_refptr<net::HttpResponseHeaders>(),
         net::HttpResponseInfo::ConnectionInfo(),
         base::Callback<void(NavigationThrottle::ThrottleCheckResult)>());
   }
 
   WaitForThrottleChecksComplete();
-
-  if (GetLastThrottleCheckResult() == NavigationThrottle::PROCEED) {
+  NavigationThrottle::ThrottleCheckResult result = GetLastThrottleCheckResult();
+  if (result.action() == NavigationThrottle::PROCEED) {
     CHECK_EQ(previous_num_will_redirect_request_called + 1,
              num_will_redirect_request_called_);
     CHECK_EQ(previous_did_redirect_navigation_called + 1,
              num_did_redirect_navigation_called_);
   } else {
-    FailFromThrottleCheck(GetLastThrottleCheckResult());
+    FailFromThrottleCheck(result);
   }
 }
 
 void NavigationSimulator::Commit() {
   CHECK_LE(state_, STARTED) << "NavigationSimulator::Commit can only be "
                                "called once, and cannot be called after "
                                "NavigationSimulator::Fail";
   CHECK_EQ(0, num_did_finish_navigation_called_)
       << "NavigationSimulator::Commit cannot be called after the "
          "navigation has finished";
@@ skipping 22 matching lines @@
     handle_->WillProcessResponse(
         render_frame_host_, scoped_refptr<net::HttpResponseHeaders>(),
         net::HttpResponseInfo::ConnectionInfo(), SSLStatus(), GlobalRequestID(),
         false /* should_replace_current_entry */, false /* is_download */,
         false /* is_stream */, base::Closure(),
         base::Callback<void(NavigationThrottle::ThrottleCheckResult)>());
   }
 
   WaitForThrottleChecksComplete();
 
-  if (GetLastThrottleCheckResult() != NavigationThrottle::PROCEED) {
-    FailFromThrottleCheck(GetLastThrottleCheckResult());
+  NavigationThrottle::ThrottleCheckResult result = GetLastThrottleCheckResult();
+  if (result.action() != NavigationThrottle::PROCEED) {
+    FailFromThrottleCheck(result);
     return;
   }
 
   CHECK_EQ(1, num_will_process_response_called_);
   CHECK_EQ(1, num_ready_to_commit_called_);
 
   // Update the RenderFrameHost now that we know which RenderFrameHost will
   // commit the navigation.
   TestRenderFrameHost* new_render_frame_host =
       static_cast<TestRenderFrameHost*>(handle_->GetRenderFrameHost());
@@ skipping 292 matching lines @@
                  weak_factory_.GetWeakPtr()));
 }
 
 RenderFrameHost* NavigationSimulator::GetFinalRenderFrameHost() {
   CHECK_EQ(state_, FINISHED);
   return render_frame_host_;
 }
 
 void NavigationSimulator::FailFromThrottleCheck(
     NavigationThrottle::ThrottleCheckResult result) {
-  DCHECK_NE(result, NavigationThrottle::PROCEED);
+  DCHECK_NE(result.action(), NavigationThrottle::PROCEED);
   state_ = FAILED;
 
   // Special failure logic only needed for non-PlzNavigate case.
   if (IsBrowserSideNavigationEnabled())
     return;
-  int error_code = net::OK;
-  switch (result) {
-    case NavigationThrottle::PROCEED:
-    case NavigationThrottle::DEFER:
-      NOTREACHED();
-      break;
-    case NavigationThrottle::CANCEL:
-    case NavigationThrottle::CANCEL_AND_IGNORE:
-      error_code = net::ERR_ABORTED;
-      break;
-    case NavigationThrottle::BLOCK_REQUEST:
-      error_code = net::ERR_BLOCKED_BY_CLIENT;
-      break;
-    case NavigationThrottle::BLOCK_RESPONSE:
-      error_code = net::ERR_BLOCKED_BY_RESPONSE;
-      break;
-  };
+  DCHECK_NE(result.action(), NavigationThrottle::DEFER);
+  DCHECK_NE(result.net_error_code(), net::OK);
 
   FrameHostMsg_DidFailProvisionalLoadWithError_Params error_params;
-  error_params.error_code = error_code;
+  error_params.error_code = result.net_error_code();
   error_params.url = navigation_url_;
   render_frame_host_->OnMessageReceived(
       FrameHostMsg_DidFailProvisionalLoadWithError(
           render_frame_host_->GetRoutingID(), error_params));
-  bool should_result_in_error_page = error_code != net::ERR_ABORTED;
+  bool should_result_in_error_page =
+      result.net_error_code() != net::ERR_ABORTED;
   if (!should_result_in_error_page) {
     render_frame_host_->OnMessageReceived(
         FrameHostMsg_DidStopLoading(render_frame_host_->GetRoutingID()));
     CHECK_EQ(1, num_did_finish_navigation_called_);
   } else {
     CHECK_EQ(0, num_did_finish_navigation_called_);
   }
 }
 
 }  // namespace content