summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt8
-rw-r--r--webkit/tools/test_shell/simple_resource_loader_bridge.cc2
2 files changed, 1 insertions, 9 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index dac20f6..2587f84 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3079,11 +3079,3 @@ BUG17974 WIN LINUX: LayoutTests/fast/css/remove-shorthand.html = FAIL
BUG17974 WIN LINUX: LayoutTests/fast/css/getComputedStyle/computed-style.html = FAIL
BUG17974 WIN LINUX: LayoutTests/svg/css/getComputedStyle-basic.xhtml = FAIL
BUG17974 WIN: LayoutTests/svg/custom/svg-fonts-in-html.html = FAIL
-
-// Regressions caused by Chromium r22067
-BUG18089 LINUX MAC : LayoutTests/http/tests/security/xss-DENIED-xsl-document-redirect.xml = FAIL
-BUG18089 LINUX MAC : LayoutTests/http/tests/security/xss-DENIED-xsl-external-entity-redirect.xml = FAIL
-BUG18089 LINUX MAC : LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-post-sync.html = FAIL
-BUG18089 LINUX MAC : LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-sync-double.html = FAIL
-BUG18089 LINUX : LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-sync.html = FAIL
-BUG18089 LINUX MAC : LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-unsafe-redirect.html = FAIL
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
index a7d27a0..79eadbe 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
@@ -429,7 +429,7 @@ class SyncRequestProxy : public RequestProxy {
// doing so requires API changes at all levels. Similar code exists in
// WebCore/platform/network/cf/ResourceHandleCFNet.cpp :-(
if (new_url.GetOrigin() != result_->url.GetOrigin()) {
- LOG(ERROR) << "Cross origin redirect denied";
+ DLOG(WARNING) << "Cross origin redirect denied";
Cancel();
return;
}