From 8b10a1b381e381ce3d82716085c6477eb9127ffc Mon Sep 17 00:00:00 2001
From: Yoav Weiss <yoav@yoav.ws>
Date: Wed, 6 Jun 2018 16:48:24 +0000
Subject: [PATCH] Bug 1459140 [wpt PR 10840] - [Resource-Timing] Fix
 `initiatorType` values, a=testonly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Automatic update from web-platform-tests[Resource-Timing] Fix `initiatorType` values

There were multiple issues with current `initiatorType` implementation:
* `fetch()` resources had an empty value instead of "fetch"
* `<video>` resources had an empty value instead of "video"
* `<audio>` resources had an empty value instead of "audio"
* `<track>` resources had "texttrack" value instead of "track"
* EventSource resources had an empty value instead of "other"

On top of that, the test to make sure the above is all in check had
some values that were not aligned to the spec, and was disabled due to
the flakiness of audio and video loads.

This CL fixes the above values, fixes the test to be more spec
compliant and enables it.

Bug: 649571, 822757
Change-Id: I1dc6fd35e5e4bc570cbbb7d743dc02279bf42b8b
Reviewed-on: https://chromium-review.googlesource.com/1040925
Commit-Queue: Yoav Weiss <yoav@yoav.ws>
Reviewed-by: Timothy Dresser <tdresser@chromium.org>
Reviewed-by: Nicolás Peña Moreno <npm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562221}

--

wpt-commits: 0d81b471c71053f3b871a47414233c8f06732e78
wpt-pr: 10840
---
 testing/web-platform/meta/MANIFEST.json            |  2 +-
 .../resource-timing/resource_initiator_types.html  | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index 2c11e977e003..f99ae3a5a333 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -600419,7 +600419,7 @@
    "testharness"
   ],
   "resource-timing/resource_initiator_types.html": [
-   "b05a2dfad953398d6b31f11055606f2f3694a9af",
+   "7cb0db4825afda3877fc183279adc58dca0399ea",
    "testharness"
   ],
   "resource-timing/resource_memory_cached.sub.html": [
diff --git a/testing/web-platform/tests/resource-timing/resource_initiator_types.html b/testing/web-platform/tests/resource-timing/resource_initiator_types.html
index d593f13db7e2..9912da7c3400 100644
--- a/testing/web-platform/tests/resource-timing/resource_initiator_types.html
+++ b/testing/web-platform/tests/resource-timing/resource_initiator_types.html
@@ -111,14 +111,14 @@ function perform_test() {
     addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=object', 'object');
     addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=video-poster', 'video');
     addEntryIfExists(entries, expected_entries, '/media/test.mp4?id=video-src', 'video');
-    addEntryIfExists(entries, expected_entries, '/media/test.mp4?id=video-source', 'source');
-    addEntryIfExists(entries, expected_entries, '/media/test.ogv?id=video-source', 'source');
+    addEntryIfExists(entries, expected_entries, '/media/test.mp4?id=video-source', 'video');
+    addEntryIfExists(entries, expected_entries, '/media/test.ogv?id=video-source', 'video');
     addEntryIfExists(entries, expected_entries, pathname + 'empty.py?id=video-track', 'track');
     addEntryIfExists(entries, expected_entries, pathname + 'empty.py?id=audio-src', 'audio');
-    addEntryIfExists(entries, expected_entries, pathname + 'empty.py?id=audio-source-wav', 'source');
-    addEntryIfExists(entries, expected_entries, pathname + 'empty.py?id=audio-source-mpeg', 'source');
-    addEntryIfExists(entries, expected_entries, pathname + 'empty.py?id=audio-source-ogg', 'source');
-    addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=picture-source', 'source');
+    addEntryIfExists(entries, expected_entries, pathname + 'empty.py?id=audio-source-wav', 'audio');
+    addEntryIfExists(entries, expected_entries, pathname + 'empty.py?id=audio-source-mpeg', 'audio');
+    addEntryIfExists(entries, expected_entries, pathname + 'empty.py?id=audio-source-ogg', 'audio');
+    addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=picture-source', 'img');
     addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=picture-img', 'img');
     addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=picture-notsupported-img', 'img');
     addEntryIfExists(entries, expected_entries, pathname + 'blue.png?id=picture-img-src', 'img');
@@ -133,7 +133,7 @@ function perform_test() {
     addEntryIfExists(entries, expected_entries, pathname + 'empty.py?id=beacon', 'beacon');
     addEntryIfExists(entries, expected_entries, pathname + 'empty.py?id=fetch', 'fetch');
     addEntryIfExists(entries, expected_entries, pathname + 'empty.py?favicon', 'link');
-    addEntryIfExists(entries, expected_entries, pathname + 'eventsource.py?id=eventsource', 'eventsource');
+    addEntryIfExists(entries, expected_entries, pathname + 'eventsource.py?id=eventsource', 'other');
 
     test_resource_entries(entries, expected_entries);
     done();