diff options
| author | mmenke@google.com <mmenke@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 15:06:44 +0000 |
|---|---|---|
| committer | mmenke@google.com <mmenke@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 15:06:44 +0000 |
| commit | 7e2e2720df303d4c172c2dcf24bb0b1b3616bf90 (patch) | |
| tree | 44a557b66ca310b1ce8ac9644cbd6a036f770ac4 /webkit/tools | |
| parent | 40d4c918146767f51aa7ab7b0d6358ded099d1f2 (diff) | |
| download | chromium_src-7e2e2720df303d4c172c2dcf24bb0b1b3616bf90.zip chromium_src-7e2e2720df303d4c172c2dcf24bb0b1b3616bf90.tar.gz chromium_src-7e2e2720df303d4c172c2dcf24bb0b1b3616bf90.tar.bz2 | |
Modify GetErrorDescription to give a -1004 (NSURLErrorCannotConnectToHost)
when passed a net::ERR_NETWORK_ACCESS_DENIED error. This results in a
error code being output by the security/block-test-no-port.html
layout test on OSX that is consistent with other platforms.
The test is also temporarily disabled on OSX until the expected results
are updated.
BUG=61655
TEST=security/block-test-no-port.html (Currently disabled)
Review URL: http://codereview.chromium.org/5012005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 0ca4cc3..cddd363 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -4,3 +4,5 @@ // // Only add expectations here to temporarily suppress messages on the bots // until the changes can be landed upstream. + +BUG61655 : security/block-test-no-port.html = TEXT diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 985d5f5..525c501 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -224,7 +224,7 @@ std::string GetErrorDescription(const WebURLError& error) { domain = "NSURLErrorDomain"; switch (error.reason) { case net::ERR_ABORTED: - code = -999; + code = -999; // NSURLErrorCancelled break; case net::ERR_UNSAFE_PORT: // Our unsafe port checking happens at the network stack level, but we @@ -234,7 +234,8 @@ std::string GetErrorDescription(const WebURLError& error) { break; case net::ERR_ADDRESS_INVALID: case net::ERR_ADDRESS_UNREACHABLE: - code = -1004; + case net::ERR_NETWORK_ACCESS_DENIED: + code = -1004; // NSURLErrorCannotConnectToHost break; } } else { |