Move all tests under http/tests/loading/resourceLoadStatistics/ to http/tests/resourc...
authorwilander@apple.com <wilander@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Dec 2017 20:09:27 +0000 (20:09 +0000)
committerwilander@apple.com <wilander@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Dec 2017 20:09:27 +0000 (20:09 +0000)
https://bugs.webkit.org/show_bug.cgi?id=180502
<rdar://problem/35891216>

Reviewed by Brent Fulgham.

This change moves all tests under http/tests/loading/resourceLoadStatistics/ to http/tests/resourceLoadStatistics/
and removes expected failures.
The one exception is the full removal of
http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-network-process-crash.html
which never seems to have worked properly. Follow-up work for this is tracked in <rdar://problem/35887722>.

* http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics.html: Removed.
* http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins.html: Removed.
* http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins.html: Removed.
* http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to.html: Removed.
* http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics.html: Removed.
* http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins.html: Removed.
* http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins.html: Removed.
* http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to.html: Removed.
* http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html: Removed.
* http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store.html: Removed.
* http/tests/loading/resourceLoadStatistics/grandfathering-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/grandfathering.html: Removed.
* http/tests/loading/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/non-prevalent-resource-with-user-interaction.html: Removed.
* http/tests/loading/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/non-prevalent-resource-without-user-interaction.html: Removed.
* http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion.html: Removed.
* http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-network-process-crash-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-network-process-crash.html: Removed.
    This test is not being added back under http/tests/resourceLoadStatistics/ since it doesn't seem to work.
    Follow-up work for this is tracked in <rdar://problem/35887722>.
* http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html: Removed.
* http/tests/loading/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html: Removed.
* http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout.html: Removed.
* http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction.html: Removed.
* http/tests/loading/resourceLoadStatistics/prevalent-resource-without-user-interaction-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/prevalent-resource-without-user-interaction.html: Removed.
* http/tests/loading/resourceLoadStatistics/prune-statistics-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/prune-statistics.html: Removed.
* http/tests/loading/resourceLoadStatistics/telemetry-generation-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/telemetry-generation.html: Removed.
* http/tests/loading/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html: Removed.
* http/tests/loading/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame.html: Removed.
* http/tests/loading/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time.html: Removed.
* http/tests/loading/resourceLoadStatistics/user-interaction-reported-after-website-data-removal-expected.txt: Removed.
* http/tests/loading/resourceLoadStatistics/user-interaction-reported-after-website-data-removal.html: Removed.
* http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-expected.txt.
* http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics.html.
* http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt.
* http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins.html.
* http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-expected.txt.
* http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins.html.
* http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-expected.txt.
* http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to.html.
* http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-expected.txt.
* http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics.html.
* http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt.
* http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins.html.
* http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-expected.txt.
* http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins.html.
* http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-expected.txt.
* http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to.html.
* http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-expected.txt.
* http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-expected.txt.
* http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html.
* http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store.html.
* http/tests/resourceLoadStatistics/grandfathering-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/grandfathering-expected.txt.
* http/tests/resourceLoadStatistics/grandfathering.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/grandfathering.html.
* http/tests/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-expected.txt.
* http/tests/resourceLoadStatistics/non-prevalent-resource-with-user-interaction.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/non-prevalent-resource-with-user-interaction.html.
* http/tests/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-expected.txt.
* http/tests/resourceLoadStatistics/non-prevalent-resource-without-user-interaction.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/non-prevalent-resource-without-user-interaction.html.
* http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion-expected.txt.
* http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion.html.
* http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt.
* http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html.
* http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt.
* http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html.
* http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-expected.txt.
* http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-expected.txt.
* http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout.html.
* http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction.html.
* http/tests/resourceLoadStatistics/prevalent-resource-without-user-interaction-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-without-user-interaction-expected.txt.
* http/tests/resourceLoadStatistics/prevalent-resource-without-user-interaction.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-without-user-interaction.html.
* http/tests/resourceLoadStatistics/prune-statistics-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/prune-statistics-expected.txt.
* http/tests/resourceLoadStatistics/prune-statistics.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/prune-statistics.html.
* http/tests/resourceLoadStatistics/resources/get-cookies.php:
* http/tests/resourceLoadStatistics/telemetry-generation-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/telemetry-generation-expected.txt.
* http/tests/resourceLoadStatistics/telemetry-generation.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/telemetry-generation.html.
* http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt.
* http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html.
* http/tests/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame-expected.txt.
* http/tests/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame.html.
* http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-expected.txt.
* http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time.html.
* http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/user-interaction-reported-after-website-data-removal-expected.txt.
* http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/user-interaction-reported-after-website-data-removal.html.
* platform/ios/TestExpectations:
    Removed 'loading' directory from path and made sure no tests are expected to fail.
    Skipped tests that rely on UIHelper.activateAt() since it doesn't produce a user
    gesture that ITP captures on iOS.
* platform/mac-wk2/TestExpectations:
    Removed 'loading' directory from path and made sure no tests are expected to fail.
* platform/wk2/TestExpectations:
    Removed 'loading' directory from path and made sure no tests are expected to fail.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@225640 268f45cc-cd09-0410-ab3c-d52691b4dbfc

77 files changed:
LayoutTests/ChangeLog
LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-expected.txt [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-expected.txt [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-expected.txt [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-expected.txt [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-expected.txt [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-expected.txt [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-expected.txt [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-expected.txt [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/grandfathering-expected.txt [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-expected.txt [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-expected.txt [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion-expected.txt [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-network-process-crash-expected.txt [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-network-process-crash.html [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-expected.txt [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-expected.txt [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-without-user-interaction-expected.txt [deleted file]
LayoutTests/http/tests/loading/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics.html with 100% similarity]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins.html with 100% similarity]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins.html with 100% similarity]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to.html with 100% similarity]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics.html with 100% similarity]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins.html with 100% similarity]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins.html with 100% similarity]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to.html with 100% similarity]
LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html with 100% similarity]
LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store.html with 100% similarity]
LayoutTests/http/tests/resourceLoadStatistics/grandfathering-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/resourceLoadStatistics/grandfathering.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/grandfathering.html with 94% similarity]
LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resource-with-user-interaction.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/non-prevalent-resource-with-user-interaction.html with 100% similarity]
LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resource-without-user-interaction.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/non-prevalent-resource-without-user-interaction.html with 100% similarity]
LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion.html with 96% similarity]
LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html with 92% similarity]
LayoutTests/http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html with 93% similarity]
LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout.html with 100% similarity]
LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction.html with 100% similarity]
LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-without-user-interaction-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-without-user-interaction.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-without-user-interaction.html with 81% similarity]
LayoutTests/http/tests/resourceLoadStatistics/prune-statistics-expected.txt [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/prune-statistics-expected.txt with 61% similarity]
LayoutTests/http/tests/resourceLoadStatistics/prune-statistics.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/prune-statistics.html with 100% similarity]
LayoutTests/http/tests/resourceLoadStatistics/resources/get-cookies.php
LayoutTests/http/tests/resourceLoadStatistics/telemetry-generation-expected.txt [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/telemetry-generation-expected.txt with 70% similarity]
LayoutTests/http/tests/resourceLoadStatistics/telemetry-generation.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/telemetry-generation.html with 100% similarity]
LayoutTests/http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt [new file with mode: 0644]
LayoutTests/http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html with 71% similarity]
LayoutTests/http/tests/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame-expected.txt [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame-expected.txt with 55% similarity]
LayoutTests/http/tests/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame.html with 92% similarity]
LayoutTests/http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-expected.txt [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-expected.txt with 80% similarity]
LayoutTests/http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time.html with 100% similarity]
LayoutTests/http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal-expected.txt [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/user-interaction-reported-after-website-data-removal-expected.txt with 80% similarity]
LayoutTests/http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal.html [moved from LayoutTests/http/tests/loading/resourceLoadStatistics/user-interaction-reported-after-website-data-removal.html with 100% similarity]
LayoutTests/platform/ios/TestExpectations
LayoutTests/platform/mac-wk2/TestExpectations
LayoutTests/platform/wk2/TestExpectations

index da533a7..ac19642 100644 (file)
@@ -1,3 +1,131 @@
+2017-12-07  John Wilander  <wilander@apple.com>
+
+        Move all tests under http/tests/loading/resourceLoadStatistics/ to http/tests/resourceLoadStatistics/ and remove expected failures
+        https://bugs.webkit.org/show_bug.cgi?id=180502
+        <rdar://problem/35891216>
+
+        Reviewed by Brent Fulgham.
+
+        This change moves all tests under http/tests/loading/resourceLoadStatistics/ to http/tests/resourceLoadStatistics/
+        and removes expected failures.
+        The one exception is the full removal of
+        http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-network-process-crash.html
+        which never seems to have worked properly. Follow-up work for this is tracked in <rdar://problem/35887722>.
+
+        * http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/grandfathering-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/grandfathering.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/non-prevalent-resource-with-user-interaction.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/non-prevalent-resource-without-user-interaction.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-network-process-crash-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-network-process-crash.html: Removed.
+            This test is not being added back under http/tests/resourceLoadStatistics/ since it doesn't seem to work.
+            Follow-up work for this is tracked in <rdar://problem/35887722>.
+        * http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/prevalent-resource-without-user-interaction-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/prevalent-resource-without-user-interaction.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/prune-statistics-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/prune-statistics.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/telemetry-generation-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/telemetry-generation.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time.html: Removed.
+        * http/tests/loading/resourceLoadStatistics/user-interaction-reported-after-website-data-removal-expected.txt: Removed.
+        * http/tests/loading/resourceLoadStatistics/user-interaction-reported-after-website-data-removal.html: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-expected.txt.
+        * http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics.html.
+        * http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt.
+        * http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins.html.
+        * http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-expected.txt.
+        * http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins.html.
+        * http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-expected.txt.
+        * http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to.html.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-expected.txt.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics.html.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins.html.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-expected.txt.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins.html.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-expected.txt.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to.html.
+        * http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-expected.txt.
+        * http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-expected.txt.
+        * http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html.
+        * http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store.html.
+        * http/tests/resourceLoadStatistics/grandfathering-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/grandfathering-expected.txt.
+        * http/tests/resourceLoadStatistics/grandfathering.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/grandfathering.html.
+        * http/tests/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-expected.txt.
+        * http/tests/resourceLoadStatistics/non-prevalent-resource-with-user-interaction.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/non-prevalent-resource-with-user-interaction.html.
+        * http/tests/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-expected.txt.
+        * http/tests/resourceLoadStatistics/non-prevalent-resource-without-user-interaction.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/non-prevalent-resource-without-user-interaction.html.
+        * http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion-expected.txt.
+        * http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion.html.
+        * http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt.
+        * http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html.
+        * http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt.
+        * http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html.
+        * http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-expected.txt.
+        * http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-expected.txt.
+        * http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout.html.
+        * http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction.html.
+        * http/tests/resourceLoadStatistics/prevalent-resource-without-user-interaction-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-without-user-interaction-expected.txt.
+        * http/tests/resourceLoadStatistics/prevalent-resource-without-user-interaction.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-without-user-interaction.html.
+        * http/tests/resourceLoadStatistics/prune-statistics-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/prune-statistics-expected.txt.
+        * http/tests/resourceLoadStatistics/prune-statistics.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/prune-statistics.html.
+        * http/tests/resourceLoadStatistics/resources/get-cookies.php:
+        * http/tests/resourceLoadStatistics/telemetry-generation-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/telemetry-generation-expected.txt.
+        * http/tests/resourceLoadStatistics/telemetry-generation.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/telemetry-generation.html.
+        * http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt.
+        * http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html.
+        * http/tests/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame-expected.txt.
+        * http/tests/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame.html.
+        * http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-expected.txt.
+        * http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time.html.
+        * http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal-expected.txt: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/user-interaction-reported-after-website-data-removal-expected.txt.
+        * http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal.html: Copied from LayoutTests/http/tests/loading/resourceLoadStatistics/user-interaction-reported-after-website-data-removal.html.
+        * platform/ios/TestExpectations:
+            Removed 'loading' directory from path and made sure no tests are expected to fail.
+            Skipped tests that rely on UIHelper.activateAt() since it doesn't produce a user
+            gesture that ITP captures on iOS.
+        * platform/mac-wk2/TestExpectations:
+            Removed 'loading' directory from path and made sure no tests are expected to fail.
+        * platform/wk2/TestExpectations:
+            Removed 'loading' directory from path and made sure no tests are expected to fail.
+
 2017-12-07  David Quesada  <david_quesada@apple.com>
 
         [Web App Manifest] Support display-mode media feature
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-expected.txt
deleted file mode 100644 (file)
index 1d28dd7..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Classification Based on Mixed Statistics
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Host did not get classified as prevalent resource.
-
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt
deleted file mode 100644 (file)
index ed0973a..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Classification Based on Sub Frame Under Top Frame Origins
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Host did not get classified as prevalent resource.
-
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-expected.txt
deleted file mode 100644 (file)
index 60fa2af..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Classification Based on Subresource Under Top Frame Origins
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Host did not get classified as prevalent resource.
-
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-expected.txt
deleted file mode 100644 (file)
index 9cf0948..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Classification Based on Subresource Unique Redirects To
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Host did not get classified as prevalent resource.
-
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-expected.txt
deleted file mode 100644 (file)
index a294285..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Classification Based on Mixed Statistics
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Host classified as prevalent resource.
-
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt
deleted file mode 100644 (file)
index 8c97c93..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Classification Based on Sub Frame Under Top Frame Origins
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Host classified as prevalent resource.
-
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-expected.txt
deleted file mode 100644 (file)
index 11d43bf..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Classification Based on Subresource Under Top Frame Origins
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Host classified as prevalent resource.
-
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-expected.txt
deleted file mode 100644 (file)
index f3a11ce..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Classification Based on Subresource Unique Redirects To
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Host classified as prevalent resource.
-
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-expected.txt
deleted file mode 100644 (file)
index 6655bdf..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Test Cleared Store
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Host classified as prevalent resource.
-PASS Host is no longer a prevalent resource after the store was cleared.
-
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-expected.txt
deleted file mode 100644 (file)
index 6655bdf..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Test Cleared Store
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Host classified as prevalent resource.
-PASS Host is no longer a prevalent resource after the store was cleared.
-
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/grandfathering-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/grandfathering-expected.txt
deleted file mode 100644 (file)
index 2c16c6e..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Test for Grandfathering
-main frame - didChangeLocationWithinPageForFrame
-main frame - willPerformClientRedirectToURL: http://localhost:8000/loading/resourceLoadStatistics/resources/set-cookie.php?name=firstPartyCookie&value=value#http://localhost:8000/loading/resourceLoadStatistics/grandfathering.html#step2 
-main frame - didFinishDocumentLoadForFrame
-main frame - didFinishLoadForFrame
-main frame - didStartProvisionalLoadForFrame
-main frame - didCancelClientRedirectForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - willPerformClientRedirectToURL: http://localhost:8000/loading/resourceLoadStatistics/grandfathering.html#step2 
-main frame - didStartProvisionalLoadForFrame
-main frame - didCancelClientRedirectForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Test for Grandfathering
-main frame - didChangeLocationWithinPageForFrame
-main frame - didChangeLocationWithinPageForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didChangeLocationWithinPageForFrame
-main frame - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resourceLoadStatistics/resources/set-cookie.php?name=thirdPartyCookie&value=value#http://localhost:8000/loading/resourceLoadStatistics/grandfathering.html#step6 
-main frame - didStartProvisionalLoadForFrame
-main frame - didCancelClientRedirectForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - willPerformClientRedirectToURL: http://localhost:8000/loading/resourceLoadStatistics/grandfathering.html#step6 
-main frame - didStartProvisionalLoadForFrame
-main frame - didCancelClientRedirectForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Test for Grandfathering
-main frame - didChangeLocationWithinPageForFrame
-main frame - didChangeLocationWithinPageForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Grandfathered cookie was not purged.
-
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-expected.txt
deleted file mode 100644 (file)
index 5eb75dd..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Non-Prevalent Resource With User Interaction
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Cookie not deleted.
-
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-expected.txt
deleted file mode 100644 (file)
index 54b4059..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Non-Prevalent Resource Without User Interaction
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Cookie not deleted.
-
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion-expected.txt
deleted file mode 100644 (file)
index 1466dd1..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Test for Partitioned and Unpartitioned Cookie Deletion
-main frame - didChangeLocationWithinPageForFrame
-main frame - willPerformClientRedirectToURL: http://localhost:8000/loading/resourceLoadStatistics/resources/set-cookie.php?name=firstPartyCookie&value=value#http://127.0.0.1:8000/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion.html#step2 
-main frame - didFinishDocumentLoadForFrame
-main frame - didFinishLoadForFrame
-main frame - didStartProvisionalLoadForFrame
-main frame - didCancelClientRedirectForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion.html#step2 
-main frame - didStartProvisionalLoadForFrame
-main frame - didCancelClientRedirectForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Test for Partitioned and Unpartitioned Cookie Deletion
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame2-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame2-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-main frame - didChangeLocationWithinPageForFrame
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame3-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame4-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame3-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame4-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame4-->-->" - didFinishDocumentLoadForFrame
-  
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-Should receive no cookies.
-Did not receive cookie named 'firstPartyCookie'.
-Did not receive cookie named 'thirdPartyCookie'.
-Client-side document.cookie:
-
---------
-Frame: '<!--framePath //<!--frame1-->-->'
---------
-Setting partitioned, third party cookie.
-
-
---------
-Frame: '<!--framePath //<!--frame2-->-->'
---------
-Should only receive partitioned, third party cookie.
-Did not receive cookie named 'firstPartyCookie'.
-Received cookie named 'thirdPartyCookie'.
-Client-side document.cookie: thirdPartyCookie=value
-
---------
-Frame: '<!--framePath //<!--frame3-->-->'
---------
-After removal, should receive no cookies.
-Did not receive cookie named 'firstPartyCookie'.
-Did not receive cookie named 'thirdPartyCookie'.
-Client-side document.cookie:
-
---------
-Frame: '<!--framePath //<!--frame4-->-->'
---------
-After user interaction, should receive no cookies.
-Did not receive cookie named 'firstPartyCookie'.
-Did not receive cookie named 'thirdPartyCookie'.
-Client-side document.cookie:
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-network-process-crash-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-network-process-crash-expected.txt
deleted file mode 100644 (file)
index ea64528..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Test for Partitioned and Unpartitioned Cookie Deletion
-main frame - didChangeLocationWithinPageForFrame
-main frame - willPerformClientRedirectToURL: http://localhost:8000/loading/resourceLoadStatistics/resources/set-cookie.php?name=firstPartyCookie&value=value#http://127.0.0.1:8000/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-network-process-crash.html#step2 
-main frame - didFinishDocumentLoadForFrame
-main frame - didFinishLoadForFrame
-main frame - didStartProvisionalLoadForFrame
-main frame - didCancelClientRedirectForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-network-process-crash.html#step2 
-main frame - didStartProvisionalLoadForFrame
-main frame - didCancelClientRedirectForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Test for Partitioned and Unpartitioned Cookie Deletion
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame2-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didFinishDocumentLoadForFrame
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame2-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame2-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-main frame - didChangeLocationWithinPageForFrame
-main frame - willPerformClientRedirectToURL: http://localhost:8000/loading/resourceLoadStatistics/resources/set-cookie.php?name=firstPartyCookie&value=value#http://127.0.0.1:8000/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-network-process-crash.html#step8 
-main frame - didStartProvisionalLoadForFrame
-main frame - didCancelClientRedirectForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-network-process-crash.html#step8 
-main frame - didStartProvisionalLoadForFrame
-main frame - didCancelClientRedirectForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Test for Partitioned and Unpartitioned Cookie Deletion
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-  
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-Setting second partitioned, third party cookie.
-
-
---------
-Frame: '<!--framePath //<!--frame1-->-->'
---------
-After network process crash, should only receive second partitioned, third party cookie.
-Received cookie named 'firstPartyCookie'.
-Did not receive cookie named 'firstThirdPartyCookie'.
-Received cookie named 'secondThirdPartyCookie'.
-Client-side document.cookie: firstPartyCookie=value; secondThirdPartyCookie=value
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-network-process-crash.html b/LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-network-process-crash.html
deleted file mode 100644 (file)
index dc95b99..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Test for Partitioned and Unpartitioned Cookie Deletion</title>
-    <script src="../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script>
-    const partitionHost = "127.0.0.1:8000";
-    const thirdPartyOrigin = "http://localhost:8000";
-    const thirdPartyBaseUrl = thirdPartyOrigin + "/loading/resourceLoadStatistics/resources";
-    const firstPartyCookieName = "firstPartyCookie";
-    const subPathToSetFirstPartyCookie = "/set-cookie.php?name=" + firstPartyCookieName + "&value=value";
-    const firstThirdPartyCookieName = "firstThirdPartyCookie";
-    const secondThirdPartyCookieName = "secondThirdPartyCookie";
-    const subPathToSetFirstThirdPartyCookie = "/set-cookie.php?name=" + firstThirdPartyCookieName + "&value=value";
-    const subPathToSetSecondThirdPartyCookie = "/set-cookie.php?name=" + secondThirdPartyCookieName + "&value=value";
-    const fragmentWithReturnUrl = "http://" + partitionHost + "/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-network-process-crash.html";
-    const subPathToGetCookies = "/get-cookies.php?name1=" + firstPartyCookieName + "&name2=" + firstThirdPartyCookieName + "&name3=" + secondThirdPartyCookieName;
-
-    function finishTest() {
-        testRunner.notifyDone();
-    }
-
-    function openIframe(url, onLoadHandler) {
-        const element = document.createElement("iframe");
-        element.src = url;
-        if (onLoadHandler) {
-            element.onload = onLoadHandler;
-        }
-        document.body.appendChild(element);
-    }
-
-    function terminateNetworkProcessAndContinue() {
-        if (window.testRunner && window.testRunner.terminateNetworkProcess) {
-            testRunner.terminateNetworkProcess();
-            setTimeout(runTest, 1000);
-        } else {
-            testFailed("Could not terminate network process.");
-            finishTest();
-        }
-    }
-
-    function runTest() {
-        switch (document.location.hash) {
-            case "#step1":
-                // Set first-party cookie for prevalent resource.
-                document.location.href = thirdPartyBaseUrl + subPathToSetFirstPartyCookie + "#" + fragmentWithReturnUrl + "#step2";
-                break;
-            case "#step2":
-                // No cookie should be sent under partition.
-                document.location.hash = "step3";
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should receive no cookies.", runTest);
-                break;
-            case "#step3":
-                // Set first cookie under partition.
-                document.location.hash = "step4";
-                openIframe(thirdPartyBaseUrl + subPathToSetFirstThirdPartyCookie + "&message=Setting first partitioned, third party cookie.", runTest);
-                break;
-            case "#step4":
-                // Only first partitioned cookie should be sent under partition.
-                document.location.hash = "step5";
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should only receive first partitioned, third party cookie.", runTest);
-                break;
-            case "#step5":
-                // Crash (terminate) network process.
-                document.location.hash = "step6";
-                terminateNetworkProcessAndContinue();
-                break;
-            case "#step6":
-                // Fire data modification handler to again propagate partitioning info to the network process.
-                document.location.hash = "step7";
-                testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-                testRunner.installStatisticsDidScanDataRecordsCallback(function() {
-                    runTest();
-                });
-                if (!testRunner.isStatisticsPrevalentResource("http://localhost"))
-                    testFailed("Host was no longer prevalent resource.");
-                testRunner.statisticsProcessStatisticsAndDataRecords();
-                break;
-            case "#step7":
-                // Set first-party cookie for prevalent resource.
-                document.location.href = thirdPartyBaseUrl + subPathToSetFirstPartyCookie + "#" + fragmentWithReturnUrl + "#step8";
-                break;
-            case "#step8":
-                // Set second cookie under partition.
-                document.location.hash = "step9";
-                openIframe(thirdPartyBaseUrl + subPathToSetSecondThirdPartyCookie + "&message=Setting second partitioned, third party cookie.", runTest);
-                break;
-            case "#step9":
-                // Only second partitioned cookie should be sent under partition.
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=After network process crash, should only receive second partitioned, third party cookie.", finishTest);
-                break;
-        }
-    }
-
-    if (document.location.host === partitionHost && document.location.hash === "" && window.testRunner && window.internals) {
-
-        testRunner.statisticsSetShouldPartitionCookiesForHost("localhost", true);
-        testRunner.setStatisticsPrevalentResource("http://localhost", true);
-        if (!testRunner.isStatisticsPrevalentResource("http://localhost"))
-            testFailed("Host did not get set as prevalent resource.");
-
-        testRunner.setStatisticsShouldClassifyResourcesBeforeDataRecordsRemoval(false);
-
-        testRunner.waitUntilDone();
-        testRunner.dumpChildFramesAsText();
-        document.location.hash = "step1";
-    }
-
-    runTest();
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt
deleted file mode 100644 (file)
index 190013b..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Test for Partitioned and Unpartitioned Cookie With User Interaction
-main frame - didChangeLocationWithinPageForFrame
-CONSOLE MESSAGE: line 63: Step 1
-main frame - willPerformClientRedirectToURL: http://localhost:8000/loading/resourceLoadStatistics/resources/set-cookie.php?name=firstPartyCookie&value=value#http://127.0.0.1:8000/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html#step2 
-main frame - didFinishDocumentLoadForFrame
-main frame - didFinishLoadForFrame
-main frame - didStartProvisionalLoadForFrame
-main frame - didCancelClientRedirectForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html#step2 
-main frame - didStartProvisionalLoadForFrame
-main frame - didCancelClientRedirectForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Test for Partitioned and Unpartitioned Cookie With User Interaction
-CONSOLE MESSAGE: line 68: Step 2
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-CONSOLE MESSAGE: line 75: Step 3
-main frame - didHandleOnloadEventsForFrame
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame
-CONSOLE MESSAGE: line 82: Step 4
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame2-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didFinishDocumentLoadForFrame
-CONSOLE MESSAGE: line 89: Step 5
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame3-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame2-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame3-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-CONSOLE MESSAGE: line 96: Step 6
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame4-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame4-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame4-->-->" - didFinishDocumentLoadForFrame
-CONSOLE MESSAGE: line 103: Step 7
-frame "<!--framePath //<!--frame5-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame4-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame4-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame5-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame5-->-->" - didFinishDocumentLoadForFrame
-  
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-Should receive no cookies.
-Did not receive cookie named 'firstPartyCookie'.
-Did not receive cookie named 'thirdPartyCookie'.
-Client-side document.cookie:
-
---------
-Frame: '<!--framePath //<!--frame1-->-->'
---------
-Setting partitioned, third-party cookie.
-
-
---------
-Frame: '<!--framePath //<!--frame2-->-->'
---------
-Should only receive partitioned, third-party cookie.
-Did not receive cookie named 'firstPartyCookie'.
-Received cookie named 'thirdPartyCookie'.
-Client-side document.cookie: thirdPartyCookie=value
-
---------
-Frame: '<!--framePath //<!--frame3-->-->'
---------
-After first user interaction, should only receive un-partitioned cookie.
-Received cookie named 'firstPartyCookie'.
-Did not receive cookie named 'thirdPartyCookie'.
-Client-side document.cookie: firstPartyCookie=value
-
---------
-Frame: '<!--framePath //<!--frame4-->-->'
---------
-Should only receive partitioned, third-party cookie.
-Did not receive cookie named 'firstPartyCookie'.
-Received cookie named 'thirdPartyCookie'.
-Client-side document.cookie: thirdPartyCookie=value
-
---------
-Frame: '<!--framePath //<!--frame5-->-->'
---------
-After second user interaction, should only receive un-partitioned cookie.
-Received cookie named 'firstPartyCookie'.
-Did not receive cookie named 'thirdPartyCookie'.
-Client-side document.cookie: firstPartyCookie=value
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt
deleted file mode 100644 (file)
index dacd298..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Test for Partitioned Cookies With and Without User Interaction
-main frame - didChangeLocationWithinPageForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - willPerformClientRedirectToURL: http://localhost:8000/loading/resourceLoadStatistics/resources/set-cookie.php?name=firstPartyCookie&value=value#http://127.0.0.1:8000/loading/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html#step2 
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didStartProvisionalLoadForFrame
-main frame - didCancelClientRedirectForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html#step2 
-main frame - didStartProvisionalLoadForFrame
-main frame - didCancelClientRedirectForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Test for Partitioned Cookies With and Without User Interaction
-main frame - didFinishDocumentLoadForFrame
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame2-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame2-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame3-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-Should receive no cookies.
-Did not receive cookie named 'firstPartyCookie'.
-Did not receive cookie named 'thirdPartyCookie'.
-Client-side document.cookie:
-
---------
-Frame: '<!--framePath //<!--frame1-->-->'
---------
-Setting partitioned, third party cookie.
-
-
---------
-Frame: '<!--framePath //<!--frame2-->-->'
---------
-Should only receive partitioned, third party cookie.
-Did not receive cookie named 'firstPartyCookie'.
-Received cookie named 'thirdPartyCookie'.
-Client-side document.cookie: thirdPartyCookie=value
-
---------
-Frame: '<!--framePath //<!--frame3-->-->'
---------
-After user interaction, should only receive non-partitioned, first party cookie.
-Received cookie named 'firstPartyCookie'.
-Did not receive cookie named 'thirdPartyCookie'.
-Client-side document.cookie: firstPartyCookie=value
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-expected.txt
deleted file mode 100644 (file)
index 9801557..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Prevalent Resource With User Interaction
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Cookie not deleted.
-
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-expected.txt
deleted file mode 100644 (file)
index bc66e65..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Prevalent Resource With User Interaction Timeout
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Cookie deleted.
-
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-without-user-interaction-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/prevalent-resource-without-user-interaction-expected.txt
deleted file mode 100644 (file)
index 34a0741..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Tests for Prevalent Resource Without User Interaction
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-PASS Cookie deleted.
-
diff --git a/LayoutTests/http/tests/loading/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt b/LayoutTests/http/tests/loading/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt
deleted file mode 100644 (file)
index ac417b7..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Test for Partitioned Cookies With and Without User Interaction
-main frame - didChangeLocationWithinPageForFrame
-main frame - willPerformClientRedirectToURL: http://localhost:8000/loading/resourceLoadStatistics/resources/set-cookie.php?name=firstPartyCookie&value=value#http://127.0.0.1:8000/loading/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html#step2 
-main frame - didFinishDocumentLoadForFrame
-main frame - didFinishLoadForFrame
-main frame - didStartProvisionalLoadForFrame
-main frame - didCancelClientRedirectForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html#step2 
-main frame - didStartProvisionalLoadForFrame
-main frame - didCancelClientRedirectForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Test for Partitioned Cookies With and Without User Interaction
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame1-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishDocumentLoadForFrame
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame2-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame1-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame1-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didFinishDocumentLoadForFrame
-main frame - didChangeLocationWithinPageForFrame
-frame "<!--framePath //<!--frame3-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame2-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame2-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame4-->-->" - didStartProvisionalLoadForFrame
-frame "<!--framePath //<!--frame3-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame3-->-->" - didFinishLoadForFrame
-frame "<!--framePath //<!--frame4-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame4-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame4-->-->" - didHandleOnloadEventsForFrame
-frame "<!--framePath //<!--frame4-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
-PASS successfullyParsed is true
-
-TEST COMPLETE
-  
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-Setting third party cookie.
-
-
---------
-Frame: '<!--framePath //<!--frame1-->-->'
---------
-Should receive no cookies.
-Did not receive cookie named 'firstPartyCookie'.
-Did not receive cookie named 'thirdPartyCookie'.
-Client-side document.cookie: firstPartyCookie=value
-
---------
-Frame: '<!--framePath //<!--frame2-->-->'
---------
-Setting partitioned, third party cookie.
-
-
---------
-Frame: '<!--framePath //<!--frame3-->-->'
---------
-Should receive partitioned, third party cookie.
-Did not receive cookie named 'firstPartyCookie'.
-Received cookie named 'thirdPartyCookie'.
-Client-side document.cookie: thirdPartyCookie=value
-
---------
-Frame: '<!--framePath //<!--frame4-->-->'
---------
-After user interaction, should receive non-partitioned, first party cookie.
-Received cookie named 'firstPartyCookie'.
-Did not receive cookie named 'thirdPartyCookie'.
-Client-side document.cookie: firstPartyCookie=value
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-expected.txt
new file mode 100644 (file)
index 0000000..8c7615d
--- /dev/null
@@ -0,0 +1,2 @@
+PASS Host did not get classified as prevalent resource.
+
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt
new file mode 100644 (file)
index 0000000..8c7615d
--- /dev/null
@@ -0,0 +1,2 @@
+PASS Host did not get classified as prevalent resource.
+
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-expected.txt
new file mode 100644 (file)
index 0000000..8c7615d
--- /dev/null
@@ -0,0 +1,2 @@
+PASS Host did not get classified as prevalent resource.
+
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-expected.txt
new file mode 100644 (file)
index 0000000..8c7615d
--- /dev/null
@@ -0,0 +1,2 @@
+PASS Host did not get classified as prevalent resource.
+
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-expected.txt
new file mode 100644 (file)
index 0000000..22c82c5
--- /dev/null
@@ -0,0 +1,2 @@
+PASS Host classified as prevalent resource.
+
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-expected.txt
new file mode 100644 (file)
index 0000000..22c82c5
--- /dev/null
@@ -0,0 +1,2 @@
+PASS Host classified as prevalent resource.
+
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-expected.txt
new file mode 100644 (file)
index 0000000..22c82c5
--- /dev/null
@@ -0,0 +1,2 @@
+PASS Host classified as prevalent resource.
+
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-expected.txt
new file mode 100644 (file)
index 0000000..22c82c5
--- /dev/null
@@ -0,0 +1,2 @@
+PASS Host classified as prevalent resource.
+
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-expected.txt
new file mode 100644 (file)
index 0000000..83dba47
--- /dev/null
@@ -0,0 +1,3 @@
+PASS Host classified as prevalent resource.
+PASS Host is no longer a prevalent resource after the store was cleared.
+
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-expected.txt
new file mode 100644 (file)
index 0000000..83dba47
--- /dev/null
@@ -0,0 +1,3 @@
+PASS Host classified as prevalent resource.
+PASS Host is no longer a prevalent resource after the store was cleared.
+
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/grandfathering-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/grandfathering-expected.txt
new file mode 100644 (file)
index 0000000..da69993
--- /dev/null
@@ -0,0 +1,2 @@
+PASS Grandfathered cookie was not purged.
+
@@ -8,14 +8,14 @@
 <body>
 <script>
     const firstPartyOrigin = "http://localhost:8000";
-    const firstPartyBaseUrl = firstPartyOrigin + "/loading/resourceLoadStatistics/resources";
+    const firstPartyBaseUrl = firstPartyOrigin + "/resourceLoadStatistics/resources";
     const firstPartyCookieName = "firstPartyCookie";
     const thirdPartyCookieName = "thirdPartyCookie";
     const cookieValue = "value";
     const subPathToSetFirstPartyCookie = "/set-cookie.php?name=" + firstPartyCookieName + "&value=" + cookieValue;
-    const returnUrl = firstPartyOrigin + "/loading/resourceLoadStatistics/grandfathering.html";
+    const returnUrl = firstPartyOrigin + "/resourceLoadStatistics/grandfathering.html";
     const thirdPartyOrigin = "http://127.0.0.1:8000";
-    const thirdPartyBaseUrl = thirdPartyOrigin + "/loading/resourceLoadStatistics/resources";
+    const thirdPartyBaseUrl = thirdPartyOrigin + "/resourceLoadStatistics/resources";
     const subPathToSetThirdPartyCookie = "/set-cookie.php?name=" + thirdPartyCookieName + "&value=" + cookieValue;
 
     function setEnableFeature(enable) {
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-expected.txt
new file mode 100644 (file)
index 0000000..d2b7c5d
--- /dev/null
@@ -0,0 +1,2 @@
+PASS Cookie not deleted.
+
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-expected.txt
new file mode 100644 (file)
index 0000000..d2b7c5d
--- /dev/null
@@ -0,0 +1,2 @@
+PASS Cookie not deleted.
+
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion-expected.txt
new file mode 100644 (file)
index 0000000..eab6f2e
--- /dev/null
@@ -0,0 +1,39 @@
+  
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+Should receive no cookies.
+Did not receive cookie named 'firstPartyCookie'.
+Did not receive cookie named 'thirdPartyCookie'.
+Client-side document.cookie:
+
+--------
+Frame: '<!--framePath //<!--frame1-->-->'
+--------
+Setting partitioned, third party cookie.
+
+
+--------
+Frame: '<!--framePath //<!--frame2-->-->'
+--------
+Should only receive partitioned, third party cookie.
+Did not receive cookie named 'firstPartyCookie'.
+Received cookie named 'thirdPartyCookie'.
+Client-side document.cookie: thirdPartyCookie=value
+
+--------
+Frame: '<!--framePath //<!--frame3-->-->'
+--------
+After removal, should receive no cookies.
+Did not receive cookie named 'firstPartyCookie'.
+Did not receive cookie named 'thirdPartyCookie'.
+Client-side document.cookie:
+
+--------
+Frame: '<!--framePath //<!--frame4-->-->'
+--------
+After user interaction, should receive no cookies.
+Did not receive cookie named 'firstPartyCookie'.
+Did not receive cookie named 'thirdPartyCookie'.
+Client-side document.cookie:
@@ -9,12 +9,12 @@
 <script>
     const partitionHost = "127.0.0.1:8000";
     const thirdPartyOrigin = "http://localhost:8000";
-    const thirdPartyBaseUrl = thirdPartyOrigin + "/loading/resourceLoadStatistics/resources";
+    const thirdPartyBaseUrl = thirdPartyOrigin + "/resourceLoadStatistics/resources";
     const firstPartyCookieName = "firstPartyCookie";
     const subPathToSetFirstPartyCookie = "/set-cookie.php?name=" + firstPartyCookieName + "&value=value";
     const thirdPartyCookieName = "thirdPartyCookie";
     const subPathToSetThirdPartyCookie = "/set-cookie.php?name=" + thirdPartyCookieName + "&value=value";
-    const fragmentWithReturnUrl = "http://" + partitionHost + "/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion.html";
+    const fragmentWithReturnUrl = "http://" + partitionHost + "/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion.html";
     const subPathToGetCookies = "/get-cookies.php?name1=" + firstPartyCookieName + "&name2=" + thirdPartyCookieName;
 
     function setEnableFeature(enable) {
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout-expected.txt
new file mode 100644 (file)
index 0000000..d126f89
--- /dev/null
@@ -0,0 +1,47 @@
+  
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+Should receive no cookies.
+Did not receive cookie named 'firstPartyCookie'.
+Did not receive cookie named 'thirdPartyCookie'.
+Client-side document.cookie:
+
+--------
+Frame: '<!--framePath //<!--frame1-->-->'
+--------
+Setting partitioned, third-party cookie.
+
+
+--------
+Frame: '<!--framePath //<!--frame2-->-->'
+--------
+Should only receive partitioned, third-party cookie.
+Did not receive cookie named 'firstPartyCookie'.
+Received cookie named 'thirdPartyCookie'.
+Client-side document.cookie: thirdPartyCookie=value
+
+--------
+Frame: '<!--framePath //<!--frame3-->-->'
+--------
+After first user interaction, should only receive un-partitioned cookie.
+Received cookie named 'firstPartyCookie'.
+Did not receive cookie named 'thirdPartyCookie'.
+Client-side document.cookie: firstPartyCookie=value
+
+--------
+Frame: '<!--framePath //<!--frame4-->-->'
+--------
+Should only receive partitioned, third-party cookie.
+Did not receive cookie named 'firstPartyCookie'.
+Received cookie named 'thirdPartyCookie'.
+Client-side document.cookie: thirdPartyCookie=value
+
+--------
+Frame: '<!--framePath //<!--frame5-->-->'
+--------
+After second user interaction, should only receive un-partitioned cookie.
+Received cookie named 'firstPartyCookie'.
+Did not receive cookie named 'thirdPartyCookie'.
+Client-side document.cookie: firstPartyCookie=value
@@ -9,12 +9,12 @@
 <script>
     const partitionHost = "127.0.0.1:8000";
     const thirdPartyOrigin = "http://localhost:8000";
-    const thirdPartyBaseUrl = thirdPartyOrigin + "/loading/resourceLoadStatistics/resources";
+    const thirdPartyBaseUrl = thirdPartyOrigin + "/resourceLoadStatistics/resources";
     const firstPartyCookieName = "firstPartyCookie";
     const subPathToSetFirstPartyCookie = "/set-cookie.php?name=" + firstPartyCookieName + "&value=value";
     const thirdPartyCookieName = "thirdPartyCookie";
     const subPathToSetThirdPartyCookie = "/set-cookie.php?name=" + thirdPartyCookieName + "&value=value";
-    const fragmentWithReturnUrl = "http://" + partitionHost + "/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html";
+    const fragmentWithReturnUrl = "http://" + partitionHost + "/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html";
     const subPathToGetCookies = "/get-cookies.php?name1=" + firstPartyCookieName + "&name2=" + thirdPartyCookieName;
 
     function setEnableFeature(enable) {
     function runTest() {
         switch (document.location.hash) {
             case "#step1":
-                console.log("Step 1");
                 // Set first-party cookie for http://localhost:8000
                 document.location.href = thirdPartyBaseUrl + subPathToSetFirstPartyCookie + "#" + fragmentWithReturnUrl + "#step2";
                 break;
             case "#step2":
-                console.log("Step 2");
                 // Check that the first-party cookie is not sent in partition 127.0.0.1:8000
                 document.location.hash = "step3";
                 openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should receive no cookies.",
                     runTest);
                 break;
             case "#step3":
-                console.log("Step 3");
                 // Set third-party cookie for http://localhost:8000 in partition 127.0.0.1:8000
                 document.location.hash = "step4";
                 openIframe(thirdPartyBaseUrl + subPathToSetThirdPartyCookie + "&message=Setting partitioned, third-party cookie.",
                     runTest);
                 break;
             case "#step4":
-                console.log("Step 4");
                 // Check that only partitioned cookie get sent in partition 127.0.0.1:8000
                 document.location.hash = "step5";
                 openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should only receive partitioned, third-party cookie.",
                     setNormalCookiePartitioningTimeOutPlusUserInteractionAndContinue);
                 break;
             case "#step5":
-                console.log("Step 5");
                 // http://localhost:8000 now has user interaction, check that un-partitioned cookie is sent for third-party
                 document.location.hash = "step6";
                 openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=After first user interaction, should only receive un-partitioned cookie.",
                     setShortCookiePartitioningTimeOutPlusFireShouldPartitionCookiesHandlerAndContinue);
                 break;
             case "#step6":
-                console.log("Step 6");
                 // Cookie partitioning should be applied again
                 document.location.hash = "step7";
                 openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should only receive partitioned, third-party cookie.",
                     setNormalCookiePartitioningTimeOutPlusUserInteractionAndContinue);
                 break;
             case "#step7":
-                console.log("Step 7");
                 // http://localhost:8000 now has fresh user interaction, check that un-partitioned cookie is sent for third-party
                 openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=After second user interaction, should only receive un-partitioned cookie.",
                     finishTest);
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction-expected.txt
new file mode 100644 (file)
index 0000000..9531448
--- /dev/null
@@ -0,0 +1,31 @@
+
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+Should receive no cookies.
+Did not receive cookie named 'firstPartyCookie'.
+Did not receive cookie named 'thirdPartyCookie'.
+Client-side document.cookie:
+
+--------
+Frame: '<!--framePath //<!--frame1-->-->'
+--------
+Setting partitioned, third party cookie.
+
+
+--------
+Frame: '<!--framePath //<!--frame2-->-->'
+--------
+Should only receive partitioned, third party cookie.
+Did not receive cookie named 'firstPartyCookie'.
+Received cookie named 'thirdPartyCookie'.
+Client-side document.cookie: thirdPartyCookie=value
+
+--------
+Frame: '<!--framePath //<!--frame3-->-->'
+--------
+After user interaction, should only receive non-partitioned, first party cookie.
+Received cookie named 'firstPartyCookie'.
+Did not receive cookie named 'thirdPartyCookie'.
+Client-side document.cookie: firstPartyCookie=value
@@ -9,12 +9,12 @@
 <script>
     const partitionHost = "127.0.0.1:8000";
     const thirdPartyOrigin = "http://localhost:8000";
-    const thirdPartyBaseUrl = thirdPartyOrigin + "/loading/resourceLoadStatistics/resources";
+    const thirdPartyBaseUrl = thirdPartyOrigin + "/resourceLoadStatistics/resources";
     const firstPartyCookieName = "firstPartyCookie";
     const subPathToSetFirstPartyCookie = "/set-cookie.php?name=" + firstPartyCookieName + "&value=value";
     const thirdPartyCookieName = "thirdPartyCookie";
     const subPathToSetThirdPartyCookie = "/set-cookie.php?name=" + thirdPartyCookieName + "&value=value";
-    const fragmentWithReturnUrl = "http://127.0.0.1:8000/loading/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html";
+    const fragmentWithReturnUrl = "http://127.0.0.1:8000/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html";
     const subPathToGetCookies = "/get-cookies.php?name1=" + firstPartyCookieName + "&name2=" + thirdPartyCookieName;
 
     function setEnableFeature(enable) {
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-expected.txt
new file mode 100644 (file)
index 0000000..d2b7c5d
--- /dev/null
@@ -0,0 +1,2 @@
+PASS Cookie not deleted.
+
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-expected.txt
new file mode 100644 (file)
index 0000000..c7557e0
--- /dev/null
@@ -0,0 +1,2 @@
+PASS Cookie deleted.
+
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-without-user-interaction-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-without-user-interaction-expected.txt
new file mode 100644 (file)
index 0000000..c7557e0
--- /dev/null
@@ -0,0 +1,2 @@
+PASS Cookie deleted.
+
@@ -9,6 +9,17 @@
 <script>
     const hostUnderTest = "127.0.0.1:8000";
     const statisticsUrl = "http://" + hostUnderTest + "/temp";
+
+    function finishTest () {
+        if (document.cookie !== "")
+            testFailed("Cookie not deleted: " + document.cookie);
+        else
+            testPassed("Cookie deleted.");
+        testRunner.statisticsResetToConsistentState();
+        internals.setResourceLoadStatisticsEnabled(false);
+        testRunner.notifyDone();
+    }
+
     function runTestRunnerTest() {
         if (document.cookie !== "")
             testFailed("document.cookie not empty.");
             testFailed("Host did not get cleared of user interaction.");
 
         testRunner.installStatisticsDidModifyDataRecordsCallback(function() {
-            if (document.cookie !== "")
-                testFailed("Cookie not deleted: " + document.cookie);
-            else
-                testPassed("Cookie deleted.");
-            testRunner.statisticsResetToConsistentState();
-            internals.setResourceLoadStatisticsEnabled(false);
-            testRunner.notifyDone();
+            setTimeout("finishTest()", 1000);
         });
         testRunner.setStatisticsShouldClassifyResourcesBeforeDataRecordsRemoval(false);
         testRunner.setStatisticsMinimumTimeBetweenDataRecordsRemoval(0);
@@ -1,9 +1,3 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Test for Resource Load Statistics Pruning
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
 Tests that statistics are pruned in the right order.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
index dad8b5a..8e73a2b 100644 (file)
@@ -20,5 +20,5 @@ if(!empty($_GET["name3"])) {
 ?>
 <p id="output"></p>
 <script>
-    document.getElementById("output").textContent = "Client-side document.cookie: " + document.cookie;
+    document.getElementById("output").textContent = "Client-side document.cookie: " + document.cookie.replace(/ /g,'').split(';').sort();
 </script>
\ No newline at end of file
@@ -1,9 +1,3 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didReceiveTitle: Test for Telemetry Generation
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
 Tests that telemetry for prevalent resources is calculated correctly.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction-expected.txt
new file mode 100644 (file)
index 0000000..d3ce081
--- /dev/null
@@ -0,0 +1,43 @@
+PASS successfullyParsed is true
+
+TEST COMPLETE
+  
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+Setting cookie as third party.
+
+
+--------
+Frame: '<!--framePath //<!--frame1-->-->'
+--------
+Should receive both the cookie set in a first-party context and in a third-party context.
+Received cookie named 'firstPartyCookie'.
+Received cookie named 'thirdPartyCookie'.
+Did not receive cookie named 'partitionedThirdPartyCookie'.
+Client-side document.cookie: firstPartyCookie=value,thirdPartyCookie=value
+
+--------
+Frame: '<!--framePath //<!--frame2-->-->'
+--------
+Setting partitioned, third party cookie.
+
+
+--------
+Frame: '<!--framePath //<!--frame3-->-->'
+--------
+Should only receive partitioned, third party cookie.
+Did not receive cookie named 'firstPartyCookie'.
+Did not receive cookie named 'thirdPartyCookie'.
+Received cookie named 'partitionedThirdPartyCookie'.
+Client-side document.cookie: partitionedThirdPartyCookie=value
+
+--------
+Frame: '<!--framePath //<!--frame4-->-->'
+--------
+After user interaction, should receive non-partitioned cookies set in a first-party context and in a third-party context.
+Received cookie named 'firstPartyCookie'.
+Received cookie named 'thirdPartyCookie'.
+Did not receive cookie named 'partitionedThirdPartyCookie'.
+Client-side document.cookie: firstPartyCookie=value,thirdPartyCookie=value
     const partitionHost = "127.0.0.1:8000";
     const thirdPartyHostname = "localhost";
     const thirdPartyOrigin = "http://" + thirdPartyHostname + ":8000";
-    const thirdPartyBaseUrl = thirdPartyOrigin + "/loading/resourceLoadStatistics/resources";
+    const thirdPartyBaseUrl = thirdPartyOrigin + "/resourceLoadStatistics/resources";
     const firstPartyCookieName = "firstPartyCookie";
     const subPathToSetFirstPartyCookie = "/set-cookie.php?name=" + firstPartyCookieName + "&value=value";
     const thirdPartyCookieName = "thirdPartyCookie";
     const subPathToSetThirdPartyCookie = "/set-cookie.php?name=" + thirdPartyCookieName + "&value=value";
-    const fragmentWithReturnUrl = "http://127.0.0.1:8000/loading/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html";
-    const subPathToGetCookies = "/get-cookies.php?name1=" + firstPartyCookieName + "&name2=" + thirdPartyCookieName;
+    const partitionedThirdPartyCookieName = "partitionedThirdPartyCookie";
+    const subPathToSetPartitionedThirdPartyCookie = "/set-cookie.php?name=" + partitionedThirdPartyCookieName + "&value=value";
+    const fragmentWithReturnUrl = "http://127.0.0.1:8000/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html";
+    const subPathToGetCookies = "/get-cookies.php?name1=" + firstPartyCookieName + "&name2=" + thirdPartyCookieName + "&name3=" + partitionedThirdPartyCookieName;
 
     function setEnableFeature(enable) {
         if (!enable) {
     function runTest() {
         switch (document.location.hash) {
             case "#step1":
+                // Set first-party cookie for localhost, effectively granting it access to cookies in a third-party context.
                 document.location.href = thirdPartyBaseUrl + subPathToSetFirstPartyCookie + "#" + fragmentWithReturnUrl + "#step2";
                 break;
             case "#step2":
+                // Set first-party cookie for localhost in a third-party context.
                 document.location.hash = "step3";
-                openIframe(thirdPartyBaseUrl + subPathToSetThirdPartyCookie + "&message=Setting third party cookie.", runTest);
+                openIframe(thirdPartyBaseUrl + subPathToSetThirdPartyCookie + "&message=Setting cookie as third party.", runTest);
                 break;
             case "#step3":
+                // Check that both cookies as sent.
                 document.location.hash = "step4";
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should receive no cookies.", runTest);
+                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should receive both the cookie set in a first-party context and in a third-party context.", runTest);
                 break;
             case "#step4":
+                // Flag localhost for partitioning and set a partitioned cookie.
                 document.location.hash = "step5";
                 testRunner.statisticsSetShouldPartitionCookiesForHost(thirdPartyHostname, true);
-                openIframe(thirdPartyBaseUrl + subPathToSetThirdPartyCookie + "&message=Setting partitioned, third party cookie.", runTest);
+                openIframe(thirdPartyBaseUrl + subPathToSetPartitionedThirdPartyCookie + "&message=Setting partitioned, third party cookie.", runTest);
                 break;
             case "#step5":
                 document.location.hash = "step6";
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should receive partitioned, third party cookie.", setUserInteractionAndContinue);
+                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should only receive partitioned, third party cookie.", setUserInteractionAndContinue);
                 break;
             case "#step6":
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=After user interaction, should receive non-partitioned, first party cookie.", finishTest);
+                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=After user interaction, should receive non-partitioned cookies set in a first-party context and in a third-party context.", finishTest);
                 break;
         }
     }
@@ -1,13 +1,3 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-frame "testFrame" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-frame "testFrame" - didCommitLoadForFrame
-frame "testFrame" - didFinishDocumentLoadForFrame
-frame "testFrame" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
-frame "testFrame" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
 Tests that user interaction is always logged for the top document/frame.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
@@ -43,6 +43,6 @@ onload = function() {
     }
 };
 </script>
-<iframe id="testFrame" src="http://localhost:8000/loading/resourceLoadStatistics/resources/dummy.html"></iframe>
+<iframe id="testFrame" src="http://localhost:8000/resourceLoadStatistics/resources/dummy.html"></iframe>
 </body>
 </html>
\ No newline at end of file
@@ -1,8 +1,3 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
 Tests that user interaction is not reported repeatedly within a short period of time.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
@@ -1,8 +1,3 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
 Tests that user interaction is reported after history removal since that means all statistics have been reset.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
index bb4871a..6d177fe 100644 (file)
@@ -2973,10 +2973,17 @@ fast/canvas/webgl/texImage2D-mse-flipY-true.html [ Skip ]
 fast/canvas/webgl/texImage2D-video-flipY-false.html [ Skip ]
 fast/canvas/webgl/texImage2D-video-flipY-true.html [ Skip ]
 
-webkit.org/b/174120 http/tests/loading/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame.html [ Skip ]
+# Skipped on iOS since UIHelper.activateAt() doesn't produce a user gesture that ITP captures on iOS
+webkit.org/b/174120 http/tests/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame.html [ Skip ]
+http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time.html [ Skip ]
+http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal.html [ Skip ]
 # Skipped in WK2 expectations because cookie partitioning is only available in macOS High Sierra and iOS 11.
 http/tests/resourceLoadStatistics/add-partitioning-to-redirect.html [ Pass ]
 http/tests/resourceLoadStatistics/remove-partitioning-from-redirect.html [ Pass ]
+http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion.html [ Pass ]
+http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html [ Pass ]
+http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html [ Pass ]
+http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html [ Pass ]
 
 webkit.org/b/175273 imported/w3c/web-platform-tests/html/browsers/windows/noreferrer-window-name.html [ Failure ]
 
index 43142a0..63f0802 100644 (file)
@@ -742,9 +742,9 @@ webkit.org/b/167757 workers/bomb.html [ Pass Timeout ]
 webkit.org/b/172397 [ Debug ] animations/needs-layout.html [ Pass ImageOnlyFailure ]
 
 # Touch events are not available on open source bots, thus only tested on Mac.
-http/tests/loading/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame.html [ Pass ]
-http/tests/loading/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time.html [ Pass ]
-http/tests/loading/resourceLoadStatistics/user-interaction-reported-after-website-data-removal.html [ Pass ]
+http/tests/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame.html [ Pass ]
+http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time.html [ Pass ]
+http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal.html [ Pass ]
 http/tests/storageAccess/request-and-deny-storage-access-cross-origin-iframe.html [ Pass ]
 http/tests/storageAccess/request-and-deny-storage-access-cross-origin-sandboxed-iframe.html [ Pass ]
 http/tests/storageAccess/request-and-grant-storage-access-cross-origin-non-sandboxed-iframe.html [ Pass ]
@@ -796,9 +796,10 @@ webkit.org/b/176122 media/video-controls-drop-and-restore-timeline.html [ Pass F
 [ HighSierra+ ] http/tests/ssl/applepay/ApplePayError.html [ Pass ]
 [ HighSierra+ ] http/tests/ssl/applepay/ApplePaySessionV3.html [ Pass ]
 # <rdar://problem/31634451>
-[ HighSierra+ ] http/tests/loading/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html [ Pass ]
-[ HighSierra+ ] http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html [ Pass Failure ]
-[ HighSierra+ ] http/tests/loading/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html [ Pass Failure ]
+[ HighSierra+ ] http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html [ Pass ]
+[ HighSierra+ ] http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html [ Pass ]
+[ HighSierra+ ] http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html [ Pass ]
+[ HighSierra+ ] http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion.html [ Pass Timeout ]
 [ HighSierra+ ] http/tests/resourceLoadStatistics/add-partitioning-to-redirect.html [ Pass ]
 [ HighSierra+ ] http/tests/resourceLoadStatistics/remove-partitioning-from-redirect.html [ Pass ]
 
@@ -816,9 +817,9 @@ webkit.org/b/177214 [ ElCapitan Debug ] imported/w3c/web-platform-tests/FileAPI/
 
 webkit.org/b/177687 http/tests/inspector/network/resource-sizes-memory-cache.html [ Pass Failure ]
 
-webkit.org/b/178472 http/tests/resourceLoadStatistics/prevalent-resource-handled-keydown.html [ Pass Timeout ]
+webkit.org/b/178472 http/tests/resourceLoadStatistics/prevalent-resource-handled-keydown.html [ Pass ]
 
-webkit.org/b/178536 [ HighSierra ] http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html [ Pass Timeout ]
+webkit.org/b/178536 [ HighSierra ] http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html [ Pass Timeout ]
 
 webkit.org/b/176881 plugins/js-from-destroy.html [ Pass Failure ]
 
@@ -837,7 +838,5 @@ webkit.org/b/179773 imported/w3c/web-platform-tests/fetch/api/abort/serviceworke
 
 webkit.org/b/176078 imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-onnegotiationneeded.html [ Pass Failure ]
 
-webkit.org/b/179644 [ HighSierra Release ] http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion.html [ Pass Failure ]
-
 webkit.org/b/179351 imported/w3c/web-platform-tests/service-workers/service-worker/worker-interception.https.html [ Pass Failure ]
 
index de36133..f4068d9 100644 (file)
@@ -671,29 +671,32 @@ http/tests/misc/will-send-request-with-client-provided-http-body.html [ Pass ]
 imported/w3c/web-platform-tests/fetch/api/request/request-cache-only-if-cached.html [ Failure ]
 
 # Resource Load Statistics are only supported in WebKit2.
-http/tests/loading/resourceLoadStatistics/non-prevalent-resource-with-user-interaction.html [ Pass Timeout ]
-http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction.html [ Pass ]
-http/tests/loading/resourceLoadStatistics/non-prevalent-resource-without-user-interaction.html [ Pass ]
-webkit.org/b/171785 http/tests/loading/resourceLoadStatistics/prevalent-resource-without-user-interaction.html [ Pass Failure ]
-webkit.org/b/171756 http/tests/loading/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout.html [ Pass Failure ]
-http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics.html [ Pass ]
-http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins.html [ Pass ]
-http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins.html [ Pass ]
-http/tests/loading/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to.html [ Pass ]
-http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics.html [ Pass ]
-http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins.html [ Pass ]
-http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins.html [ Pass ]
-http/tests/loading/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to.html [ Pass ]
-webkit.org/b/175263 http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store.html [ Pass Timeout ]
-webkit.org/b/172452 http/tests/loading/resourceLoadStatistics/grandfathering.html [ Pass Failure Timeout ]
-webkit.org/b/173499 http/tests/loading/resourceLoadStatistics/telemetry-generation.html [ Pass Failure ]
-http/tests/loading/resourceLoadStatistics/prune-statistics.html [ Pass ]
+http/tests/resourceLoadStatistics/non-prevalent-resource-with-user-interaction.html [ Pass ]
+http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction.html [ Pass ]
+http/tests/resourceLoadStatistics/non-prevalent-resource-without-user-interaction.html [ Pass ]
+http/tests/resourceLoadStatistics/prevalent-resource-without-user-interaction.html [ Pass ]
+http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout.html [ Pass ]
+http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics.html [ Pass ]
+http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins.html [ Pass ]
+http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins.html [ Pass ]
+http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to.html [ Pass ]
+http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics.html [ Pass ]
+http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins.html [ Pass ]
+http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins.html [ Pass ]
+http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to.html [ Pass ]
+http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store.html [ Pass ]
+http/tests/resourceLoadStatistics/grandfathering.html [ Pass ]
+http/tests/resourceLoadStatistics/telemetry-generation.html [ Pass ]
+http/tests/resourceLoadStatistics/prune-statistics.html [ Pass ]
 http/tests/storageAccess/request-storage-access-top-frame.html [ Pass ]
 http/tests/resourceLoadStatistics [ Pass ]
 # Cookie partitioning is only supported in macOS High Sierra and iOS 11.
 http/tests/resourceLoadStatistics/add-partitioning-to-redirect.html [ Skip ]
 http/tests/resourceLoadStatistics/remove-partitioning-from-redirect.html [ Skip ]
-
+http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion.html [ Skip ]
+http/tests/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-with-partitioning-timeout.html [ Skip ]
+http/tests/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html [ Skip ]
+http/tests/resourceLoadStatistics/third-party-cookie-with-and-without-user-interaction.html [ Skip ]
 
 ### END OF (5) Progressions, expected successes that are expected failures in WebKit1.
 ########################################