Fix one NavigationHandleImplBrowserTest test with the network service
Bug: 729848
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
Change-Id: Idf1dd6a663f154b291e42444c0f5f48eaf5f0277
Reviewed-on: https://chromium-review.googlesource.com/1031388
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: Jay Civelli <jcivelli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557371}diff --git a/content/browser/frame_host/navigation_handle_impl_browsertest.cc b/content/browser/frame_host/navigation_handle_impl_browsertest.cc
index d2773b5..b2256821 100644
--- a/content/browser/frame_host/navigation_handle_impl_browsertest.cc
+++ b/content/browser/frame_host/navigation_handle_impl_browsertest.cc
@@ -1898,26 +1898,20 @@
GURL url(embedded_test_server()->GetURL("/title1.html"));
EXPECT_TRUE(NavigateToURL(shell(), url));
- const struct {
- const GURL renderer_debug_url;
- const net::Error error_code;
- } kTestCases[] = {
- {GURL("javascript:window.alert('hello')"), net::ERR_ABORTED},
- {GURL(kChromeUIBadCastCrashURL), net::ERR_UNSAFE_REDIRECT},
- {GURL(kChromeUICrashURL), net::ERR_UNSAFE_REDIRECT},
- {GURL(kChromeUIDumpURL), net::ERR_UNSAFE_REDIRECT},
- {GURL(kChromeUIKillURL), net::ERR_UNSAFE_REDIRECT},
- {GURL(kChromeUIHangURL), net::ERR_UNSAFE_REDIRECT},
- {GURL(kChromeUIShorthangURL), net::ERR_UNSAFE_REDIRECT},
- {GURL(kChromeUIMemoryExhaustURL), net::ERR_UNSAFE_REDIRECT},
- };
+ const GURL kTestUrls[] = {GURL("javascript:window.alert('hello')"),
+ GURL(kChromeUIBadCastCrashURL),
+ GURL(kChromeUICrashURL),
+ GURL(kChromeUIDumpURL),
+ GURL(kChromeUIKillURL),
+ GURL(kChromeUIHangURL),
+ GURL(kChromeUIShorthangURL),
+ GURL(kChromeUIMemoryExhaustURL)};
- for (const auto& test_case : kTestCases) {
- SCOPED_TRACE(testing::Message()
- << "renderer_debug_url = " << test_case.renderer_debug_url);
+ for (const auto& test_url : kTestUrls) {
+ SCOPED_TRACE(testing::Message() << "renderer_debug_url = " << test_url);
- GURL redirecting_url = embedded_test_server()->GetURL(
- "/server-redirect?" + test_case.renderer_debug_url.spec());
+ GURL redirecting_url =
+ embedded_test_server()->GetURL("/server-redirect?" + test_url.spec());
NavigationHandleObserver observer(shell()->web_contents(), redirecting_url);
NavigationLogger logger(shell()->web_contents());
@@ -1925,7 +1919,7 @@
// Try to navigate to the url. The navigation should be canceled and the
// NavigationHandle should have the right error code.
EXPECT_FALSE(NavigateToURL(shell(), redirecting_url));
- EXPECT_EQ(test_case.error_code, observer.net_error_code());
+ EXPECT_EQ(net::ERR_UNSAFE_REDIRECT, observer.net_error_code());
// Both WebContentsObserver::{DidStartNavigation, DidFinishNavigation}
// are called, but no WebContentsObserver::DidRedirectNavigation.
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
index 83fe90f..e6f8ac3 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -720,9 +720,7 @@
redirect_info.new_url)) {
DVLOG(1) << "Denied redirect for "
<< redirect_info.new_url.possibly_invalid_spec();
- // TODO(arthursonzogni): Consider switching to net::ERR_UNSAFE_REDIRECT
- // when PlzNavigate is launched.
- navigation_handle_->set_net_error_code(net::ERR_ABORTED);
+ navigation_handle_->set_net_error_code(net::ERR_UNSAFE_REDIRECT);
frame_tree_node_->ResetNavigationRequest(false, true);
return;
}
@@ -736,7 +734,7 @@
redirect_info.new_url)) {
DVLOG(1) << "Denied unauthorized redirect for "
<< redirect_info.new_url.possibly_invalid_spec();
- navigation_handle_->set_net_error_code(net::ERR_ABORTED);
+ navigation_handle_->set_net_error_code(net::ERR_UNSAFE_REDIRECT);
frame_tree_node_->ResetNavigationRequest(false, true);
return;
}
diff --git a/testing/buildbot/filters/mojo.fyi.network_content_browsertests.filter b/testing/buildbot/filters/mojo.fyi.network_content_browsertests.filter
index 672ef54..4aa8e6e 100644
--- a/testing/buildbot/filters/mojo.fyi.network_content_browsertests.filter
+++ b/testing/buildbot/filters/mojo.fyi.network_content_browsertests.filter
@@ -40,7 +40,6 @@
-NavigationHandleImplBrowserTest.RedirectToRendererDebugUrl
-AsyncResourceHandlerBrowserTest/AsyncResourceHandlerBrowserTest.UploadProgress*
--NavigationHandleImplBrowserTest.ErrorCodeOnRedirect
-WebContentsImplBrowserTest.DownloadImage_Deny_FileImage
# services/network/url_loader.cc should handle failure in
