diff options
| author | jaekyun <jaekyun@chromium.org> | 2014-10-22 18:33:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-23 01:34:12 +0000 |
| commit | 1daee87d0752d7cb36debdf72859ca9947526912 (patch) | |
| tree | bf56cb148f71c6d93c041f02387c972cbf01637b /components/error_page | |
| parent | 3151133068b2d1cfd44af0e8a546b640989aeb3d (diff) | |
| download | chromium_src-1daee87d0752d7cb36debdf72859ca9947526912.zip chromium_src-1daee87d0752d7cb36debdf72859ca9947526912.tar.gz chromium_src-1daee87d0752d7cb36debdf72859ca9947526912.tar.bz2 | |
Do not reload a url which has unknown scheme
BUG=423757
Review URL: https://codereview.chromium.org/658003002
Cr-Commit-Position: refs/heads/master@{#300815}
Diffstat (limited to 'components/error_page')
| -rw-r--r-- | components/error_page/renderer/net_error_helper_core.cc | 3 | ||||
| -rw-r--r-- | components/error_page/renderer/net_error_helper_core_unittest.cc | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/components/error_page/renderer/net_error_helper_core.cc b/components/error_page/renderer/net_error_helper_core.cc index 93f943e..74cc14d 100644 --- a/components/error_page/renderer/net_error_helper_core.cc +++ b/components/error_page/renderer/net_error_helper_core.cc @@ -430,6 +430,9 @@ bool NetErrorHelperCore::IsReloadableError( const NetErrorHelperCore::ErrorPageInfo& info) { return info.error.domain.utf8() == net::kErrorDomain && info.error.reason != net::ERR_ABORTED && + // For now, net::ERR_UNKNOWN_URL_SCHEME is only being displayed on + // Chrome for Android. + info.error.reason != net::ERR_UNKNOWN_URL_SCHEME && !info.was_failed_post; } diff --git a/components/error_page/renderer/net_error_helper_core_unittest.cc b/components/error_page/renderer/net_error_helper_core_unittest.cc index 34a579e..2402999 100644 --- a/components/error_page/renderer/net_error_helper_core_unittest.cc +++ b/components/error_page/renderer/net_error_helper_core_unittest.cc @@ -2171,7 +2171,19 @@ TEST_F(NetErrorHelperCoreAutoReloadTest, OnlinePartialErrorReplacement) { TEST_F(NetErrorHelperCoreAutoReloadTest, ShouldSuppressNonReloadableErrorPage) { DoErrorLoad(net::ERR_ABORTED); EXPECT_FALSE(core()->ShouldSuppressErrorPage(NetErrorHelperCore::MAIN_FRAME, - GURL(kFailedUrl))); + GURL(kFailedUrl))); + + DoErrorLoad(net::ERR_UNKNOWN_URL_SCHEME); + EXPECT_FALSE(core()->ShouldSuppressErrorPage(NetErrorHelperCore::MAIN_FRAME, + GURL(kFailedUrl))); +} + +TEST_F(NetErrorHelperCoreAutoReloadTest, DoesNotReload) { + DoErrorLoad(net::ERR_ABORTED); + EXPECT_FALSE(timer()->IsRunning()); + + DoErrorLoad(net::ERR_UNKNOWN_URL_SCHEME); + EXPECT_FALSE(timer()->IsRunning()); } TEST_F(NetErrorHelperCoreAutoReloadTest, ShouldSuppressErrorPage) { |