From 2d5ddb141df0e79a6dc89c9a3b51f15cfa992296 Mon Sep 17 00:00:00 2001
From: Yoav Weiss <yoavweiss@chromium.org>
Date: Thu, 31 Jan 2019 18:56:04 +0000
Subject: [PATCH] Bug 1523562 [wpt PR 14892] - [Resource-Timing] `name` is
 wrong for http to https redirection, a=testonly
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Automatic update from web-platform-tests
[Resource-Timing] `name` is wrong for http to https redirection

According to the spec, the `name` attribute MUST provide the
pre-redirection URL. In the case of http=>https redirections,
that's not the case and the post-redirection URL is provided.
This CL fixes that.

BUG=922365

Change-Id: Ic9acf354ef66d654ab41259aa0af297a56e775ce
Reviewed-on: https://chromium-review.googlesource.com/c/1411929
Commit-Queue: Yoav Weiss <yoavweiss@chromium.org>
Reviewed-by: Nicolás Peña Moreno <npm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#623293}

--

wpt-commits: ad31e18666441d0bd24a9314bc71468c9993650f
wpt-pr: 14892
---
 .../{resource_redirects.html => redirects.sub.html} | 21 ++++++++++++++-------
 .../resources/blank_page_green.htm.headers          |  1 +
 2 files changed, 15 insertions(+), 7 deletions(-)
 rename testing/web-platform/tests/resource-timing/{resource_redirects.html => redirects.sub.html} (64%)
 create mode 100644 testing/web-platform/tests/resource-timing/resources/blank_page_green.htm.headers

diff --git a/testing/web-platform/tests/resource-timing/resource_redirects.html b/testing/web-platform/tests/resource-timing/redirects.sub.html
similarity index 64%
rename from testing/web-platform/tests/resource-timing/resource_redirects.html
rename to testing/web-platform/tests/resource-timing/redirects.sub.html
index 606662afda44..0e3f405e14b7 100644
--- a/testing/web-platform/tests/resource-timing/resource_redirects.html
+++ b/testing/web-platform/tests/resource-timing/redirects.sub.html
@@ -11,16 +11,22 @@
 <script src="resources/webperftestharnessextension.js"></script>
 <script>
 let iframe;
+const redirect_url = 'common/redirect.py';
+const url_prefix = redirect_url + '?location=/resource-timing/resources/';
+const https_url_prefix = redirect_url + '?location=https://{{hosts[][www]}}:{{ports[https][0]}}/resource-timing/resources/';
 function setup_iframe() {
     const iframe_content =
-        '<link rel="stylesheet" href="/common/redirect.py?location=/resource-timing/resources/resource_timing_test0.css"></link>' +
-        '<img src="/common/redirect.py?location=/resource-timing/resources/blue.png"></img>' +
-        '<iframe src="/common/redirect.py?location=/resource-timing/resources/blank_page_green.htm"></iframe>' +
-        '<script src="/common/redirect.py?location=/resource-timing/resources/empty_script.js"></scr' + 'ipt>' +
+        '<link rel="stylesheet" href="/' + url_prefix + 'resource_timing_test0.css"></link>' +
+        '<img src="/' + url_prefix + 'blue.png"></img>' +
+        '<iframe src="/' + url_prefix + 'blank_page_green.htm"></iframe>' +
+        '<script src="/' + url_prefix + 'empty_script.js"></scr' + 'ipt>' +
         '<scr' + 'ipt>' +
         'const xhr = new XMLHttpRequest;' +
-        'xhr.open("GET", "/common/redirect.py?location=/resource-timing/resources/blank_page_green.htm?id=xhr", false);' +
+        'xhr.open("GET", "/' + url_prefix + 'blank_page_green.htm?id=xhr", false);' +
         'xhr.send();' +
+        'const xhr2 = new XMLHttpRequest;' +
+        'xhr2.open("GET", "/' + https_url_prefix + 'blank_page_green.htm?id=xhr", false);' +
+        'xhr2.send();' +
         '</scr' + 'ipt>';
     iframe = document.getElementById('frameContext');
     iframe.contentWindow.document.write(iframe_content);
@@ -30,14 +36,15 @@ function onload_test() {
     const entries = context.getEntriesByType('resource');
 
     const index = window.location.pathname.lastIndexOf('resource-timing');
-    const pathname = window.location.pathname.substring(0, index) +
-        'common/redirect.py?location=/resource-timing/resources/';
+    const pathname = window.location.pathname.substring(0, index) + url_prefix;
+    const https_pathname = window.location.pathname.substring(0, index) + https_url_prefix;
     let expected_entries = {};
     expected_entries[pathname + 'resource_timing_test0.css'] = 'link';
     expected_entries[pathname + 'blue.png'] = 'img';
     expected_entries[pathname + 'blank_page_green.htm'] = 'iframe';
     expected_entries[pathname + 'empty_script.js'] = 'script';
     expected_entries[pathname + 'blank_page_green.htm?id=xhr'] = 'xmlhttprequest';
+    expected_entries[https_pathname + 'blank_page_green.htm?id=xhr'] = 'xmlhttprequest';
 
     test_resource_entries(entries, expected_entries);
 }
diff --git a/testing/web-platform/tests/resource-timing/resources/blank_page_green.htm.headers b/testing/web-platform/tests/resource-timing/resources/blank_page_green.htm.headers
new file mode 100644
index 000000000000..cb762eff8068
--- /dev/null
+++ b/testing/web-platform/tests/resource-timing/resources/blank_page_green.htm.headers
@@ -0,0 +1 @@
+Access-Control-Allow-Origin: *
-- 
2.11.4.GIT