summaryrefslogtreecommitdiffstats
path: root/third_party/WebKit/LayoutTests/fast/xmlhttprequest
diff options
context:
space:
mode:
authorvsevik@chromium.org <vsevik@chromium.org>2014-09-04 11:31:10 +0000
committervsevik@chromium.org <vsevik@chromium.org>2014-09-04 11:31:10 +0000
commit2e52bf8141f4501c06ae78bf68c46afba820be05 (patch)
tree16f35bbdd2a2277889d936be76796c68926fda0d /third_party/WebKit/LayoutTests/fast/xmlhttprequest
parent873a775a36155388d4ae57ee841e4b6a30c00356 (diff)
downloadchromium_src-2e52bf8141f4501c06ae78bf68c46afba820be05.zip
chromium_src-2e52bf8141f4501c06ae78bf68c46afba820be05.tar.gz
chromium_src-2e52bf8141f4501c06ae78bf68c46afba820be05.tar.bz2
Revert "DevTools: Added correct line and url to console messages reported to embedder." (breaks multiple tests)
TBR=kozyatinskiy This reverts commit c1e6f4baa282563f21a3cec81ba8fb0bae00534d. BUG= Review URL: https://codereview.chromium.org/542623004 git-svn-id: svn://svn.chromium.org/blink/trunk@181366 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/LayoutTests/fast/xmlhttprequest')
-rw-r--r--third_party/WebKit/LayoutTests/fast/xmlhttprequest/set-dangerous-headers-local-expected.txt54
-rw-r--r--third_party/WebKit/LayoutTests/fast/xmlhttprequest/xmlhttprequest-no-file-access-expected.txt2
-rw-r--r--third_party/WebKit/LayoutTests/fast/xmlhttprequest/xmlhttprequest-open-exceptions-expected.txt2
3 files changed, 29 insertions, 29 deletions
diff --git a/third_party/WebKit/LayoutTests/fast/xmlhttprequest/set-dangerous-headers-local-expected.txt b/third_party/WebKit/LayoutTests/fast/xmlhttprequest/set-dangerous-headers-local-expected.txt
index 599eaab..0477ebb 100644
--- a/third_party/WebKit/LayoutTests/fast/xmlhttprequest/set-dangerous-headers-local-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/xmlhttprequest/set-dangerous-headers-local-expected.txt
@@ -1,30 +1,30 @@
-CONSOLE ERROR: line 17: Refused to set unsafe header "ACCEPT-CHARSET"
-CONSOLE ERROR: line 18: Refused to set unsafe header "ACCEPT-ENCODING"
-CONSOLE ERROR: line 19: Refused to set unsafe header "ACCESS-CONTROL-REQUEST-HEADERS"
-CONSOLE ERROR: line 20: Refused to set unsafe header "ACCESS-CONTROL-REQUEST-METHOD"
-CONSOLE ERROR: line 26: Refused to set unsafe header "CONNECTION"
-CONSOLE ERROR: line 27: Refused to set unsafe header "CONTENT-LENGTH"
-CONSOLE ERROR: line 28: Refused to set unsafe header "COOKIE"
-CONSOLE ERROR: line 29: Refused to set unsafe header "COOKIE2"
-CONSOLE ERROR: line 30: Refused to set unsafe header "DATE"
-CONSOLE ERROR: line 31: Refused to set unsafe header "DNT"
-CONSOLE ERROR: line 32: Refused to set unsafe header "EXPECT"
-CONSOLE ERROR: line 33: Refused to set unsafe header "HOST"
-CONSOLE ERROR: line 34: Refused to set unsafe header "KEEP-ALIVE"
-CONSOLE ERROR: line 35: Refused to set unsafe header "ORIGIN"
-CONSOLE ERROR: line 36: Refused to set unsafe header "REFERER"
-CONSOLE ERROR: line 37: Refused to set unsafe header "TE"
-CONSOLE ERROR: line 38: Refused to set unsafe header "TRAILER"
-CONSOLE ERROR: line 39: Refused to set unsafe header "TRANSFER-ENCODING"
-CONSOLE ERROR: line 40: Refused to set unsafe header "UPGRADE"
-CONSOLE ERROR: line 41: Refused to set unsafe header "USER-AGENT"
-CONSOLE ERROR: line 42: Refused to set unsafe header "VIA"
-CONSOLE ERROR: line 44: Refused to set unsafe header "Proxy-"
-CONSOLE ERROR: line 45: Refused to set unsafe header "Proxy-test"
-CONSOLE ERROR: line 46: Refused to set unsafe header "PROXY-FOO"
-CONSOLE ERROR: line 48: Refused to set unsafe header "Sec-"
-CONSOLE ERROR: line 49: Refused to set unsafe header "Sec-test"
-CONSOLE ERROR: line 50: Refused to set unsafe header "SEC-FOO"
+CONSOLE ERROR: Refused to set unsafe header "ACCEPT-CHARSET"
+CONSOLE ERROR: Refused to set unsafe header "ACCEPT-ENCODING"
+CONSOLE ERROR: Refused to set unsafe header "ACCESS-CONTROL-REQUEST-HEADERS"
+CONSOLE ERROR: Refused to set unsafe header "ACCESS-CONTROL-REQUEST-METHOD"
+CONSOLE ERROR: Refused to set unsafe header "CONNECTION"
+CONSOLE ERROR: Refused to set unsafe header "CONTENT-LENGTH"
+CONSOLE ERROR: Refused to set unsafe header "COOKIE"
+CONSOLE ERROR: Refused to set unsafe header "COOKIE2"
+CONSOLE ERROR: Refused to set unsafe header "DATE"
+CONSOLE ERROR: Refused to set unsafe header "DNT"
+CONSOLE ERROR: Refused to set unsafe header "EXPECT"
+CONSOLE ERROR: Refused to set unsafe header "HOST"
+CONSOLE ERROR: Refused to set unsafe header "KEEP-ALIVE"
+CONSOLE ERROR: Refused to set unsafe header "ORIGIN"
+CONSOLE ERROR: Refused to set unsafe header "REFERER"
+CONSOLE ERROR: Refused to set unsafe header "TE"
+CONSOLE ERROR: Refused to set unsafe header "TRAILER"
+CONSOLE ERROR: Refused to set unsafe header "TRANSFER-ENCODING"
+CONSOLE ERROR: Refused to set unsafe header "UPGRADE"
+CONSOLE ERROR: Refused to set unsafe header "USER-AGENT"
+CONSOLE ERROR: Refused to set unsafe header "VIA"
+CONSOLE ERROR: Refused to set unsafe header "Proxy-"
+CONSOLE ERROR: Refused to set unsafe header "Proxy-test"
+CONSOLE ERROR: Refused to set unsafe header "PROXY-FOO"
+CONSOLE ERROR: Refused to set unsafe header "Sec-"
+CONSOLE ERROR: Refused to set unsafe header "Sec-test"
+CONSOLE ERROR: Refused to set unsafe header "SEC-FOO"
Test that setRequestHeader cannot be used to alter security-sensitive headers for file:// urls.
SUCCESS
diff --git a/third_party/WebKit/LayoutTests/fast/xmlhttprequest/xmlhttprequest-no-file-access-expected.txt b/third_party/WebKit/LayoutTests/fast/xmlhttprequest/xmlhttprequest-no-file-access-expected.txt
index 9fb8e999..2a990f2 100644
--- a/third_party/WebKit/LayoutTests/fast/xmlhttprequest/xmlhttprequest-no-file-access-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/xmlhttprequest/xmlhttprequest-no-file-access-expected.txt
@@ -1,3 +1,3 @@
-CONSOLE ERROR: line 23: XMLHttpRequest cannot load xmlhttprequest-no-file-access-expected.txt. Cross origin requests are only supported for protocol schemes: http, data, https.
+CONSOLE ERROR: XMLHttpRequest cannot load xmlhttprequest-no-file-access-expected.txt. Cross origin requests are only supported for protocol schemes: http, data, https.
The child iframe cannot paste its textual results into this iframe because it is considered a different domain - that's the point of this test! Therefore, success is denoted by the child iframe calling notifyDone. The test will hang if something goes amiss with the access control checks.
diff --git a/third_party/WebKit/LayoutTests/fast/xmlhttprequest/xmlhttprequest-open-exceptions-expected.txt b/third_party/WebKit/LayoutTests/fast/xmlhttprequest/xmlhttprequest-open-exceptions-expected.txt
index 1da48a0..a34bf3c 100644
--- a/third_party/WebKit/LayoutTests/fast/xmlhttprequest/xmlhttprequest-open-exceptions-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/xmlhttprequest/xmlhttprequest-open-exceptions-expected.txt
@@ -1,4 +1,4 @@
-CONSOLE ERROR: line 23: Refused to connect to 'http://not.example.com/' because it violates the following Content Security Policy directive: "connect-src http://example.com".
+CONSOLE ERROR: Refused to connect to 'http://not.example.com/' because it violates the following Content Security Policy directive: "connect-src http://example.com".
This tests that exceptions thrown by XHR.open() have reasonable messages.