summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-06 21:08:34 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-06 21:08:34 +0000
commitc0d5f8e79408e3d087612e4c58fc17aa0af3ed27 (patch)
tree9c7ef5d0d45c82cb03b9bd930614f83b1498fdd3 /webkit
parent136564ee7820c466a55a97454389ed9c3bdcab65 (diff)
downloadchromium_src-c0d5f8e79408e3d087612e4c58fc17aa0af3ed27.zip
chromium_src-c0d5f8e79408e3d087612e4c58fc17aa0af3ed27.tar.gz
chromium_src-c0d5f8e79408e3d087612e4c58fc17aa0af3ed27.tar.bz2
Reverting 22651.
Review URL: http://codereview.chromium.org/165084 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22663 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt2
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.cc1
2 files changed, 1 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index b29eac3..746d5d5 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3047,4 +3047,4 @@ BUG18656 MAC : LayoutTests/fast/dom/Window/window-lookup-precedence.html = FAIL
BUG18659 WIN : LayoutTests/http/tests/loading/redirect-methods.html = PASS TIMEOUT
BUG18665 MAC : LayoutTests/security/block-test.html = FAIL
-BUG18665 MAC : LayoutTests/security/block-test-no-port.html = FAIL
+BUG18665 MAC LINUX : LayoutTests/security/block-test-no-port.html = FAIL
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index cabf7f7e..3bda3ef 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -154,7 +154,6 @@ std::string GetErrorDescription(const WebURLError& error) {
code = 103;
break;
case net::ERR_ADDRESS_INVALID:
- case net::ERR_ADDRESS_UNREACHABLE:
code = -1004;
break;
default: