Index: third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect-password.js |
diff --git a/third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect-password.js b/third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect-password.js |
index bd05de61c6fc9a72397e354642e4a78962391b26..d0fc2e1268e2292adea49cad6579aba8a63ae082 100644 |
--- a/third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect-password.js |
+++ b/third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect-password.js |
@@ -16,27 +16,33 @@ var TEST_TARGETS = [ |
// Origin A -[fetch]-> Origin A -[redirect]-> Origin A |
[REDIRECT_URL + encodeURIComponent(BASE_URL_WITH_USERNAME) + |
'&mode=same-origin&method=GET', |
- [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic], |
+ [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic, |
+ checkURLList.bind(self, [BASE_URL_WITH_USERNAME])], |
[methodIsGET]], |
[REDIRECT_URL + encodeURIComponent(BASE_URL_WITH_PASSWORD) + |
'&mode=same-origin&method=GET', |
- [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic], |
+ [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic, |
+ checkURLList.bind(self, [BASE_URL_WITH_PASSWORD])], |
[methodIsGET]], |
[REDIRECT_URL + encodeURIComponent(BASE_URL_WITH_USERNAME) + |
'&mode=cors&method=GET', |
- [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic], |
+ [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic, |
+ checkURLList.bind(self, [BASE_URL_WITH_USERNAME])], |
[methodIsGET]], |
[REDIRECT_URL + encodeURIComponent(BASE_URL_WITH_PASSWORD) + |
'&mode=cors&method=GET', |
- [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic], |
+ [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic, |
+ checkURLList.bind(self, [BASE_URL_WITH_PASSWORD])], |
[methodIsGET]], |
[REDIRECT_URL + encodeURIComponent(BASE_URL_WITH_USERNAME) + |
'&mode=no-cors&method=GET', |
- [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic], |
+ [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic, |
+ checkURLList.bind(self, [BASE_URL_WITH_USERNAME])], |
[methodIsGET]], |
[REDIRECT_URL + encodeURIComponent(BASE_URL_WITH_PASSWORD) + |
'&mode=no-cors&method=GET', |
- [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic], |
+ [fetchResolved, hasContentLength, hasServerHeader, hasBody, typeBasic, |
+ checkURLList.bind(self, [BASE_URL_WITH_PASSWORD])], |
[methodIsGET]], |
// Origin A -[fetch]-> Origin A -[redirect]-> Origin B |
@@ -51,12 +57,14 @@ var TEST_TARGETS = [ |
[REDIRECT_URL + |
encodeURIComponent(OTHER_BASE_URL_WITH_USERNAME + '&ACAOrigin=*') + |
'&mode=no-cors&method=GET', |
- [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque], |
+ [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque, |
+ checkURLList.bind(self, [OTHER_BASE_URL_WITH_USERNAME + '&ACAOrigin=*'])], |
onlyOnServiceWorkerProxiedTest([methodIsGET])], |
[REDIRECT_URL + |
encodeURIComponent(OTHER_BASE_URL_WITH_PASSWORD + '&ACAOrigin=*') + |
'&mode=no-cors&method=GET', |
- [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque], |
+ [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque, |
+ checkURLList.bind(self, [OTHER_BASE_URL_WITH_PASSWORD + '&ACAOrigin=*'])], |
onlyOnServiceWorkerProxiedTest([methodIsGET])], |
// Origin A -[fetch]-> Origin B -[redirect]-> Origin A |
@@ -71,12 +79,14 @@ var TEST_TARGETS = [ |
[OTHER_REDIRECT_URL + |
encodeURIComponent(BASE_URL_WITH_USERNAME + 'ACAOrigin=*') + |
'&mode=no-cors&method=GET&ACAOrigin=*', |
- [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque], |
+ [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque, |
+ checkURLList.bind(self, [BASE_URL_WITH_USERNAME + 'ACAOrigin=*'])], |
onlyOnServiceWorkerProxiedTest([methodIsGET])], |
[OTHER_REDIRECT_URL + |
encodeURIComponent(BASE_URL_WITH_PASSWORD + 'ACAOrigin=*') + |
'&mode=no-cors&method=GET&ACAOrigin=*', |
- [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque], |
+ [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque, |
+ checkURLList.bind(self, [BASE_URL_WITH_PASSWORD + 'ACAOrigin=*'])], |
onlyOnServiceWorkerProxiedTest([methodIsGET])], |
// Origin A -[fetch]-> Origin B -[redirect]-> Origin B |
@@ -91,12 +101,14 @@ var TEST_TARGETS = [ |
[OTHER_REDIRECT_URL + |
encodeURIComponent(OTHER_BASE_URL_WITH_USERNAME + 'ACAOrigin=*') + |
'&mode=no-cors&method=GET&ACAOrigin=*', |
- [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque], |
+ [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque, |
+ checkURLList.bind(self, [OTHER_BASE_URL_WITH_USERNAME + 'ACAOrigin=*'])], |
onlyOnServiceWorkerProxiedTest([methodIsGET])], |
[OTHER_REDIRECT_URL + |
encodeURIComponent(OTHER_BASE_URL_WITH_PASSWORD + 'ACAOrigin=*') + |
'&mode=no-cors&method=GET&ACAOrigin=*', |
- [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque], |
+ [fetchResolved, noContentLength, noServerHeader, noBody, typeOpaque, |
+ checkURLList.bind(self, [OTHER_BASE_URL_WITH_PASSWORD + 'ACAOrigin=*'])], |
onlyOnServiceWorkerProxiedTest([methodIsGET])], |
]; |