Unreviewed, rolling out r250324.
authorjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 25 Sep 2019 14:55:30 +0000 (14:55 +0000)
committerjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 25 Sep 2019 14:55:30 +0000 (14:55 +0000)
Source/WebCore:

Broke many mac wk2 layout tests

Reverted changeset:

"Enable LayoutTests using ResourceLoadStatistics SQLite
backend (195420)"
https://bugs.webkit.org/show_bug.cgi?id=195420
https://trac.webkit.org/changeset/250324

Source/WebKit:

Broke many mac wk2 layout tests

Reverted changeset:

"Enable LayoutTests using ResourceLoadStatistics SQLite
backend (195420)"
https://bugs.webkit.org/show_bug.cgi?id=195420
https://trac.webkit.org/changeset/250324

Tools:

Tools/ChangeLog

Reverted changeset:

"Enable LayoutTests using ResourceLoadStatistics SQLite
backend (195420)"
https://bugs.webkit.org/show_bug.cgi?id=195420
https://trac.webkit.org/changeset/250324

LayoutTests:

Broke many mac wk2 layout tests

Reverted changeset:

"Enable LayoutTests using ResourceLoadStatistics SQLite
backend (195420)"
https://bugs.webkit.org/show_bug.cgi?id=195420
https://trac.webkit.org/changeset/250324

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

157 files changed:
LayoutTests/ChangeLog
LayoutTests/http/tests/resourceLoadStatistics/add-blocking-to-redirect-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/add-blocking-to-redirect-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/blocking-in-web-worker-script-import-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/blocking-in-web-worker-script-import-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/cap-cache-max-age-for-prevalent-resource-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/cap-cache-max-age-for-prevalent-resource-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-decoration-same-site-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-decoration-same-site-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-fragment-from-prevalent-resource-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-fragment-from-prevalent-resource-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-and-fragment-from-prevalent-resource-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-and-fragment-from-prevalent-resource-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-from-prevalent-resource-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-from-prevalent-resource-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-without-link-decoration-from-prevalent-resource-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-without-link-decoration-from-prevalent-resource-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-redirect-collusion-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-redirect-collusion-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-redirect-to-prevalent-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-redirect-to-prevalent-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-collusion-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-collusion-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-to-prevalent-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-to-prevalent-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-unique-redirects-to-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-unique-redirects-to-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-very-prevalent-based-on-mixed-statistics-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/classify-as-very-prevalent-based-on-mixed-statistics-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/cookie-deletion-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/cookie-deletion-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/cookies-with-and-without-user-interaction-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/cookies-with-and-without-user-interaction-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/delete-script-accessible-cookies-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/delete-script-accessible-cookies-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/do-not-block-top-level-navigation-redirect-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/do-not-block-top-level-navigation-redirect-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/do-not-capture-statistics-for-simple-top-navigations-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/do-not-capture-statistics-for-simple-top-navigations-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/do-not-remove-blocking-in-redirect-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/do-not-remove-blocking-in-redirect-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/do-not-switch-session-on-navigation-to-prevalent-without-interaction-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/do-not-switch-session-on-navigation-to-prevalent-without-interaction-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/downgraded-referrer-for-navigation-with-link-query-from-prevalent-resource-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/downgraded-referrer-for-navigation-with-link-query-from-prevalent-resource-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/enable-debug-mode-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/enable-debug-mode-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/grandfathering-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/grandfathering-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/log-cross-site-load-with-link-decoration.html
LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/ping-to-prevalent-resource-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/ping-to-prevalent-resource-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-handled-keydown-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-handled-keydown-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-unhandled-keydown-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-unhandled-keydown-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-without-user-interaction-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-without-user-interaction-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/prune-statistics-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/prune-statistics-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/set-custom-prevalent-resource-in-debug-mode-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/set-custom-prevalent-resource-in-debug-mode-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-redirects-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-redirects-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-requests-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-requests-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/switch-session-on-navigation-to-prevalent-with-interaction-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/switch-session-on-navigation-to-prevalent-with-interaction-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/telemetry-generation.html
LayoutTests/http/tests/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal-database-expected.txt [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal-database.html [deleted file]
LayoutTests/http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration.html
LayoutTests/platform/ios/TestExpectations
Source/WebCore/ChangeLog
Source/WebCore/platform/sql/SQLiteDatabase.h
Source/WebKit/ChangeLog
Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp
Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h
Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp
Source/WebKit/NetworkProcess/NetworkProcess.cpp
Source/WebKit/NetworkProcess/NetworkProcess.h
Source/WebKit/NetworkProcess/NetworkProcess.messages.in
Source/WebKit/NetworkProcess/NetworkSession.cpp
Source/WebKit/NetworkProcess/NetworkSession.h
Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp
Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h
Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
Source/WebKit/UIProcess/Network/NetworkProcessProxy.h
Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
Tools/ChangeLog
Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
Tools/WebKitTestRunner/TestController.cpp
Tools/WebKitTestRunner/TestController.h
Tools/WebKitTestRunner/TestInvocation.cpp

index 41944c6..8856242 100644 (file)
@@ -1,3 +1,16 @@
+2019-09-25  Jonathan Bedard  <jbedard@apple.com>
+
+        Unreviewed, rolling out r250324.
+
+        Broke many mac wk2 layout tests
+
+        Reverted changeset:
+
+        "Enable LayoutTests using ResourceLoadStatistics SQLite
+        backend (195420)"
+        https://bugs.webkit.org/show_bug.cgi?id=195420
+        https://trac.webkit.org/changeset/250324
+
 2019-09-25  Fujii Hironori  <Hironori.Fujii@sony.com>
 
         Unreviewed test gardening for WinCairo port.
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/add-blocking-to-redirect-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/add-blocking-to-redirect-database-expected.txt
deleted file mode 100644 (file)
index afef9cd..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-Tests that blocking is added mid-flight in redirects.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-  
-
---------
-Frame: '<!--frame1-->'
---------
-Should receive first-party cookie.
-Received cookie named 'firstPartyCookie'.
-Did not receive cookie named 'partitionedCookie'.
-Client-side document.cookie: firstPartyCookie=value
-
---------
-Frame: '<!--frame2-->'
---------
-Redirect case 1, should receive first-party cookie.
-Received cookie named 'firstPartyCookie'.
-Did not receive cookie named 'partitionedCookie'.
-Client-side document.cookie: firstPartyCookie=value
-
---------
-Frame: '<!--frame3-->'
---------
-Should receive no cookies.
-Did not receive cookie named 'firstPartyCookie'.
-Did not receive cookie named 'partitionedCookie'.
-Client-side document.cookie:
-
---------
-Frame: '<!--frame4-->'
---------
-Redirect case 2, should receive no cookie.
-Did not receive cookie named 'firstPartyCookie'.
-Did not receive cookie named 'partitionedCookie'.
-Client-side document.cookie:
-
---------
-Frame: '<!--frame5-->'
---------
-Try to set third-party cookie in blocked mode.
-
-
---------
-Frame: '<!--frame6-->'
---------
-After attempted cookie creation, should receive no cookie.
-Did not receive cookie named 'firstPartyCookie'.
-Did not receive cookie named 'partitionedCookie'.
-Client-side document.cookie:
-
---------
-Frame: '<!--frame7-->'
---------
-Redirect case 3, after attempted cookie creation, should receive no cookie.
-Did not receive cookie named 'firstPartyCookie'.
-Did not receive cookie named 'partitionedCookie'.
-Client-side document.cookie:
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/add-blocking-to-redirect-database.html b/LayoutTests/http/tests/resourceLoadStatistics/add-blocking-to-redirect-database.html
deleted file mode 100644 (file)
index 01d63a5..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    description("Tests that blocking is added mid-flight in redirects.");
-    jsTestIsAsync = true;
-
-    const partitionHost = "127.0.0.1:8000";
-    const thirdPartyOrigin = "http://localhost:8000";
-    const resourcePath = "/resourceLoadStatistics/resources";
-    const thirdPartyBaseUrl = thirdPartyOrigin + resourcePath;
-    const firstPartyCookieName = "firstPartyCookie";
-    const subPathToSetFirstPartyCookie = "/set-cookie.php?name=" + firstPartyCookieName + "&value=value";
-    const partitionedCookieName = "partitionedCookie";
-    const subPathToSetPartitionedCookie = "/set-cookie.php?name=" + partitionedCookieName + "&value=value";
-    const returnUrl = "http://" + partitionHost + "/resourceLoadStatistics/add-blocking-to-redirect.html";
-    const subPathToGetCookies = "/get-cookies.php?name1=" + firstPartyCookieName + "&name2=" + partitionedCookieName;
-    const redirectChainUrl = "http://" + partitionHost + resourcePath + "/redirect.php?redirectTo=" + thirdPartyBaseUrl + subPathToGetCookies;
-
-    function openIframe(url, onLoadHandler) {
-        const element = document.createElement("iframe");
-        element.src = url;
-        if (onLoadHandler) {
-            element.onload = onLoadHandler;
-        }
-        document.body.appendChild(element);
-    }
-
-    function runTest() {
-        switch (document.location.hash) {
-            case "#step1":
-                // Set first-party cookie for localhost.
-                document.location.href = thirdPartyBaseUrl + subPathToSetFirstPartyCookie + "#" + returnUrl + "#step2";
-                break;
-            case "#step2":
-                // Check that the cookie gets sent for localhost under 127.0.0.1 since localhost is not prevalent.
-                document.location.hash = "step3";
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should receive first-party cookie.", runTest);
-                break;
-            case "#step3":
-                document.location.hash = "step4";
-                // Load an iframe in a redirect chain that starts with 127.0.0.1 and ends with localhost. Expect a cookie for localhost.
-                openIframe(redirectChainUrl + "&message=Redirect case 1, should receive first-party cookie.", runTest);
-                break;
-            case "#step4":
-                // Set localhost as prevalent to put it in the blocking category.
-                document.location.hash = "step5";
-                testRunner.setStatisticsPrevalentResource(thirdPartyOrigin, true, function() {
-                    if (!testRunner.isStatisticsPrevalentResource(thirdPartyOrigin))
-                        testFailed("Host did not get set as prevalent resource.");
-                    testRunner.statisticsUpdateCookieBlocking(runTest);
-                });
-                break;
-            case "#step5":
-                // Check that no cookie gets sent for localhost under 127.0.0.1 since localhost's cookies are blocked.
-                document.location.hash = "step6";
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies +  "&message=Should receive no cookies.", runTest);
-                break;
-            case "#step6":
-                // Load an iframe in a redirect chain that starts with 127.0.0.1 and ends with localhost. Expect no cookie for localhost.
-                document.location.hash = "step7";
-                openIframe(redirectChainUrl + "&message=Redirect case 2, should receive no cookie.", runTest);
-                break;
-            case "#step7":
-                // Try to set cookie for localhost under 127.0.0.1.
-                document.location.hash = "step8";
-                openIframe(thirdPartyBaseUrl + subPathToSetPartitionedCookie + "&message=Try to set third-party cookie in blocked mode.", runTest);
-                break;
-            case "#step8":
-                // Check that no cookie gets sent for localhost under 127.0.0.1 since localhost's cookies are blocked.
-                document.location.hash = "step9";
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies +  "&message=After attempted cookie creation, should receive no cookie.", runTest);
-                break;
-            case "#step9":
-                // Load an iframe in a redirect chain that starts with 127.0.0.1 and ends with localhost. Expect no cookie for localhost.
-                document.location.hash = "step10";
-                openIframe(redirectChainUrl + "&message=Redirect case 3, after attempted cookie creation, should receive no cookie.", runTest);
-                break;
-            case "#step10":
-                setEnableFeature(false, finishJSTest);
-                break;
-        }
-    }
-
-    if (document.location.hash === "") {
-        testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, function () {
-            if (testRunner.isStatisticsPrevalentResource(thirdPartyOrigin))
-                testFailed("Localhost was classified as prevalent resource before the test starts.");
-            testRunner.dumpChildFramesAsText();
-            document.location.hash = "step1";
-            runTest();
-        });
-    } else {
-        runTest();
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/blocking-in-web-worker-script-import-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/blocking-in-web-worker-script-import-database-expected.txt
deleted file mode 100644 (file)
index 9cb7994..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-Test for cookie blocking when web workers import cross-site scripts.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Did receive firstPartyCookie == value
-PASS Did not receive cookie named firstPartyCookie
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
-
---------
-Frame: '<!--frame1-->'
---------
-Should receive first-party cookie.
-Received cookie named 'firstPartyCookie'.
-Client-side document.cookie: firstPartyCookie=value
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/blocking-in-web-worker-script-import-database.html b/LayoutTests/http/tests/resourceLoadStatistics/blocking-in-web-worker-script-import-database.html
deleted file mode 100644 (file)
index cc20108..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    description("Test for cookie blocking when web workers import cross-site scripts.");
-    jsTestIsAsync = true;
-
-    const partitionHost = "127.0.0.1:8000";
-    const thirdPartyOrigin = "http://localhost:8000";
-    const thirdPartyBaseUrl = thirdPartyOrigin + "/resourceLoadStatistics/resources";
-    const firstPartyCookieName = "firstPartyCookie";
-    const subPathToSetFirstPartyCookie = "/set-cookie.php?name=" + firstPartyCookieName + "&value=value";
-    const returnUrl = "http://127.0.0.1:8000/resourceLoadStatistics/blocking-in-web-worker-script-import.html";
-    const subPathToGetCookies = "/get-cookies.php?name1=" + firstPartyCookieName;
-
-    function openIframe(url, onLoadHandler) {
-        const element = document.createElement("iframe");
-        element.src = url;
-        if (onLoadHandler) {
-            element.onload = onLoadHandler;
-        }
-        document.body.appendChild(element);
-    }
-
-    let receivedMessages = 0;
-    function receiveMessage(event) {
-        if (event.data.indexOf("PASS") === -1)
-            testFailed(event.data.replace("FAIL ", ""));
-        else
-            testPassed(event.data.replace("PASS ", ""));
-
-        ++receivedMessages;
-        if (receivedMessages >= 2) {
-            setEnableFeature(false, finishJSTest);
-        } else
-            runTest();
-    }
-
-    function runTest() {
-        switch (document.location.hash) {
-            case "#step1":
-                document.location.href = thirdPartyBaseUrl + subPathToSetFirstPartyCookie + "#" + returnUrl + "#step2";
-                break;
-            case "#step2":
-                document.location.hash = "step3";
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should receive first-party cookie.", runTest);
-                break;
-            case "#step3":
-                document.location.hash = "step4";
-                let w1 = new Worker("resources/worker-importing-localhost-script.js");
-                w1.onmessage = receiveMessage;
-                w1.postMessage("shouldReceiveCookies=true");
-                break;
-            case "#step4":
-                document.location.hash = "step5";
-                testRunner.setStatisticsPrevalentResource(thirdPartyOrigin, true, function() {
-                    if (!testRunner.isStatisticsPrevalentResource(thirdPartyOrigin))
-                        testFailed("Host did not get set as prevalent resource.");
-                    testRunner.statisticsUpdateCookieBlocking(runTest);
-                });
-                break;
-            case "#step5":
-                let w2 = new Worker("resources/worker-importing-localhost-script.js");
-                w2.onmessage = receiveMessage;
-                w2.postMessage("shouldNotReceiveCookies");
-                break;
-        }
-    }
-
-    if (document.location.host === partitionHost && document.location.hash === "" && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, function() {
-            document.location.hash = "step1";
-            testRunner.dumpChildFramesAsText();
-            if (testRunner.isStatisticsPrevalentResource(thirdPartyOrigin))
-                testFailed("Localhost was classified as prevalent resource before the test starts.");
-            runTest();
-        });
-    } else {
-        runTest();
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/cap-cache-max-age-for-prevalent-resource-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/cap-cache-max-age-for-prevalent-resource-database-expected.txt
deleted file mode 100644 (file)
index 0cce5aa..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-Tests that cache max-age is capped for prevalent resources.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS loadedUrl is "http://localhost:8000/resourceLoadStatistics/resources/echo-query.php?value=1234"
-PASS loadedUrl is "http://localhost:8000/resourceLoadStatistics/resources/echo-query.php?value=4321"
-PASS loadedUrl is "http://localhost:8000/resourceLoadStatistics/resources/echo-query.php?value="
-PASS loadedUrl is "http://localhost:8000/resourceLoadStatistics/resources/echo-query.php?value="
-PASS loadedUrl is "http://localhost:8000/resourceLoadStatistics/resources/echo-query.php?value="
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/cap-cache-max-age-for-prevalent-resource-database.html b/LayoutTests/http/tests/resourceLoadStatistics/cap-cache-max-age-for-prevalent-resource-database.html
deleted file mode 100644 (file)
index 264a451..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-    <title>Tests for Capped Cache Max-Age</title>
-</head>
-<body>
-<script>
-    description("Tests that cache max-age is capped for prevalent resources.");
-    jsTestIsAsync = true;
-
-    var loadedUrl;
-    function firstFetch() {
-        // This should create a capped cache entry.
-        fetch("http://localhost:8000/resourceLoadStatistics/resources/cached-permanent-redirect.php",
-            {
-                cache: "reload",
-                headers: {
-                    "X-WebKit": "1234",
-                }
-            }
-        ).then(function(response) {
-            loadedUrl = response.url;
-            shouldBeEqualToString("loadedUrl", "http://localhost:8000/resourceLoadStatistics/resources/echo-query.php?value=1234");
-            secondFetch();
-        }).catch(function(error) {
-            testFailed(error.message);
-            setEnableFeature(false, finishJSTest);
-        });
-    }
-
-    function secondFetch() {
-        // This should not trigger a successful cache hit and instead create another capped cache entry.
-        fetch("http://localhost:8000/resourceLoadStatistics/resources/cached-permanent-redirect.php",
-            {
-                cache: "force-cache",
-                headers: {
-                    "X-WebKit": "4321",
-                }
-            }
-        ).then(function(response) {
-            loadedUrl = response.url;
-            shouldBeEqualToString("loadedUrl", "http://localhost:8000/resourceLoadStatistics/resources/echo-query.php?value=4321");
-            thirdFetch();
-        }).catch(function(error) {
-            testFailed(error.message);
-            setEnableFeature(false, finishJSTest);
-        });
-    }
-
-    function thirdFetch() {
-        // This should not trigger a successful cache hit and instead create another capped cache entry.
-        fetch("http://localhost:8000/resourceLoadStatistics/resources/cached-permanent-redirect.php",
-            {
-                cache: "force-cache",
-            }
-        ).then(function(response) {
-            loadedUrl = response.url;
-            shouldBeEqualToString("loadedUrl", "http://localhost:8000/resourceLoadStatistics/resources/echo-query.php?value=");
-            fourthFetch();
-        }).catch(function(error) {
-            testFailed(error.message);
-            setEnableFeature(false, finishJSTest);
-        });
-    }
-
-    function fourthFetch() {
-        // This should not trigger a successful cache hit but clear capping.
-        fetch("http://localhost:8000/resourceLoadStatistics/resources/cached-permanent-redirect.php",
-            {
-                cache: "force-cache",
-            }
-        ).then(function(response) {
-            loadedUrl = response.url;
-            shouldBeEqualToString("loadedUrl", "http://localhost:8000/resourceLoadStatistics/resources/echo-query.php?value=");
-            fifthFetch();
-        }).catch(function(error) {
-            testFailed(error.message);
-            setEnableFeature(false, finishJSTest);
-        });
-    }
-
-    function fifthFetch() {
-        // This should trigger a regular, successful cache hit.
-        fetch("http://localhost:8000/resourceLoadStatistics/resources/cached-permanent-redirect.php",
-            {
-                headers: {
-                    "X-WebKit": "1234",
-                }
-            }
-        ).then(function(response) {
-            loadedUrl = response.url;
-            shouldBeEqualToString("loadedUrl", "http://localhost:8000/resourceLoadStatistics/resources/echo-query.php?value=");
-            setEnableFeature(false, finishJSTest);
-        }).catch(function(error) {
-            testFailed(error.message);
-            setEnableFeature(false, finishJSTest);
-        });
-    }
-    testRunner.setUseITPDatabase(true);
-    setEnableFeature(true, function() {
-        if (testRunner.isStatisticsPrevalentResource("http://localhost"))
-            testFailed("Localhost was classified as prevalent resource before the test started.");
-
-        testRunner.setStatisticsCacheMaxAgeCap(0);
-        testRunner.setStatisticsPrevalentResource("http://localhost", true, function() {
-            testRunner.statisticsUpdateCookieBlocking(firstFetch);
-        });
-    });
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-database-expected.txt
deleted file mode 100644 (file)
index 484620d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-Check that cookies created by JavaScript with max-age or expiry longer than a week get capped to a week.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS The two short-lived cookies don't expire after more than 172830 seconds.
-PASS The two long-lived cookies don't expire after more than 604830 seconds.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-database.html b/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-database.html
deleted file mode 100644 (file)
index e2ffd04..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="/cookies/resources/cookie-utilities.js"></script>
-</head>
-<body>
-<script>
-    description("Check that cookies created by JavaScript with max-age or expiry longer than a week get capped to a week.");
-    jsTestIsAsync = true;
-    testRunner.setUseITPDatabase(true);
-
-    if (internals)
-        internals.setResourceLoadStatisticsEnabled(true);
-
-    let passedTests = 0;
-    function checkThatCookieDoesNotExpireAfter(cookieData, maxAgeInSeconds) {
-        let now = new Date();
-        let maxExpiryDateInMilliseconds = now.getTime() + (maxAgeInSeconds * 1000);
-
-        if (maxExpiryDateInMilliseconds > cookieData["expires"])
-            ++passedTests;
-        else
-            testFailed("Cookie named " + cookieData["name"] + " expires in more than " + maxAgeInSeconds + " seconds.");
-    }
-
-    const twoDaysInSeconds = 2 * 24 * 60 * 60;
-    const shortLivedCookieMaxAge = { name : "shortLivedCookieMaxAge", lifetime : "Max-Age=" + twoDaysInSeconds + ";" };
-    document.cookie = shortLivedCookieMaxAge.name + "=foobar; " + shortLivedCookieMaxAge.lifetime + " path=/";
-
-    const twoDaysAsExpiresDate = createExpiresDateFromMaxAge(twoDaysInSeconds);
-    const shortLivedCookieExpires = { name : "shortLivedCookieExpires", lifetime : "Expires=" + twoDaysAsExpiresDate + ";" };
-    document.cookie = shortLivedCookieExpires.name + "=foobar; " + shortLivedCookieExpires.lifetime + " path=/";
-
-    const oneWeekInSeconds = 7 * 24 * 60 * 60;
-    const twoWeeksInSeconds = 2 * oneWeekInSeconds;
-    const longLivedCookieMaxAge = { name : "longLivedCookieMaxAge", lifetime : "Max-Age=" + twoWeeksInSeconds + ";" };
-    document.cookie = longLivedCookieMaxAge.name + "=foobar; " + longLivedCookieMaxAge.lifetime + " path=/";
-
-    const twoWeeksAsExpiresDate = createExpiresDateFromMaxAge(twoWeeksInSeconds);
-    const longLivedCookieExpires = { name : "longLivedCookieExpires", lifetime : "Expires=" + twoWeeksAsExpiresDate + ";" };
-    document.cookie = longLivedCookieExpires.name + "=foobar; " + longLivedCookieExpires.lifetime + " path=/";
-
-    const overTwoDaysInSeconds = twoDaysInSeconds + 30;
-    const overOneWeekInSeconds = oneWeekInSeconds + 30;
-    if (internals) {
-        let cookies = internals.getCookies();
-        if (!cookies.length)
-            testFailed("No cookies found.");
-        for (let cookie of cookies) {
-            switch (cookie.name) {
-                case shortLivedCookieMaxAge.name:
-                    checkThatCookieDoesNotExpireAfter(cookie, overTwoDaysInSeconds);
-                    break;
-                case shortLivedCookieExpires.name:
-                    checkThatCookieDoesNotExpireAfter(cookie, overTwoDaysInSeconds);
-                    break;
-                case longLivedCookieMaxAge.name:
-                    checkThatCookieDoesNotExpireAfter(cookie, overOneWeekInSeconds);
-                    break;
-                case longLivedCookieExpires.name:
-                    checkThatCookieDoesNotExpireAfter(cookie, overOneWeekInSeconds);
-                    break;
-            }
-        }
-
-        resetCookiesForCurrentOrigin();
-
-        if (passedTests === 4) {
-            testPassed("The two short-lived cookies don't expire after more than " + overTwoDaysInSeconds + " seconds.");
-            testPassed("The two long-lived cookies don't expire after more than " + overOneWeekInSeconds + " seconds.");
-        } else
-            testFailed("At least one cookie's expiry attribute was beyond the test thresholds.");
-    } else
-        testFailed("No internals object.");
-
-    if (internals)
-        internals.setResourceLoadStatisticsEnabled(false);
-
-    finishJSTest();
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-decoration-same-site-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-decoration-same-site-database-expected.txt
deleted file mode 100644 (file)
index a49545a..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Check that cookies created by JavaScript after a same-site navigation with link decoration don't get capped to 24 hours.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS The two long-lived cookies expire after more than 86430 seconds.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-decoration-same-site-database.html b/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-decoration-same-site-database.html
deleted file mode 100644 (file)
index ed09991..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="/cookies/resources/cookie-utilities.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body onload="setTimeout('runTest()', 0)">
-<script>
-    description("Check that cookies created by JavaScript after a same-site navigation with link decoration don't get capped to 24 hours.");
-    jsTestIsAsync = true;
-
-    function testCookies() {
-        let passedTests = 0;
-
-        function checkThatCookieDoesExpireAfter(cookieData, maxAgeInSeconds) {
-            let now = new Date();
-            let maxExpiryDateInMilliseconds = now.getTime() + (maxAgeInSeconds * 1000);
-
-            if (maxExpiryDateInMilliseconds < cookieData["expires"])
-                ++passedTests;
-            else
-                testFailed("Cookie named " + cookieData["name"] + " expires in less than " + maxAgeInSeconds + " seconds.");
-        }
-
-        const oneDayInSeconds = 24 * 60 * 60;
-        const twoDaysInSeconds = 2 * oneDayInSeconds;
-        const longLivedCookieMaxAge = { name : "longLivedCookieMaxAge", lifetime : "Max-Age=" + twoDaysInSeconds + ";" };
-        document.cookie = longLivedCookieMaxAge.name + "=foobar; " + longLivedCookieMaxAge.lifetime + " path=/";
-
-        const twoDaysAsExpiresDate = createExpiresDateFromMaxAge(twoDaysInSeconds);
-        const longLivedCookieExpires = { name : "longLivedCookieExpires", lifetime : "Expires=" + twoDaysAsExpiresDate + ";" };
-        document.cookie = longLivedCookieExpires.name + "=foobar; " + longLivedCookieExpires.lifetime + " path=/";
-
-        const overOneDayInSeconds = oneDayInSeconds + 30;
-        if (internals) {
-            let cookies = internals.getCookies();
-            if (!cookies.length)
-                testFailed("No cookies found.");
-            for (let cookie of cookies) {
-                switch (cookie.name) {
-                    case longLivedCookieMaxAge.name:
-                        checkThatCookieDoesExpireAfter(cookie, overOneDayInSeconds);
-                        break;
-                    case longLivedCookieExpires.name:
-                        checkThatCookieDoesExpireAfter(cookie, overOneDayInSeconds);
-                        break;
-                }
-            }
-
-            resetCookiesForCurrentOrigin();
-
-            if (passedTests === 2) {
-                testPassed("The two long-lived cookies expire after more than " + overOneDayInSeconds + " seconds.");
-            } else
-                testFailed("At least one cookie's expiry attribute was below the test thresholds.");
-        } else
-            testFailed("No internals object.");
-
-        setEnableFeature(false, finishJSTest);
-    }
-
-    function navigateCrossOrigin() {
-        document.location.href = prevalentResourceOrigin + "/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-decoration-same-site.html?link=decoration#fragment";
-    }
-
-    const destinationOrigin = "http://localhost:8000";
-    const prevalentResourceOrigin = "http://127.0.0.1:8000";
-    function runTest() {
-        if (document.location.origin === prevalentResourceOrigin && document.location.hash !== "#fragment") {
-            testRunner.setUseITPDatabase(true);
-            setEnableFeature(true, function () {
-                testRunner.setStatisticsPrevalentResource(prevalentResourceOrigin, true, function() {
-                    if (!testRunner.isStatisticsPrevalentResource(prevalentResourceOrigin))
-                        testFailed("Host did not get set as prevalent resource.");
-                    testRunner.statisticsUpdateCookieBlocking(navigateCrossOrigin);
-                });
-
-            });
-        } else {
-            testCookies();
-        }
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-fragment-from-prevalent-resource-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-fragment-from-prevalent-resource-database-expected.txt
deleted file mode 100644 (file)
index f7bad03..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-Check that cookies created by JavaScript after a cross-site navigation with link fragment get capped to 24 hours.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS The two short-lived cookies don't expire after more than 43230 seconds.
-PASS The two long-lived cookies don't expire after more than 86430 seconds.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-fragment-from-prevalent-resource-database.html b/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-fragment-from-prevalent-resource-database.html
deleted file mode 100644 (file)
index 5c84fb8..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="/cookies/resources/cookie-utilities.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body onload="setTimeout('runTest()', 0)">
-<script>
-    description("Check that cookies created by JavaScript after a cross-site navigation with link fragment get capped to 24 hours.");
-    jsTestIsAsync = true;
-
-    function testCookies() {
-        let passedTests = 0;
-        function checkThatCookieDoesNotExpireAfter(cookieData, maxAgeInSeconds) {
-            let now = new Date();
-            let maxExpiryDateInMilliseconds = now.getTime() + (maxAgeInSeconds * 1000);
-
-            if (maxExpiryDateInMilliseconds > cookieData["expires"])
-                ++passedTests;
-            else
-                testFailed("Cookie named " + cookieData["name"] + " expires in more than " + maxAgeInSeconds + " seconds.");
-        }
-
-        const twelveHoursInSeconds = 12 * 60 * 60;
-        const shortLivedCookieMaxAge = { name : "shortLivedCookieMaxAge", lifetime : "Max-Age=" + twelveHoursInSeconds + ";" };
-        document.cookie = shortLivedCookieMaxAge.name + "=foobar; " + shortLivedCookieMaxAge.lifetime + " path=/";
-
-        const twelveHoursAsExpiresDate = createExpiresDateFromMaxAge(twelveHoursInSeconds);
-        const shortLivedCookieExpires = { name : "shortLivedCookieExpires", lifetime : "Expires=" + twelveHoursAsExpiresDate + ";" };
-        document.cookie = shortLivedCookieExpires.name + "=foobar; " + shortLivedCookieExpires.lifetime + " path=/";
-
-        const oneDayInSeconds = 2 * twelveHoursInSeconds;
-        const twoDaysInSeconds = 2 * oneDayInSeconds;
-        const longLivedCookieMaxAge = { name : "longLivedCookieMaxAge", lifetime : "Max-Age=" + twoDaysInSeconds + ";" };
-        document.cookie = longLivedCookieMaxAge.name + "=foobar; " + longLivedCookieMaxAge.lifetime + " path=/";
-
-        const twoDaysAsExpiresDate = createExpiresDateFromMaxAge(twoDaysInSeconds);
-        const longLivedCookieExpires = { name : "longLivedCookieExpires", lifetime : "Expires=" + twoDaysAsExpiresDate + ";" };
-        document.cookie = longLivedCookieExpires.name + "=foobar; " + longLivedCookieExpires.lifetime + " path=/";
-
-        const overTwelveHoursInSeconds = twelveHoursInSeconds + 30;
-        const overOneDayInSeconds = oneDayInSeconds + 30;
-        if (internals) {
-            let cookies = internals.getCookies();
-            if (!cookies.length)
-                testFailed("No cookies found.");
-            for (let cookie of cookies) {
-                switch (cookie.name) {
-                    case shortLivedCookieMaxAge.name:
-                        checkThatCookieDoesNotExpireAfter(cookie, overTwelveHoursInSeconds);
-                        break;
-                    case shortLivedCookieExpires.name:
-                        checkThatCookieDoesNotExpireAfter(cookie, overTwelveHoursInSeconds);
-                        break;
-                    case longLivedCookieMaxAge.name:
-                        checkThatCookieDoesNotExpireAfter(cookie, overOneDayInSeconds);
-                        break;
-                    case longLivedCookieExpires.name:
-                        checkThatCookieDoesNotExpireAfter(cookie, overOneDayInSeconds);
-                        break;
-                }
-            }
-
-            resetCookiesForCurrentOrigin();
-
-            if (passedTests === 4) {
-                testPassed("The two short-lived cookies don't expire after more than " + overTwelveHoursInSeconds + " seconds.");
-                testPassed("The two long-lived cookies don't expire after more than " + overOneDayInSeconds + " seconds.");
-            } else
-                testFailed("At least one cookie's expiry attribute was beyond the test thresholds.");
-        } else
-            testFailed("No internals object.");
-
-        setEnableFeature(false, finishJSTest);
-    }
-
-    function navigateCrossOrigin() {
-        document.location.href = destinationOrigin + "/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-fragment-from-prevalent-resource.html#link=fragment";
-    }
-
-    const destinationOrigin = "http://localhost:8000";
-    const prevalentResourceOrigin = "http://127.0.0.1:8000";
-    function runTest() {
-        if (document.location.origin === prevalentResourceOrigin) {
-            testRunner.setUseITPDatabase(true);
-            setEnableFeature(true, function () {
-                testRunner.setStatisticsPrevalentResource(prevalentResourceOrigin, true, function() {
-                    if (!testRunner.isStatisticsPrevalentResource(prevalentResourceOrigin))
-                        testFailed("Host did not get set as prevalent resource.");
-                    testRunner.statisticsUpdateCookieBlocking(navigateCrossOrigin);
-                });
-
-            });
-        } else {
-            testCookies();
-        }
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-and-fragment-from-prevalent-resource-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-and-fragment-from-prevalent-resource-database-expected.txt
deleted file mode 100644 (file)
index 6e98dc8..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-Check that cookies created by JavaScript after a cross-site navigation with link query and fragment get capped to 24 hours.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS The two short-lived cookies don't expire after more than 43230 seconds.
-PASS The two long-lived cookies don't expire after more than 86430 seconds.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-and-fragment-from-prevalent-resource-database.html b/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-and-fragment-from-prevalent-resource-database.html
deleted file mode 100644 (file)
index 3591eb4..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="/cookies/resources/cookie-utilities.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body onload="setTimeout('runTest()', 0)">
-<script>
-    description("Check that cookies created by JavaScript after a cross-site navigation with link query and fragment get capped to 24 hours.");
-    jsTestIsAsync = true;
-
-    function testCookies() {
-        let passedTests = 0;
-        function checkThatCookieDoesNotExpireAfter(cookieData, maxAgeInSeconds) {
-            let now = new Date();
-            let maxExpiryDateInMilliseconds = now.getTime() + (maxAgeInSeconds * 1000);
-
-            if (maxExpiryDateInMilliseconds > cookieData["expires"])
-                ++passedTests;
-            else
-                testFailed("Cookie named " + cookieData["name"] + " expires in more than " + maxAgeInSeconds + " seconds.");
-        }
-
-        const twelveHoursInSeconds = 12 * 60 * 60;
-        const shortLivedCookieMaxAge = { name : "shortLivedCookieMaxAge", lifetime : "Max-Age=" + twelveHoursInSeconds + ";" };
-        document.cookie = shortLivedCookieMaxAge.name + "=foobar; " + shortLivedCookieMaxAge.lifetime + " path=/";
-
-        const twelveHoursAsExpiresDate = createExpiresDateFromMaxAge(twelveHoursInSeconds);
-        const shortLivedCookieExpires = { name : "shortLivedCookieExpires", lifetime : "Expires=" + twelveHoursAsExpiresDate + ";" };
-        document.cookie = shortLivedCookieExpires.name + "=foobar; " + shortLivedCookieExpires.lifetime + " path=/";
-
-        const oneDayInSeconds = 2 * twelveHoursInSeconds;
-        const twoDaysInSeconds = 2 * oneDayInSeconds;
-        const longLivedCookieMaxAge = { name : "longLivedCookieMaxAge", lifetime : "Max-Age=" + twoDaysInSeconds + ";" };
-        document.cookie = longLivedCookieMaxAge.name + "=foobar; " + longLivedCookieMaxAge.lifetime + " path=/";
-
-        const twoDaysAsExpiresDate = createExpiresDateFromMaxAge(twoDaysInSeconds);
-        const longLivedCookieExpires = { name : "longLivedCookieExpires", lifetime : "Expires=" + twoDaysAsExpiresDate + ";" };
-        document.cookie = longLivedCookieExpires.name + "=foobar; " + longLivedCookieExpires.lifetime + " path=/";
-
-        const overTwelveHoursInSeconds = twelveHoursInSeconds + 30;
-        const overOneDayInSeconds = oneDayInSeconds + 30;
-        if (internals) {
-            let cookies = internals.getCookies();
-            if (!cookies.length)
-                testFailed("No cookies found.");
-            for (let cookie of cookies) {
-                switch (cookie.name) {
-                    case shortLivedCookieMaxAge.name:
-                        checkThatCookieDoesNotExpireAfter(cookie, overTwelveHoursInSeconds);
-                        break;
-                    case shortLivedCookieExpires.name:
-                        checkThatCookieDoesNotExpireAfter(cookie, overTwelveHoursInSeconds);
-                        break;
-                    case longLivedCookieMaxAge.name:
-                        checkThatCookieDoesNotExpireAfter(cookie, overOneDayInSeconds);
-                        break;
-                    case longLivedCookieExpires.name:
-                        checkThatCookieDoesNotExpireAfter(cookie, overOneDayInSeconds);
-                        break;
-                }
-            }
-
-            resetCookiesForCurrentOrigin();
-
-            if (passedTests === 4) {
-                testPassed("The two short-lived cookies don't expire after more than " + overTwelveHoursInSeconds + " seconds.");
-                testPassed("The two long-lived cookies don't expire after more than " + overOneDayInSeconds + " seconds.");
-            } else
-                testFailed("At least one cookie's expiry attribute was beyond the test thresholds.");
-        } else
-            testFailed("No internals object.");
-
-        setEnableFeature(false, finishJSTest);
-    }
-
-    function navigateCrossOrigin() {
-        document.location.href = destinationOrigin + "/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-and-fragment-from-prevalent-resource.html?link=query#link=fragment";
-    }
-
-    const destinationOrigin = "http://localhost:8000";
-    const prevalentResourceOrigin = "http://127.0.0.1:8000";
-    function runTest() {
-        if (document.location.origin === prevalentResourceOrigin) {
-            testRunner.setUseITPDatabase(true);
-            setEnableFeature(true, function () {
-                testRunner.setStatisticsPrevalentResource(prevalentResourceOrigin, true, function() {
-                    if (!testRunner.isStatisticsPrevalentResource(prevalentResourceOrigin))
-                        testFailed("Host did not get set as prevalent resource.");
-                    testRunner.statisticsUpdateCookieBlocking(navigateCrossOrigin);
-                });
-
-            });
-        } else {
-            testCookies();
-        }
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-from-prevalent-resource-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-from-prevalent-resource-database-expected.txt
deleted file mode 100644 (file)
index d45dd16..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-Check that cookies created by JavaScript after a cross-site navigation with link query get capped to 24 hours.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS The two short-lived cookies don't expire after more than 43230 seconds.
-PASS The two long-lived cookies don't expire after more than 86430 seconds.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-from-prevalent-resource-database.html b/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-from-prevalent-resource-database.html
deleted file mode 100644 (file)
index 25f0976..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="/cookies/resources/cookie-utilities.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body onload="setTimeout('runTest()', 0)">
-<script>
-    description("Check that cookies created by JavaScript after a cross-site navigation with link query get capped to 24 hours.");
-    jsTestIsAsync = true;
-
-    function testCookies() {
-        let passedTests = 0;
-        function checkThatCookieDoesNotExpireAfter(cookieData, maxAgeInSeconds) {
-            let now = new Date();
-            let maxExpiryDateInMilliseconds = now.getTime() + (maxAgeInSeconds * 1000);
-
-            if (maxExpiryDateInMilliseconds > cookieData["expires"])
-                ++passedTests;
-            else
-                testFailed("Cookie named " + cookieData["name"] + " expires in more than " + maxAgeInSeconds + " seconds.");
-        }
-
-        const twelveHoursInSeconds = 12 * 60 * 60;
-        const shortLivedCookieMaxAge = { name : "shortLivedCookieMaxAge", lifetime : "Max-Age=" + twelveHoursInSeconds + ";" };
-        document.cookie = shortLivedCookieMaxAge.name + "=foobar; " + shortLivedCookieMaxAge.lifetime + " path=/";
-
-        const twelveHoursAsExpiresDate = createExpiresDateFromMaxAge(twelveHoursInSeconds);
-        const shortLivedCookieExpires = { name : "shortLivedCookieExpires", lifetime : "Expires=" + twelveHoursAsExpiresDate + ";" };
-        document.cookie = shortLivedCookieExpires.name + "=foobar; " + shortLivedCookieExpires.lifetime + " path=/";
-
-        const oneDayInSeconds = 2 * twelveHoursInSeconds;
-        const twoDaysInSeconds = 2 * oneDayInSeconds;
-        const longLivedCookieMaxAge = { name : "longLivedCookieMaxAge", lifetime : "Max-Age=" + twoDaysInSeconds + ";" };
-        document.cookie = longLivedCookieMaxAge.name + "=foobar; " + longLivedCookieMaxAge.lifetime + " path=/";
-
-        const twoDaysAsExpiresDate = createExpiresDateFromMaxAge(twoDaysInSeconds);
-        const longLivedCookieExpires = { name : "longLivedCookieExpires", lifetime : "Expires=" + twoDaysAsExpiresDate + ";" };
-        document.cookie = longLivedCookieExpires.name + "=foobar; " + longLivedCookieExpires.lifetime + " path=/";
-
-        const overTwelveHoursInSeconds = twelveHoursInSeconds + 30;
-        const overOneDayInSeconds = oneDayInSeconds + 30;
-        if (internals) {
-            let cookies = internals.getCookies();
-            if (!cookies.length)
-                testFailed("No cookies found.");
-            for (let cookie of cookies) {
-                switch (cookie.name) {
-                    case shortLivedCookieMaxAge.name:
-                        checkThatCookieDoesNotExpireAfter(cookie, overTwelveHoursInSeconds);
-                        break;
-                    case shortLivedCookieExpires.name:
-                        checkThatCookieDoesNotExpireAfter(cookie, overTwelveHoursInSeconds);
-                        break;
-                    case longLivedCookieMaxAge.name:
-                        checkThatCookieDoesNotExpireAfter(cookie, overOneDayInSeconds);
-                        break;
-                    case longLivedCookieExpires.name:
-                        checkThatCookieDoesNotExpireAfter(cookie, overOneDayInSeconds);
-                        break;
-                }
-            }
-
-            resetCookiesForCurrentOrigin();
-
-            if (passedTests === 4) {
-                testPassed("The two short-lived cookies don't expire after more than " + overTwelveHoursInSeconds + " seconds.");
-                testPassed("The two long-lived cookies don't expire after more than " + overOneDayInSeconds + " seconds.");
-            } else
-                testFailed("At least one cookie's expiry attribute was beyond the test thresholds.");
-        } else
-            testFailed("No internals object.");
-        
-        setEnableFeature(false, finishJSTest);
-    }
-
-    function navigateCrossOrigin() {
-        document.location.href = destinationOrigin + "/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-from-prevalent-resource.html?link=query";
-    }
-
-    const destinationOrigin = "http://localhost:8000";
-    const prevalentResourceOrigin = "http://127.0.0.1:8000";
-    function runTest() {
-        if (document.location.origin === prevalentResourceOrigin) {
-            testRunner.setUseITPDatabase(true);
-            setEnableFeature(true, function () {
-                testRunner.setStatisticsPrevalentResource(prevalentResourceOrigin, true, function() {
-                    if (!testRunner.isStatisticsPrevalentResource(prevalentResourceOrigin))
-                        testFailed("Host did not get set as prevalent resource.");
-                    testRunner.statisticsUpdateCookieBlocking(navigateCrossOrigin);
-                });
-
-            });
-        } else {
-            testCookies();
-        }
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-without-link-decoration-from-prevalent-resource-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-without-link-decoration-from-prevalent-resource-database-expected.txt
deleted file mode 100644 (file)
index 3bf649a..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Check that cookies created by JavaScript after a cross-site navigation without link decoration don't get capped to 24 hours.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS The two long-lived cookies expire after more than 86430 seconds.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-without-link-decoration-from-prevalent-resource-database.html b/LayoutTests/http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-without-link-decoration-from-prevalent-resource-database.html
deleted file mode 100644 (file)
index ae47b49..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="/cookies/resources/cookie-utilities.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body onload="setTimeout('runTest()', 0)">
-<script>
-    description("Check that cookies created by JavaScript after a cross-site navigation without link decoration don't get capped to 24 hours.");
-    jsTestIsAsync = true;
-
-    function testCookies() {
-        let passedTests = 0;
-
-        function checkThatCookieDoesExpireAfter(cookieData, maxAgeInSeconds) {
-            let now = new Date();
-            let maxExpiryDateInMilliseconds = now.getTime() + (maxAgeInSeconds * 1000);
-
-            if (maxExpiryDateInMilliseconds < cookieData["expires"])
-                ++passedTests;
-            else
-                testFailed("Cookie named " + cookieData["name"] + " expires in less than " + maxAgeInSeconds + " seconds.");
-        }
-
-        const oneDayInSeconds = 24 * 60 * 60;
-        const twoDaysInSeconds = 2 * oneDayInSeconds;
-        const longLivedCookieMaxAge = { name : "longLivedCookieMaxAge", lifetime : "Max-Age=" + twoDaysInSeconds + ";" };
-        document.cookie = longLivedCookieMaxAge.name + "=foobar; " + longLivedCookieMaxAge.lifetime + " path=/";
-
-        const twoDaysAsExpiresDate = createExpiresDateFromMaxAge(twoDaysInSeconds);
-        const longLivedCookieExpires = { name : "longLivedCookieExpires", lifetime : "Expires=" + twoDaysAsExpiresDate + ";" };
-        document.cookie = longLivedCookieExpires.name + "=foobar; " + longLivedCookieExpires.lifetime + " path=/";
-
-        const overOneDayInSeconds = oneDayInSeconds + 30;
-        if (internals) {
-            let cookies = internals.getCookies();
-            if (!cookies.length)
-                testFailed("No cookies found.");
-            for (let cookie of cookies) {
-                switch (cookie.name) {
-                    case longLivedCookieMaxAge.name:
-                        checkThatCookieDoesExpireAfter(cookie, overOneDayInSeconds);
-                        break;
-                    case longLivedCookieExpires.name:
-                        checkThatCookieDoesExpireAfter(cookie, overOneDayInSeconds);
-                        break;
-                }
-            }
-
-            resetCookiesForCurrentOrigin();
-
-            if (passedTests === 2) {
-                testPassed("The two long-lived cookies expire after more than " + overOneDayInSeconds + " seconds.");
-            } else
-                testFailed("At least one cookie's expiry attribute was below the test thresholds.");
-        } else
-            testFailed("No internals object.");
-            
-        setEnableFeature(false, finishJSTest);
-    }
-
-    function navigateCrossOrigin() {
-        document.location.href = destinationOrigin + "/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-without-link-decoration-from-prevalent-resource.html";
-    }
-
-    const destinationOrigin = "http://localhost:8000";
-    const prevalentResourceOrigin = "http://127.0.0.1:8000";
-    function runTest() {
-        if (document.location.origin === prevalentResourceOrigin) {
-            testRunner.setUseITPDatabase(true);
-            setEnableFeature(true, function () {
-                testRunner.setStatisticsPrevalentResource(prevalentResourceOrigin, true, function() {
-                    if (!testRunner.isStatisticsPrevalentResource(prevalentResourceOrigin))
-                        testFailed("Host did not get set as prevalent resource.");
-                    testRunner.statisticsUpdateCookieBlocking(navigateCrossOrigin);
-                });
-
-            });
-        } else {
-            testCookies();
-        }
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-database-expected.txt
deleted file mode 100644 (file)
index 20c258b..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS Host did not get classified as prevalent resource.
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-database.html b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-database.html
deleted file mode 100644 (file)
index 4e03fd8..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Tests for Classification Based on Mixed Statistics</title>
-    <script src="/js-test-resources/js-test.js"></script>
-</head>
-<body>
-<script>
-    const hostUnderTest = "127.0.0.1:8000";
-    const statisticsUrl = "http://" + hostUnderTest + "/temp";
-    const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
-    const topFrameOrigin2 = "http://127.0.0.3:8000/temp";
-    const topFrameOrigin3 = "http://127.0.0.4:8000/temp";
-
-    function completeTest() {
-        if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-            testFailed("Host classified as prevalent resource.");
-        else
-            testPassed("Host did not get classified as prevalent resource.");
-
-        testRunner.statisticsResetToConsistentState(function() {
-            testRunner.notifyDone();
-        });
-    }
-
-    function runTestRunnerTest() {
-        testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-
-        testRunner.setStatisticsPrevalentResource(statisticsUrl, false, function() {
-            if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                testFailed("Host did not get set as non-prevalent resource.");
-
-            testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin1);
-            testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin2);
-            testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin3);
-
-            testRunner.installStatisticsDidScanDataRecordsCallback(completeTest);
-
-            testRunner.statisticsProcessStatisticsAndDataRecords();
-        });
-    }
-
-    if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        testRunner.waitUntilDone();
-        internals.setResourceLoadStatisticsEnabled(true);
-        runTestRunnerTest();
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-database-expected.txt
deleted file mode 100644 (file)
index 20c258b..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-PASS successfullyParsed is true
-
-TEST COMPLETE
-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-database.html b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-database.html
deleted file mode 100644 (file)
index b854090..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Tests for Classification Based on Sub Frame Under Top Frame Origins</title>
-    <script src="/js-test-resources/js-test.js"></script>
-</head>
-<body>
-<script>
-    const hostUnderTest = "127.0.0.1:8000";
-    const statisticsUrl = "http://" + hostUnderTest + "/temp";
-    const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
-    const topFrameOrigin2 = "http://127.0.0.3:8000/temp";
-    const topFrameOrigin3 = "http://127.0.0.4:8000/temp";
-
-    function completeTest() {
-        if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-            testFailed("Host classified as prevalent resource.");
-        else
-            testPassed("Host did not get classified as prevalent resource.");
-
-        testRunner.statisticsResetToConsistentState(function() {
-            testRunner.notifyDone();
-        });
-    }
-
-    function runTestRunnerTest() {
-        testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-
-        testRunner.setStatisticsPrevalentResource(statisticsUrl, false, function() {
-            if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                testFailed("Host did not get set as non-prevalent resource.");
-
-            testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin1);
-            testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin2);
-            testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin3);
-
-            testRunner.installStatisticsDidScanDataRecordsCallback(completeTest);
-            testRunner.installStatisticsDidModifyDataRecordsCallback(completeTest);
-
-            testRunner.statisticsProcessStatisticsAndDataRecords();
-        });
-    }
-
-    if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        testRunner.waitUntilDone();
-        internals.setResourceLoadStatisticsEnabled(true);
-        runTestRunnerTest();
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-database-expected.txt
deleted file mode 100644 (file)
index 20c258b..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-PASS successfullyParsed is true
-
-TEST COMPLETE
-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-database.html b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-database.html
deleted file mode 100644 (file)
index 161120a..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Tests for Classification Based on Subresource Under Top Frame Origins</title>
-    <script src="/js-test-resources/js-test.js"></script>
-</head>
-<body>
-<script>
-    const hostUnderTest = "127.0.0.1:8000";
-    const statisticsUrl = "http://" + hostUnderTest + "/temp";
-    const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
-    const topFrameOrigin2 = "http://127.0.0.3:8000/temp";
-
-    function completeTest() {
-        if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-            testFailed("Host classified as prevalent resource.");
-        else
-            testPassed("Host did not get classified as prevalent resource.");
-
-        testRunner.statisticsResetToConsistentState(function() {
-            testRunner.notifyDone();
-        });
-    }
-
-    function runTestRunnerTest() {
-        testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-        testRunner.setStatisticsPrevalentResource(statisticsUrl, false, function() {
-            if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                testFailed("Host did not get set as non-prevalent resource.");
-
-            testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin1);
-            testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin2);
-
-            testRunner.installStatisticsDidScanDataRecordsCallback(completeTest);
-
-            testRunner.statisticsProcessStatisticsAndDataRecords();
-        });
-    }
-
-    if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        testRunner.waitUntilDone();
-        internals.setResourceLoadStatisticsEnabled(true);
-        runTestRunnerTest();
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-database-expected.txt
deleted file mode 100644 (file)
index 20c258b..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-PASS successfullyParsed is true
-
-TEST COMPLETE
-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-database.html b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-database.html
deleted file mode 100644 (file)
index 1a5a5d4..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Tests for Classification Based on Subresource Unique Redirects To</title>
-    <script src="/js-test-resources/js-test.js"></script>
-</head>
-<body>
-<script>
-    const hostUnderTest = "127.0.0.1:8000";
-    const statisticsUrl = "http://" + hostUnderTest + "/temp";
-    const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
-    const topFrameOrigin2 = "http://127.0.0.3:8000/temp";
-
-    function completeTest() {
-        if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-            testFailed("Host classified as prevalent resource.");
-        else
-            testPassed("Host did not get classified as prevalent resource.");
-
-        internals.setResourceLoadStatisticsEnabled(false);
-        testRunner.statisticsResetToConsistentState(function() {
-            testRunner.notifyDone();
-        });
-    }
-
-    function runTestRunnerTest() {
-        testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-        testRunner.setStatisticsPrevalentResource(statisticsUrl, false, function() {
-            if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                testFailed("Host did not get set as non-prevalent resource.");
-
-            testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin1);
-            testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin2);
-
-            testRunner.installStatisticsDidScanDataRecordsCallback(completeTest);
-
-            testRunner.statisticsProcessStatisticsAndDataRecords();
-        });
-    }
-
-    if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        testRunner.waitUntilDone();
-        internals.setResourceLoadStatisticsEnabled(true);
-        runTestRunnerTest();
-        testRunner.setUseITPDatabase(false);
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-database-expected.txt
deleted file mode 100644 (file)
index 32dd69f..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS Host classified as prevalent resource.
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-database.html b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-database.html
deleted file mode 100644 (file)
index 3897319..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Tests for Classification Based on Mixed Statistics</title>
-    <script src="/js-test-resources/js-test.js"></script>
-</head>
-<body>
-<script>
-    const hostUnderTest = "127.0.0.1:8000";
-    const statisticsUrl = "http://" + hostUnderTest + "/temp";
-    const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
-    const topFrameOrigin2 = "http://127.0.0.3:8000/temp";
-    const topFrameOrigin3 = "http://127.0.0.4:8000/temp";
-    const topFrameOrigin4 = "http://127.0.0.5:8000/temp";
-
-    function completeTest() {
-        if (!testRunner.isStatisticsPrevalentResource(statisticsUrl))
-            testFailed("Host did not get classified as prevalent resource.");
-        if (testRunner.isStatisticsVeryPrevalentResource(statisticsUrl))
-            testFailed("Host got classified as very prevalent resource.");
-        else
-            testPassed("Host classified as prevalent resource.");
-
-        internals.setResourceLoadStatisticsEnabled(false);
-        testRunner.statisticsResetToConsistentState(function() {
-            testRunner.notifyDone();
-        });
-    }
-
-    function runTestRunnerTest() {
-        testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-        testRunner.setStatisticsPrevalentResource(statisticsUrl, false, function() {
-            if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                testFailed("Host did not get set as non-prevalent resource.");
-
-            testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin1);
-            testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin4);
-
-            testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin2);
-            testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin3);
-            testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin4);
-
-            testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin3);
-            testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin1);
-
-            testRunner.installStatisticsDidScanDataRecordsCallback(completeTest);
-
-            testRunner.statisticsProcessStatisticsAndDataRecords();
-        });
-    }
-
-    if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        testRunner.waitUntilDone();
-        internals.setResourceLoadStatisticsEnabled(true);
-        runTestRunnerTest();
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-database-expected.txt
deleted file mode 100644 (file)
index 32dd69f..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS Host classified as prevalent resource.
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-database.html b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-database.html
deleted file mode 100644 (file)
index 7ea7620..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Tests for Classification Based on Sub Frame Under Top Frame Origins</title>
-    <script src="/js-test-resources/js-test.js"></script>
-</head>
-<body>
-<script>
-    const hostUnderTest = "127.0.0.1:8000";
-    const statisticsUrl = "http://" + hostUnderTest + "/temp";
-    const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
-    const topFrameOrigin2 = "http://127.0.0.3:8000/temp";
-    const topFrameOrigin3 = "http://127.0.0.4:8000/temp";
-    const topFrameOrigin4 = "http://127.0.0.5:8000/temp";
-
-    function completeTest() {
-        if (!testRunner.isStatisticsPrevalentResource(statisticsUrl))
-            testFailed("Host did not get classified as prevalent resource.");
-        if (testRunner.isStatisticsVeryPrevalentResource(statisticsUrl))
-            testFailed("Host got classified as very prevalent resource.");
-        else
-            testPassed("Host classified as prevalent resource.");
-
-        internals.setResourceLoadStatisticsEnabled(false);
-        testRunner.statisticsResetToConsistentState(function() {
-            testRunner.notifyDone();
-        });
-    }
-
-    function runTestRunnerTest() {
-        testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-
-        testRunner.setStatisticsPrevalentResource(statisticsUrl, false, function() {
-            if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                testFailed("Host did not get set as non-prevalent resource.");
-
-            testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin1);
-            testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin2);
-            testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin3);
-            testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin4);
-
-            testRunner.installStatisticsDidScanDataRecordsCallback(completeTest);
-
-            testRunner.statisticsProcessStatisticsAndDataRecords();
-        });
-    }
-
-    if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        testRunner.waitUntilDone();
-        internals.setResourceLoadStatisticsEnabled(true);
-        runTestRunnerTest();
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-redirect-collusion-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-redirect-collusion-database-expected.txt
deleted file mode 100644 (file)
index e4ddce5..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-Tests for classification based on subresource redirect collusion.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Colluding host 1 got set as prevalent resource.
-PASS Colluding host 2 got set as prevalent resource.
-PASS Colluding host 3 got set as prevalent resource.
-PASS Colluding host 4 got set as prevalent resource.
-PASS Colluding localhost got set as prevalent resource after actual sub frame redirect.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-redirect-collusion-database.html b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-redirect-collusion-database.html
deleted file mode 100644 (file)
index e4bfb2f..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    description("Tests for classification based on subresource redirect collusion.");
-    jsTestIsAsync = true;
-
-    const hostUnderTest = "127.0.0.1:8000";
-    const statisticsUrl = "http://" + hostUnderTest + "/temp";
-    const subresourceOrigin1 = "http://127.0.0.2:8000/temp";
-    const subresourceOrigin2 = "http://127.0.0.3:8000/temp";
-    const subresourceOrigin3 = "http://127.0.0.4:8000/temp";
-    const subresourceOrigin4 = "http://127.0.0.5:8000/temp";
-
-    function runTest() {
-        testRunner.statisticsNotifyObserver();
-
-        testRunner.setStatisticsSubresourceUniqueRedirectFrom(statisticsUrl, subresourceOrigin1);
-        testRunner.setStatisticsSubresourceUniqueRedirectFrom(subresourceOrigin1, subresourceOrigin2);
-        testRunner.setStatisticsSubresourceUniqueRedirectFrom(subresourceOrigin2, subresourceOrigin3);
-        testRunner.setStatisticsSubresourceUniqueRedirectFrom(subresourceOrigin3, subresourceOrigin4);
-
-        testRunner.setStatisticsPrevalentResource(statisticsUrl, true, function() {
-            if (!testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                testFailed("Host explicity set did not get set as prevalent resource.");
-            if (testRunner.isStatisticsPrevalentResource(subresourceOrigin1))
-                testPassed("Colluding host 1 got set as prevalent resource.");
-            if (testRunner.isStatisticsVeryPrevalentResource(subresourceOrigin1))
-                testFailed("Colluding host 1 got classified as very prevalent resource.");
-            if (testRunner.isStatisticsPrevalentResource(subresourceOrigin2))
-                testPassed("Colluding host 2 got set as prevalent resource.");
-            if (testRunner.isStatisticsVeryPrevalentResource(subresourceOrigin2))
-                testFailed("Colluding host 2 got classified as very prevalent resource.");
-            if (testRunner.isStatisticsPrevalentResource(subresourceOrigin3))
-                testPassed("Colluding host 3 got set as prevalent resource.");
-            if (testRunner.isStatisticsVeryPrevalentResource(subresourceOrigin3))
-                testFailed("Colluding host 3 got classified as very prevalent resource.");
-            if (testRunner.isStatisticsPrevalentResource(subresourceOrigin4))
-                testPassed("Colluding host 4 got set as prevalent resource.");
-            if (testRunner.isStatisticsVeryPrevalentResource(subresourceOrigin4))
-                testFailed("Colluding host 4 got classified as very prevalent resource.");
-            if (testRunner.isStatisticsPrevalentResource("http://localhost:8000"))
-                testPassed("Colluding localhost got set as prevalent resource after actual sub frame redirect.");
-            if (testRunner.isStatisticsVeryPrevalentResource("http://localhost:8000"))
-                testFailed("Colluding localhost got classified as very prevalent resource.");
-            
-            setEnableFeature(false, finishJSTest);
-        });
-    }
-
-    if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, function () {
-            testRunner.setStatisticsPrevalentResource(statisticsUrl, false, function() {
-                if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                    testFailed("Host did not get set as non-prevalent resource.");
-                let iframeElement = document.createElement("iframe");
-                iframeElement.onload = runTest;
-                iframeElement.src = "http://localhost:8000/resourceLoadStatistics/resources/redirect.php?redirectTo=http://127.0.0.1:8000/resourceLoadStatistics/onclick.html";
-                document.body.appendChild(iframeElement);
-            });
-        });
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-redirect-to-prevalent-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-redirect-to-prevalent-database-expected.txt
deleted file mode 100644 (file)
index b8fcbd8..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Tests for classification based on subresource redirect to other prevalent.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Host classified as prevalent resource.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-redirect-to-prevalent-database.html b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-redirect-to-prevalent-database.html
deleted file mode 100644 (file)
index 5580a59..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    description("Tests for classification based on subresource redirect to other prevalent.");
-    jsTestIsAsync = true;
-
-    const hostUnderTest = "127.0.0.1:8000";
-    const statisticsUrl = "http://" + hostUnderTest + "/temp";
-    const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
-
-    function completeTest() {
-        if (!testRunner.isStatisticsPrevalentResource(statisticsUrl))
-            testFailed("Host did not get classified as prevalent resource.");
-        else if (testRunner.isStatisticsVeryPrevalentResource(statisticsUrl))
-            testFailed("Host got classified as very prevalent resource.");
-        else
-            testPassed("Host classified as prevalent resource.");
-            
-        setEnableFeature(false, finishJSTest);
-    }
-
-    function runTest() {
-        testRunner.setStatisticsPrevalentResource(topFrameOrigin1, true, function() {
-            testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin1);
-
-            testRunner.installStatisticsDidScanDataRecordsCallback(completeTest);
-            testRunner.statisticsProcessStatisticsAndDataRecords();
-        });
-    }
-
-    if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, function() {
-            testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-
-            testRunner.setStatisticsPrevalentResource(statisticsUrl, false, function() {
-                if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                    testFailed("Host did not get set as non-prevalent resource.");
-                runTest();
-            });
-        });
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-database-expected.txt
deleted file mode 100644 (file)
index 32dd69f..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS Host classified as prevalent resource.
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-database.html b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-database.html
deleted file mode 100644 (file)
index 2d01ea6..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Tests for Classification Based on Subresource Under Top Frame Origins</title>
-    <script src="/js-test-resources/js-test.js"></script>
-</head>
-<body>
-<script>
-    const hostUnderTest = "127.0.0.1:8000";
-    const statisticsUrl = "http://" + hostUnderTest + "/temp";
-    const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
-    const topFrameOrigin2 = "http://127.0.0.3:8000/temp";
-    const topFrameOrigin3 = "http://127.0.0.4:8000/temp";
-    const topFrameOrigin4 = "http://127.0.0.5:8000/temp";
-
-    function completeTest() {
-        if (!testRunner.isStatisticsPrevalentResource(statisticsUrl))
-            testFailed("Host did not get classified as prevalent resource.");
-        if (testRunner.isStatisticsVeryPrevalentResource(statisticsUrl))
-            testFailed("Host got classified as very prevalent resource.");
-        else
-            testPassed("Host classified as prevalent resource.");
-
-        internals.setResourceLoadStatisticsEnabled(false);
-        testRunner.statisticsResetToConsistentState(function() {
-            testRunner.notifyDone();
-        });
-    }
-
-    function runTestRunnerTest() {
-        testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-        testRunner.setStatisticsPrevalentResource(statisticsUrl, false, function() {
-            if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                testFailed("Host did not get set as non-prevalent resource.");
-
-            testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin1);
-            testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin2);
-            testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin3);
-            testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin4);
-
-            testRunner.installStatisticsDidScanDataRecordsCallback(completeTest);
-
-            testRunner.statisticsProcessStatisticsAndDataRecords();
-        });
-    }
-
-    if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        testRunner.waitUntilDone();
-        internals.setResourceLoadStatisticsEnabled(true);
-        runTestRunnerTest();
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-database-expected.txt
deleted file mode 100644 (file)
index 32dd69f..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS Host classified as prevalent resource.
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-database.html b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-database.html
deleted file mode 100644 (file)
index 78f7f13..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Tests for Classification Based on Subresource Unique Redirects To</title>
-    <script src="/js-test-resources/js-test.js"></script>
-</head>
-<body>
-<script>
-    const hostUnderTest = "127.0.0.1:8000";
-    const statisticsUrl = "http://" + hostUnderTest + "/temp";
-    const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
-    const topFrameOrigin2 = "http://127.0.0.3:8000/temp";
-    const topFrameOrigin3 = "http://127.0.0.4:8000/temp";
-    const topFrameOrigin4 = "http://127.0.0.5:8000/temp";
-
-    function completeTest() {
-        if (!testRunner.isStatisticsPrevalentResource(statisticsUrl))
-            testFailed("Host did not get classified as prevalent resource.");
-        if (testRunner.isStatisticsVeryPrevalentResource(statisticsUrl))
-            testFailed("Host got classified as very prevalent resource.");
-        else
-            testPassed("Host classified as prevalent resource.");
-
-        internals.setResourceLoadStatisticsEnabled(false);
-        testRunner.statisticsResetToConsistentState(function() {
-            testRunner.notifyDone();
-        });
-    }
-
-    function runTestRunnerTest() {
-        testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-        testRunner.setStatisticsPrevalentResource(statisticsUrl, false, function() {
-            if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                testFailed("Host did not get set as non-prevalent resource.");
-
-            testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin1);
-            testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin2);
-            testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin3);
-            testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin4);
-
-            testRunner.installStatisticsDidScanDataRecordsCallback(completeTest);
-
-            testRunner.statisticsProcessStatisticsAndDataRecords();
-        });
-    }
-
-    if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        testRunner.waitUntilDone();
-        internals.setResourceLoadStatisticsEnabled(true);
-        runTestRunnerTest();
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-collusion-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-collusion-database-expected.txt
deleted file mode 100644 (file)
index fd3938b..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-Tests for classification based on top frame redirect collusion.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Colluding host 1 got set as prevalent resource.
-PASS Colluding host 2 got set as prevalent resource.
-PASS Colluding host 3 got set as prevalent resource.
-PASS Colluding host 4 got set as prevalent resource.
-PASS Colluding localhost got set as prevalent resource after actual navigational redirect.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-collusion-database.html b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-collusion-database.html
deleted file mode 100644 (file)
index 4a983bc..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    description("Tests for classification based on top frame redirect collusion.");
-    jsTestIsAsync = true;
-
-    const hostUnderTest = "127.0.0.1:8000";
-    const statisticsUrl = "http://" + hostUnderTest + "/temp";
-    const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
-    const topFrameOrigin2 = "http://127.0.0.3:8000/temp";
-    const topFrameOrigin3 = "http://127.0.0.4:8000/temp";
-    const topFrameOrigin4 = "http://127.0.0.5:8000/temp";
-    const topFrameOrigin5 = "http://localhost:8000/";
-
-    function runTest() {
-        testRunner.setStatisticsTopFrameUniqueRedirectFrom(statisticsUrl, topFrameOrigin1);
-        testRunner.setStatisticsTopFrameUniqueRedirectFrom(topFrameOrigin1, topFrameOrigin2);
-        testRunner.setStatisticsTopFrameUniqueRedirectFrom(topFrameOrigin2, topFrameOrigin3);
-        testRunner.setStatisticsTopFrameUniqueRedirectFrom(topFrameOrigin3, topFrameOrigin4);
-
-        testRunner.setStatisticsPrevalentResource(statisticsUrl, true, function() {
-            if (!testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                testFailed("Host explicity set did not get set as prevalent resource.");
-            if (testRunner.isStatisticsPrevalentResource(topFrameOrigin1))
-                testPassed("Colluding host 1 got set as prevalent resource.");
-            if (testRunner.isStatisticsVeryPrevalentResource(topFrameOrigin1))
-                testFailed("Colluding host 1 got classified as very prevalent resource.");
-            if (testRunner.isStatisticsPrevalentResource(topFrameOrigin2))
-                testPassed("Colluding host 2 got set as prevalent resource.");
-            if (testRunner.isStatisticsVeryPrevalentResource(topFrameOrigin2))
-                testFailed("Colluding host 2 got classified as very prevalent resource.");
-            if (testRunner.isStatisticsPrevalentResource(topFrameOrigin3))
-                testPassed("Colluding host 3 got set as prevalent resource.");
-            if (testRunner.isStatisticsVeryPrevalentResource(topFrameOrigin3))
-                testFailed("Colluding host 3 got classified as very prevalent resource.");
-            if (testRunner.isStatisticsPrevalentResource(topFrameOrigin4))
-                testPassed("Colluding host 4 got set as prevalent resource.");
-            if (testRunner.isStatisticsVeryPrevalentResource(topFrameOrigin4))
-                testFailed("Colluding host 4 got classified as very prevalent resource.");
-            if (testRunner.isStatisticsPrevalentResource(topFrameOrigin5))
-                testPassed("Colluding localhost got set as prevalent resource after actual navigational redirect.");
-            if (testRunner.isStatisticsVeryPrevalentResource(topFrameOrigin5))
-                testFailed("Colluding localhost got classified as very prevalent resource.");
-            
-            setEnableFeature(false, finishJSTest);
-        });
-    }
-
-    if (document.location.hash === "" && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, function() {
-            testRunner.setStatisticsPrevalentResource(statisticsUrl, false, function() {
-                if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                    testFailed("Host did not get set as non-prevalent resource.");
-
-                document.location.href = topFrameOrigin5 + "resourceLoadStatistics/resources/redirect.php?redirectTo=http://127.0.0.1:8000/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-collusion.html#continue";
-            });
-        });
-    } else {
-        testRunner.statisticsNotifyObserver();
-        runTest();
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-to-prevalent-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-to-prevalent-database-expected.txt
deleted file mode 100644 (file)
index 59f9953..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Tests for classification based on top frame redirect to other prevalent.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Host classified as prevalent resource.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-to-prevalent-database.html b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-to-prevalent-database.html
deleted file mode 100644 (file)
index 292c751..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    description("Tests for classification based on top frame redirect to other prevalent.");
-    jsTestIsAsync = true;
-
-    const hostUnderTest = "127.0.0.1:8000";
-    const statisticsUrl = "http://" + hostUnderTest + "/temp";
-    const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
-
-    function completeTest() {
-        if (!testRunner.isStatisticsPrevalentResource(statisticsUrl))
-            testFailed("Host did not get classified as prevalent resource.");
-        else if (testRunner.isStatisticsVeryPrevalentResource(statisticsUrl))
-            testFailed("Host got classified as very prevalent resource.");
-        else
-            testPassed("Host classified as prevalent resource.");
-        
-        setEnableFeature(false, finishJSTest);
-    }
-
-    function runTest() {
-        testRunner.setStatisticsPrevalentResource(topFrameOrigin1, true, function() {
-            testRunner.setStatisticsTopFrameUniqueRedirectTo(statisticsUrl, topFrameOrigin1);
-
-            testRunner.installStatisticsDidScanDataRecordsCallback(completeTest);
-            testRunner.statisticsProcessStatisticsAndDataRecords();
-        });
-    }
-
-    if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, function() {
-            testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-
-            testRunner.setStatisticsPrevalentResource(statisticsUrl, false, function() {
-                if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                    testFailed("Host did not get set as non-prevalent resource.");
-                runTest();
-            });
-        });
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-unique-redirects-to-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-unique-redirects-to-database-expected.txt
deleted file mode 100644 (file)
index a491bf9..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Tests for classification based on top frame unique redirects to.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Host classified as prevalent resource.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-unique-redirects-to-database.html b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-unique-redirects-to-database.html
deleted file mode 100644 (file)
index 5c4c7ee..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    description("Tests for classification based on top frame unique redirects to.");
-    jsTestIsAsync = true;
-
-    const hostUnderTest = "127.0.0.1:8000";
-    const statisticsUrl = "http://" + hostUnderTest + "/temp";
-    const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
-    const topFrameOrigin2 = "http://127.0.0.3:8000/temp";
-    const topFrameOrigin3 = "http://127.0.0.4:8000/temp";
-    const topFrameOrigin4 = "http://127.0.0.5:8000/temp";
-
-    function completeTest() {
-        if (!testRunner.isStatisticsPrevalentResource(statisticsUrl))
-            testFailed("Host did not get classified as prevalent resource.");
-        if (testRunner.isStatisticsVeryPrevalentResource(statisticsUrl))
-            testFailed("Host got classified as very prevalent resource.");
-        else
-            testPassed("Host classified as prevalent resource.");
-
-        setEnableFeature(false, finishJSTest);
-    }
-
-    function runTest() {
-        testRunner.setStatisticsTopFrameUniqueRedirectTo(statisticsUrl, topFrameOrigin1);
-        testRunner.setStatisticsTopFrameUniqueRedirectTo(statisticsUrl, topFrameOrigin2);
-        testRunner.setStatisticsTopFrameUniqueRedirectTo(statisticsUrl, topFrameOrigin3);
-        testRunner.setStatisticsTopFrameUniqueRedirectTo(statisticsUrl, topFrameOrigin4);
-
-        testRunner.installStatisticsDidScanDataRecordsCallback(completeTest);
-
-        testRunner.statisticsProcessStatisticsAndDataRecords();
-    }
-
-    if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, function() {
-            testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-
-            testRunner.setStatisticsPrevalentResource(statisticsUrl, false, function() {
-                if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                    testFailed("Host did not get set as non-prevalent resource.");
-                runTest();
-            });
-        });
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-very-prevalent-based-on-mixed-statistics-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-very-prevalent-based-on-mixed-statistics-database-expected.txt
deleted file mode 100644 (file)
index b0f031d..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Test for classification as very prevalent based on mixed statistics.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Host classified as very prevalent resource.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/classify-as-very-prevalent-based-on-mixed-statistics-database.html b/LayoutTests/http/tests/resourceLoadStatistics/classify-as-very-prevalent-based-on-mixed-statistics-database.html
deleted file mode 100644 (file)
index ab06fa2..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    description("Test for classification as very prevalent based on mixed statistics.");
-    jsTestIsAsync = true;
-
-    const hostUnderTest = "127.0.0.1:8000";
-    const statisticsUrl = "http://" + hostUnderTest + "/temp";
-    var topFrameOrigins = [];
-    const startNum = 2;
-    const numberOfSubresourceDomains = 30;
-    for (var i = startNum; i < numberOfSubresourceDomains + startNum; ++i)
-        topFrameOrigins.push("http://127.0.0." + i + ":8000/temp")
-
-    function completeTest() {
-        if (!testRunner.isStatisticsPrevalentResource(statisticsUrl))
-            testFailed("Host did not get classified as prevalent resource.");
-        if (!testRunner.isStatisticsVeryPrevalentResource(statisticsUrl))
-            testFailed("Host did not get classified as very prevalent resource.");
-        else
-            testPassed("Host classified as very prevalent resource.");
-
-        setEnableFeature(false, finishJSTest);
-    }
-
-    function runTestRunnerTest() {
-        testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-        testRunner.setStatisticsPrevalentResource(statisticsUrl, false, function() {
-            if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                testFailed("Host started out as prevalent resource.");
-
-            var i = 0;
-            while (i < numberOfSubresourceDomains) {
-                testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigins[i]);
-                testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigins[i]);
-                testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigins[i]);
-
-                testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigins[i+1]);
-                testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigins[i+1]);
-                testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigins[i+1]);
-
-                testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigins[i+2]);
-                testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigins[i+2]);
-                testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigins[i+2]);
-                i += 3;
-            }
-
-            testRunner.installStatisticsDidScanDataRecordsCallback(completeTest);
-            testRunner.statisticsProcessStatisticsAndDataRecords();
-        });
-    }
-
-    if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, runTestRunnerTest);
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-database-expected.txt
deleted file mode 100644 (file)
index bae0033..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-Tests clearing of website data store.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Host classified as prevalent resource.
-PASS Host is no longer a prevalent resource after the store was cleared.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-database.html b/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-database.html
deleted file mode 100644 (file)
index 217ebab..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Test Cleared Store</title>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    description("Tests clearing of website data store.");
-    jsTestIsAsync = true;
-
-    const hostUnderTest = "127.0.0.1:8000";
-    const statisticsUrl = "http://" + hostUnderTest + "/temp";
-    const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
-    const topFrameOrigin2 = "http://127.0.0.3:8000/temp";
-    const topFrameOrigin3 = "http://127.0.0.4:8000/temp";
-
-    function testStep2() {
-        if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-            testPassed("Host classified as prevalent resource.");
-        else
-            testFailed("Host did not get classified as prevalent resource.");
-
-        testRunner.statisticsClearInMemoryAndPersistentStore(completeTest);
-    }
-
-    function completeTest() {
-        if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-            testFailed("Host is still a prevalent resource after the store was cleared.");
-        else
-            testPassed("Host is no longer a prevalent resource after the store was cleared.");
-
-        setEnableFeature(false, finishJSTest);
-    }
-
-    function runTestRunnerTest() {
-        testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-
-        testRunner.setStatisticsPrevalentResource(statisticsUrl, false, function() {
-            if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                testFailed("Host did not get set as non-prevalent resource.");
-
-            testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin1);
-            testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin1);
-            testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin1);
-            testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin2);
-            testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin2);
-            testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin3);
-            testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin3);
-
-            testRunner.installStatisticsDidScanDataRecordsCallback(testStep2);
-
-            testRunner.statisticsProcessStatisticsAndDataRecords();
-        });
-    }
-
-    if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, function () {
-            runTestRunnerTest();
-        });
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-database-expected.txt
deleted file mode 100644 (file)
index 07f999c..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-Tests clearing of website data store (one hour).
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Host classified as prevalent resource.
-PASS Host is no longer a prevalent resource after the store was cleared.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-database.html b/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-database.html
deleted file mode 100644 (file)
index a6bb065..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title></title>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    description("Tests clearing of website data store (one hour).");
-    jsTestIsAsync = true;
-
-    const hostUnderTest = "127.0.0.1:8000";
-    const statisticsUrl = "http://" + hostUnderTest + "/temp";
-    const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
-    const topFrameOrigin2 = "http://127.0.0.3:8000/temp";
-    const topFrameOrigin3 = "http://127.0.0.4:8000/temp";
-
-    function completeTest() {
-        if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-            testFailed("Host is still a prevalent resource after the store was cleared.");
-        else
-            testPassed("Host is no longer a prevalent resource after the store was cleared.");
-        setEnableFeature(false, finishJSTest);
-    }
-
-    function testStep2() {
-        if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-            testPassed("Host classified as prevalent resource.");
-        else
-            testFailed("Host did not get classified as prevalent resource.");
-
-        testRunner.statisticsClearInMemoryAndPersistentStoreModifiedSinceHours(1, completeTest);
-    }
-
-    function runTestRunnerTest() {
-        testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-
-        testRunner.setStatisticsPrevalentResource(statisticsUrl, false, function() {});
-        if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-            testFailed("Host did not get set as non-prevalent resource.");
-
-        testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin1);
-        testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin1);
-        testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin1);
-        testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin2);
-        testRunner.setStatisticsSubframeUnderTopFrameOrigin(statisticsUrl, topFrameOrigin2);
-        testRunner.setStatisticsSubresourceUniqueRedirectTo(statisticsUrl, topFrameOrigin3);
-        testRunner.setStatisticsSubresourceUnderTopFrameOrigin(statisticsUrl, topFrameOrigin3);
-
-        testRunner.installStatisticsDidScanDataRecordsCallback(testStep2);
-
-        testRunner.statisticsProcessStatisticsAndDataRecords();
-    }
-
-    if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, function () {
-            runTestRunnerTest();
-        });
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/cookie-deletion-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/cookie-deletion-database-expected.txt
deleted file mode 100644 (file)
index 8b3fcfa..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-Test for partitioned and unpartitioned cookie deletion.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-  
-
---------
-Frame: '<!--frame1-->'
---------
-Should receive first-party cookie.
-Received cookie named 'firstPartyCookie'.
-Did not receive cookie named 'thirdPartyCookie'.
-Client-side document.cookie: firstPartyCookie=value
-
---------
-Frame: '<!--frame2-->'
---------
-Should receive no cookies.
-Did not receive cookie named 'firstPartyCookie'.
-Did not receive cookie named 'thirdPartyCookie'.
-Client-side document.cookie:
-
---------
-Frame: '<!--frame3-->'
---------
-Try to set third party cookie.
-
-
---------
-Frame: '<!--frame4-->'
---------
-Should receive no cookies.
-Did not receive cookie named 'firstPartyCookie'.
-Did not receive cookie named 'thirdPartyCookie'.
-Client-side document.cookie:
-
---------
-Frame: '<!--frame5-->'
---------
-After removal, should receive no cookies.
-Did not receive cookie named 'firstPartyCookie'.
-Did not receive cookie named 'thirdPartyCookie'.
-Client-side document.cookie:
-
---------
-Frame: '<!--frame6-->'
---------
-After declassified, 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/resourceLoadStatistics/cookie-deletion-database.html b/LayoutTests/http/tests/resourceLoadStatistics/cookie-deletion-database.html
deleted file mode 100644 (file)
index e834e87..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    description("Test for partitioned and unpartitioned cookie deletion.");
-    jsTestIsAsync = true;
-
-    const partitionHost = "127.0.0.1:8000";
-    const thirdPartyOrigin = "http://localhost:8000";
-    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 + "/resourceLoadStatistics/cookie-deletion.html";
-    const subPathToGetCookies = "/get-cookies.php?name1=" + firstPartyCookieName + "&name2=" + thirdPartyCookieName;
-
-    function finishTest() {
-        setEnableFeature(false, finishJSTest);
-    }
-
-    function openIframe(url, onLoadHandler) {
-        const element = document.createElement("iframe");
-        element.src = url;
-        if (onLoadHandler) {
-            element.onload = onLoadHandler;
-        }
-        document.body.appendChild(element);
-    }
-
-
-    function fireDataModificationHandlerAndContinue() {
-        testRunner.installStatisticsDidScanDataRecordsCallback(function() {
-            setTimeout(runTest, 500);
-        });
-        testRunner.statisticsProcessStatisticsAndDataRecords();
-    }
-
-    function setAsNonPrevalentAndContinue() {
-        testRunner.setStatisticsPrevalentResource(thirdPartyOrigin, false, function() {
-            if (testRunner.isStatisticsPrevalentResource(thirdPartyOrigin))
-                testFailed("Host still set as prevalent resource.");
-            testRunner.statisticsUpdateCookieBlocking(runTest);
-        });
-    }
-
-    function runTest() {
-        switch (document.location.hash) {
-            case "#step1":
-                // Set first-party cookie for localhost.
-                document.location.href = thirdPartyBaseUrl + subPathToSetFirstPartyCookie + "#" + fragmentWithReturnUrl + "#step2";
-                break;
-            case "#step2":
-                // Check that the third-party has access to its first-party cookies.
-                document.location.hash = "step3";
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should receive first-party cookie.", runTest);
-                break;
-            case "#step3":
-                // Classify localhost as prevalent.
-                document.location.hash = "step4";
-                testRunner.setStatisticsPrevalentResource(thirdPartyOrigin, true, function() {
-                    if (!testRunner.isStatisticsPrevalentResource(thirdPartyOrigin))
-                        testFailed("Host did not get set as prevalent resource.");
-                    testRunner.statisticsUpdateCookieBlocking(runTest);
-                });
-                break;
-            case "#step4":
-                // Check that the third-party no longer has access to its first-party cookies.
-                document.location.hash = "step5";
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should receive no cookies.", runTest);
-                break;
-            case "#step5":
-                // Try setting a cookie as third-party.
-                document.location.hash = "step6";
-                openIframe(thirdPartyBaseUrl + subPathToSetThirdPartyCookie + "&message=Try to set third party cookie.", runTest);
-                break;
-            case "#step6":
-                // Check that the third-party still has no access to cookies and then fire data record removal.
-                document.location.hash = "step7";
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should receive no cookies.", fireDataModificationHandlerAndContinue);
-                break;
-            case "#step7":
-                // Check that the third-party still has no access to cookies and then declassify localhost.
-                document.location.hash = "step8";
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=After removal, should receive no cookies.", setAsNonPrevalentAndContinue);
-                break;
-            case "#step8":
-                // Check that the third-party still has no access to cookies.
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=After declassified, should receive no cookies.", finishTest);
-                break;
-        }
-    }
-
-    if (document.location.host === partitionHost && document.location.hash === "" && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, function() {
-            testRunner.setStatisticsShouldClassifyResourcesBeforeDataRecordsRemoval(false);
-            testRunner.setStatisticsMinimumTimeBetweenDataRecordsRemoval(0);
-
-            testRunner.dumpChildFramesAsText();
-            document.location.hash = "step1";
-
-            runTest();
-        });
-    } else {
-        runTest();
-    }
-
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/cookies-with-and-without-user-interaction-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/cookies-with-and-without-user-interaction-database-expected.txt
deleted file mode 100644 (file)
index 5d1092e..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-PASS successfullyParsed is true
-
-TEST COMPLETE
-  
-
---------
-Frame: '<!--frame1-->'
---------
-Should receive first-party cookie.
-Received cookie named 'firstPartyCookie'.
-Client-side document.cookie: firstPartyCookie=value
-
---------
-Frame: '<!--frame2-->'
---------
-Should receive no cookies.
-Did not receive cookie named 'firstPartyCookie'.
-Client-side document.cookie:
-
---------
-Frame: '<!--frame3-->'
---------
-After user interaction, should still receive no cookies.
-Did not receive cookie named 'firstPartyCookie'.
-Client-side document.cookie:
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/cookies-with-and-without-user-interaction-database.html b/LayoutTests/http/tests/resourceLoadStatistics/cookies-with-and-without-user-interaction-database.html
deleted file mode 100644 (file)
index 9c7a39c..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Test for Partitioned Cookies With and Without User Interaction</title>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    const partitionHost = "127.0.0.1:8000";
-    const thirdPartyOrigin = "http://localhost:8000";
-    const thirdPartyBaseUrl = thirdPartyOrigin + "/resourceLoadStatistics/resources";
-    const firstPartyCookieName = "firstPartyCookie";
-    const subPathToSetFirstPartyCookie = "/set-cookie.php?name=" + firstPartyCookieName + "&value=value";
-    const fragmentWithReturnUrl = "http://127.0.0.1:8000/resourceLoadStatistics/cookies-with-and-without-user-interaction.html";
-    const subPathToGetCookies = "/get-cookies.php?name1=" + firstPartyCookieName;
-
-    function finishTest() {
-        setEnableFeature(false, function() {
-            testRunner.notifyDone();
-        });
-    }
-
-    function openIframe(url, onLoadHandler) {
-        const element = document.createElement("iframe");
-        element.src = url;
-        if (onLoadHandler) {
-            element.onload = onLoadHandler;
-        }
-        document.body.appendChild(element);
-    }
-
-    function setUserInteractionAndContinue() {
-        testRunner.setStatisticsHasHadUserInteraction(thirdPartyOrigin, true, function() {
-            if (!testRunner.isStatisticsHasHadUserInteraction(thirdPartyOrigin))
-                testFailed("Third party did not get logged for user interaction.");
-            runTest();
-        });
-    }
-
-    function runTest() {
-        switch (document.location.hash) {
-            case "#step1":
-                document.location.href = thirdPartyBaseUrl + subPathToSetFirstPartyCookie + "#" + fragmentWithReturnUrl + "#step2";
-                break;
-            case "#step2":
-                document.location.hash = "step3";
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should receive first-party cookie.", runTest);
-                break;
-            case "#step3":
-                document.location.hash = "step4";
-                testRunner.setStatisticsPrevalentResource(thirdPartyOrigin, true, function() {
-                    if (!testRunner.isStatisticsPrevalentResource(thirdPartyOrigin))
-                        testFailed("Host did not get set as prevalent resource.");
-                    testRunner.statisticsUpdateCookieBlocking(runTest);
-                });
-                break;
-            case "#step4":
-                document.location.hash = "step5";
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should receive no cookies.", setUserInteractionAndContinue);
-                break;
-            case "#step5":
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=After user interaction, should still receive no cookies.", finishTest);
-                break;
-        }
-    }
-
-    if (document.location.host === partitionHost && document.location.hash == "" && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, function() {
-            testRunner.waitUntilDone();
-            testRunner.dumpChildFramesAsText();
-            document.location.hash = "step1";
-            if (testRunner.isStatisticsPrevalentResource(thirdPartyOrigin))
-                testFailed("Localhost was classified as prevalent resource before the test starts.");
-            runTest();
-        });
-    } else {
-        runTest();
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/delete-script-accessible-cookies-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/delete-script-accessible-cookies-database-expected.txt
deleted file mode 100644 (file)
index 63407dc..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-Check that only HttpOnly cookies remain if all script-accessible cookies are deleted.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Before script-accessible deletion: Client-side cookie exists.
-PASS Before script-accessible deletion: HttpOnly cookie exists.
-PASS Before script-accessible deletion: Regular server-side cookie exists.
-PASS After script-accessible deletion:  HttpOnly cookie exists.
-PASS After full deletion:               All cookies are gone.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/delete-script-accessible-cookies-database.html b/LayoutTests/http/tests/resourceLoadStatistics/delete-script-accessible-cookies-database.html
deleted file mode 100644 (file)
index 60fc537..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-</head>
-<body onload="runTest()">
-<script>
-    description("Check that only HttpOnly cookies remain if all script-accessible cookies are deleted.");
-    jsTestIsAsync = true;
-
-    const httpOnlyCookieName = "http-only-cookie";
-    const serverSideCookieName = "server-side-cookie";
-    const clientSideCookieName = "client-side-cookie";
-
-    function sortStringArray(a, b) {
-        a = a.toLowerCase();
-        b = b.toLowerCase();
-
-        return a > b ? 1 : b > a ? -1 : 0;
-    }
-
-    function checkCookies(isAfterScriptAccessibleDeletion) {
-        let unsortedTestPassedMessages = [];
-        let cookies = internals.getCookies();
-        if (!cookies.length)
-            testFailed((isAfterScriptAccessibleDeletion ? "After" : "Before") + " script-accessible deletion: No cookies found.");
-        for (let cookie of cookies) {
-            switch (cookie.name) {
-                case httpOnlyCookieName:
-                    unsortedTestPassedMessages.push((isAfterScriptAccessibleDeletion ? "After" : "Before") + " script-accessible deletion: " + (isAfterScriptAccessibleDeletion ? " " : "") + "HttpOnly cookie exists.");
-                    break;
-                case serverSideCookieName:
-                    if (isAfterScriptAccessibleDeletion)
-                        testFailed("After script-accessible deletion:  Regular server-side cookie exists.");
-                    else
-                        unsortedTestPassedMessages.push("Before script-accessible deletion: Regular server-side cookie exists.");
-                    break;
-                case clientSideCookieName:
-                    if (isAfterScriptAccessibleDeletion)
-                        testFailed("After script-accessible deletion:  Client-side cookie exists.");
-                    else
-                        unsortedTestPassedMessages.push("Before script-accessible deletion: Client-side cookie exists.");
-                    break;
-            }
-        }
-        let sortedTestPassedMessages = unsortedTestPassedMessages.sort(sortStringArray);
-        for (let testPassedMessage of sortedTestPassedMessages)
-            testPassed(testPassedMessage);
-    }
-
-    async function runTest() {
-        if (!testRunner || !internals) {
-            testFailed("No testRunner or no internals.");
-            return;
-        }
-        testRunner.setUseITPDatabase(true);
-        await fetch("/cookies/resources/set-http-only-cookie.php?cookieName=" + httpOnlyCookieName, { credentials: "same-origin" });
-        await fetch("/cookies/resources/setCookies.cgi", { headers: { "Set-Cookie": serverSideCookieName + "=1; path=/;" }, credentials: "same-origin" });
-        document.cookie = clientSideCookieName + "=1";
-        checkCookies(false);
-        testRunner.statisticsDeleteCookiesForHost("http://127.0.0.1", false);
-        checkCookies(true);
-        testRunner.statisticsDeleteCookiesForHost("http://127.0.0.1", true);
-        let cookiesLeft = internals.getCookies().length;
-        if (cookiesLeft === 0)
-            testPassed("After full deletion:               All cookies are gone.");
-        else
-            testFailed("After full deletion:              " + cookiesLeft + " cookie(s) left.");
-        finishJSTest();
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/do-not-block-top-level-navigation-redirect-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/do-not-block-top-level-navigation-redirect-database-expected.txt
deleted file mode 100644 (file)
index 3743061..0000000
+++ /dev/null
@@ -1 +0,0 @@
-PASSED: Cookie successfully set
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/do-not-block-top-level-navigation-redirect-database.html b/LayoutTests/http/tests/resourceLoadStatistics/do-not-block-top-level-navigation-redirect-database.html
deleted file mode 100644 (file)
index d219e3d..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-<script>
-    description("Tests that blocking is not applied to top-level navigation redirects.");
-    jsTestIsAsync = true;
-
-    internals.setResourceLoadStatisticsEnabled(true);
-
-    function doRedirect()
-    {
-        testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, function () {
-            testRunner.setStatisticsPrevalentResource("http://localhost", true, function () {
-                if (!testRunner.isStatisticsPrevalentResource("http://localhost")) {
-                    testFailed("Host did not get set as prevalent resource.");
-                    setEnableFeature(false, finishJSTest);
-                } else
-                    document.location.href = "http://localhost:8000/resourceLoadStatistics/resources/set-cookie-on-redirect.php?step=1";
-            });
-        });
-    }
-</script>
-</head>
-<body onload="setTimeout('doRedirect()', 0)">
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/do-not-capture-statistics-for-simple-top-navigations-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/do-not-capture-statistics-for-simple-top-navigations-database-expected.txt
deleted file mode 100644 (file)
index 069c91c..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-Test that a non-redirected top frame navigation doesn't get captured in statistics.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1") is false
-PASS testRunner.isStatisticsRegisteredAsSubFrameUnder("http://127.0.0.1", "http://localhost") is false
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/do-not-capture-statistics-for-simple-top-navigations-database.html b/LayoutTests/http/tests/resourceLoadStatistics/do-not-capture-statistics-for-simple-top-navigations-database.html
deleted file mode 100644 (file)
index b80935a..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    description("Test that a non-redirected top frame navigation doesn't get captured in statistics.");
-    jsTestIsAsync = true;
-    testRunner.setUseITPDatabase(true);
-    let timerHandle = 0;
-
-    function finishTest() {
-        if (timerHandle)
-          clearTimeout(timerHandle);
-
-        shouldBeFalse('testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1")');
-        shouldBeFalse('testRunner.isStatisticsRegisteredAsSubFrameUnder("http://127.0.0.1", "http://localhost")');
-        setEnableFeature(false, finishJSTest);
-    }
-
-    function runTest() {
-        switch (document.location.host) {
-            case "127.0.0.1:8000":
-                setEnableFeature(true, function() {
-                    if (testRunner.isStatisticsPrevalentResource("http://localhost:8000"))
-                        testFailed("Localhost was classified as prevalent resource before the test starts.");
-                    document.location.href = "http://localhost:8000/resourceLoadStatistics/do-not-capture-statistics-for-simple-top-navigations.html";
-                });
-                break;
-            case "localhost:8000":
-                testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-                testRunner.installStatisticsDidScanDataRecordsCallback(finishTest);
-                if (!testRunner.statisticsNotifyObserver())
-                    timerHandle = setTimeout(finishTest, 100);
-                break;
-            default:
-                testFailed("Unknown host: " + document.location.host);
-                finishTest();
-        }
-    }
-
-    if (window.testRunner && window.internals)
-        runTest();
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/do-not-remove-blocking-in-redirect-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/do-not-remove-blocking-in-redirect-database-expected.txt
deleted file mode 100644 (file)
index 1ad7d9e..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-Tests that blocking is not removed mid-flight in redirects.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-  
-
---------
-Frame: '<!--frame1-->'
---------
-Should receive first-party cookie for localhost.
-Did not receive cookie named 'firstPartyCookieIP'.
-Received cookie named 'firstPartyCookieLocalhost'.
-Did not receive cookie named 'thirdPartyCookie'.
-Client-side document.cookie: firstPartyCookieLocalhost=localhost
-
---------
-Frame: '<!--frame2-->'
---------
-Redirect case 1, should receive first-party cookie for 127.0.0.1.
-Received cookie named 'firstPartyCookieIP'.
-Did not receive cookie named 'firstPartyCookieLocalhost'.
-Did not receive cookie named 'thirdPartyCookie'.
-Client-side document.cookie: firstPartyCookieIP=127.0.0.1
-
---------
-Frame: '<!--frame3-->'
---------
-Try to set third-party cookie for localhost in blocked mode.
-
-
---------
-Frame: '<!--frame4-->'
---------
-Should receive no cookie.
-Did not receive cookie named 'firstPartyCookieIP'.
-Did not receive cookie named 'firstPartyCookieLocalhost'.
-Did not receive cookie named 'thirdPartyCookie'.
-Client-side document.cookie:
-
---------
-Frame: '<!--frame5-->'
---------
-Redirect case 2, should not receive first-party cookie for 127.0.0.1.
-Did not receive cookie named 'firstPartyCookieIP'.
-Did not receive cookie named 'firstPartyCookieLocalhost'.
-Did not receive cookie named 'thirdPartyCookie'.
-Client-side document.cookie: firstPartyCookieIP=127.0.0.1
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/do-not-remove-blocking-in-redirect-database.html b/LayoutTests/http/tests/resourceLoadStatistics/do-not-remove-blocking-in-redirect-database.html
deleted file mode 100644 (file)
index 36d30aa..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    description("Tests that blocking is not removed mid-flight in redirects.");
-    jsTestIsAsync = true;
-
-    const partitionHost = "127.0.0.1:8000";
-    const thirdPartyOrigin = "http://localhost:8000";
-    const resourcePath = "/resourceLoadStatistics/resources";
-    const thirdPartyBaseUrl = thirdPartyOrigin + resourcePath;
-    const firstPartyCookieNamePrefix = "firstPartyCookie";
-    const firstPartyCookieNameIP = firstPartyCookieNamePrefix + "IP";
-    const firstPartyCookieNameLocalhost = firstPartyCookieNamePrefix + "Localhost";
-    const thirdPartyCookieName = "thirdPartyCookie";
-    const subPathToSetThirdPartyCookie = "/set-cookie.php?name=" + thirdPartyCookieName + "&value=value";
-    const subPathToGetCookies = "/get-cookies.php?name1=" + firstPartyCookieNameIP + "&name2=" + firstPartyCookieNameLocalhost + "&name3=" + thirdPartyCookieName;
-    const redirectChainUrl = thirdPartyOrigin + resourcePath + "/redirect.php?redirectTo=http://" + partitionHost + resourcePath + subPathToGetCookies;
-
-    function openIframe(url, onLoadHandler) {
-        const element = document.createElement("iframe");
-        element.src = url;
-        if (onLoadHandler) {
-            element.onload = onLoadHandler;
-        }
-        document.body.appendChild(element);
-    }
-
-    function runTest() {
-        switch (document.location.hash) {
-            case "#step1":
-                // Set first-party cookies for 127.0.0.1 and localhost.
-                if (document.location.origin === thirdPartyOrigin) {
-                    document.cookie = firstPartyCookieNameLocalhost + "=localhost;path='/'";
-                    document.location.href = "http://127.0.0.1:8000/resourceLoadStatistics/do-not-remove-blocking-in-redirect-database.html#step2";
-                } else {
-                    document.cookie = firstPartyCookieNameIP + "=127.0.0.1;path='/'";
-                    document.location.href = "http://localhost:8000/resourceLoadStatistics/do-not-remove-blocking-in-redirect-database.html#step1";
-                }
-                break;
-            case "#step2":
-                // Check that the cookie gets sent for localhost under 127.0.0.1 since localhost is not prevalent.
-                document.location.hash = "step3";
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should receive first-party cookie for localhost.", runTest);
-                break;
-            case "#step3":
-                document.location.hash = "step4";
-                // Load an iframe in a redirect chain that starts with localhost and ends with 127.0.0.1. Expect a cookie for 127.0.0.1.
-                openIframe(redirectChainUrl + "&message=Redirect case 1, should receive first-party cookie for 127.0.0.1.", runTest);
-                break;
-            case "#step4":
-                // Set localhost as prevalent to put it in the blocking category.
-                document.location.hash = "step5";
-                testRunner.setStatisticsPrevalentResource(thirdPartyOrigin, true, function() {
-                    if (!testRunner.isStatisticsPrevalentResource(thirdPartyOrigin))
-                        testFailed("Host did not get set as prevalent resource.");
-                    testRunner.statisticsUpdateCookieBlocking(runTest);
-                });
-                break;
-            case "#step5":
-                // Try to set partitioned cookie for localhost under 127.0.0.1.
-                document.location.hash = "step6";
-                openIframe(thirdPartyBaseUrl + subPathToSetThirdPartyCookie + "&message=Try to set third-party cookie for localhost in blocked mode.", runTest);
-                break;
-            case "#step6":
-                // Check that no cookie gets sent for localhost under 127.0.0.1 since localhost's cookies are blocked.
-                document.location.hash = "step7";
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies +  "&message=Should receive no cookie.", runTest);
-                break;
-            case "#step7":
-                // Load an iframe in a redirect chain that starts with localhost and ends with 127.0.0.1. Expect a cookie for 127.0.0.1.
-                document.location.hash = "step8";
-                openIframe(redirectChainUrl + "&message=Redirect case 2, should not receive first-party cookie for 127.0.0.1.", runTest);
-                break;
-            case "#step8":
-                setEnableFeature(false, finishJSTest);
-                break;
-        }
-    }
-
-    if (document.location.hash === "") {
-        testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, function() {
-            if (testRunner.isStatisticsPrevalentResource(thirdPartyOrigin))
-                testFailed("Localhost was classified as prevalent resource before the test starts.");
-            testRunner.dumpChildFramesAsText();
-            document.location.hash = "step1";
-            runTest();
-        });
-    } else {
-        runTest();
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/do-not-switch-session-on-navigation-to-prevalent-without-interaction-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/do-not-switch-session-on-navigation-to-prevalent-without-interaction-database-expected.txt
deleted file mode 100644 (file)
index d05dc09..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests that the session is not switched upon top frame navigation to a prevalent resource without user interaction.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Should have and has the session cookie.
-PASS Should have and has the persistent cookie.
-PASS Origin has no isolated session.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/do-not-switch-session-on-navigation-to-prevalent-without-interaction-database.html b/LayoutTests/http/tests/resourceLoadStatistics/do-not-switch-session-on-navigation-to-prevalent-without-interaction-database.html
deleted file mode 100644 (file)
index 6abfdb9..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body onload="runTest()">
-<script>
-    description("Tests that the session is not switched upon top frame navigation to a prevalent resource without user interaction.");
-    jsTestIsAsync = true;
-
-    const prevalentOrigin = "http://127.0.0.1:8000";
-    const nonPrevalentOrigin = "http://localhost:8000";
-    const sessionCookieName = "sessionCookie";
-    const persistentCookieName = "persistentCookie";
-    const twoMinutesInSeconds = 120;
-
-    function setSessionCookie() {
-        document.cookie = sessionCookieName + "=1; path=/";
-    }
-
-    function setPersistentCookie() {
-        document.cookie = persistentCookieName + "=1; path=/; Max-Age=" + twoMinutesInSeconds + ";";
-    }
-
-    function checkCookies(shouldHaveSessionCookie, shouldHavePersistentCookie) {
-        let hasSessionCookie = (document.cookie + "").includes(sessionCookieName),
-            hasPersistentCookie = (document.cookie + "").includes(persistentCookieName);
-
-        if (shouldHaveSessionCookie && hasSessionCookie)
-            testPassed("Should have and has the session cookie.");
-        else if (shouldHaveSessionCookie && !hasSessionCookie) {
-            testFailed("Should have but doesn't have the session cookie.");
-            setEnableFeature(false, finishJSTest);
-        } else if (!shouldHaveSessionCookie && hasSessionCookie) {
-            testFailed("Shouldn't have but has the session cookie.");
-            setEnableFeature(false, finishJSTest);
-        } else
-            testPassed("Shouldn't have and doesn't have the session cookie.");
-
-
-        if (shouldHavePersistentCookie && hasPersistentCookie)
-            testPassed("Should have and has the persistent cookie.");
-        else if (shouldHavePersistentCookie && !hasPersistentCookie) {
-            testFailed("Should have but doesn't have the persistent cookie.");
-            setEnableFeature(false, finishJSTest);
-        } else if (!shouldHavePersistentCookie && hasPersistentCookie) {
-            testFailed("Shouldn't have but has the persistent cookie.");
-            setEnableFeature(false, finishJSTest);
-        } else
-            testPassed("Shouldn't have and doesn't have the persistent cookie.");
-    }
-
-    function runTest() {
-        switch (document.location.hash) {
-            case "#step1":
-                setSessionCookie();
-                setPersistentCookie();
-                checkCookies(true, true);
-                if (testRunner.hasStatisticsIsolatedSession(prevalentOrigin)) {
-                    testFailed("Origin has isolated session.");
-                    setEnableFeature(false, finishJSTest);
-                } else
-                    testPassed("Origin has no isolated session.");
-                document.location.href = nonPrevalentOrigin + "/resourceLoadStatistics/do-not-switch-session-on-navigation-to-prevalent-without-interaction.html#step2";
-                break;
-            case "#step2":
-                document.location.hash = "step3";
-                if (document.location.origin !== nonPrevalentOrigin)
-                    testFailed("Step 2 is not on " + nonPrevalentOrigin + ".");
-                testRunner.setStatisticsPrevalentResource(prevalentOrigin, true, function() {
-                    if (!testRunner.isStatisticsPrevalentResource(prevalentOrigin)) {
-                        testFailed(prevalentOrigin + " did not get set as prevalent resource.");
-                        setEnableFeature(false, finishJSTest);
-                    }
-                    testRunner.statisticsUpdateCookieBlocking(runTest);
-                });
-                break;
-            case "#step3":
-                document.location.href = prevalentOrigin + "/resourceLoadStatistics/do-not-switch-session-on-navigation-to-prevalent-without-interaction.html#step4";
-                break;
-            case "#step4":
-                checkCookies(true, true);
-                if (testRunner.hasStatisticsIsolatedSession(prevalentOrigin))
-                    testFailed("Origin has isolated session.");
-                else
-                    testPassed("Origin has no isolated session.");
-                setEnableFeature(false, finishJSTest);
-                break;
-            default:
-                testFailed("Unknown hash.");
-                setEnableFeature(false, finishJSTest);
-        }
-    }
-
-    if (document.location.hash === "") {
-        if (document.location.origin !== prevalentOrigin)
-            testFailed("Test is not starting out on " + prevalentOrigin + ".");
-            
-            testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, function () {
-            if (testRunner.isStatisticsPrevalentResource(prevalentOrigin))
-                testFailed(prevalentOrigin + " was classified as prevalent resource before the test starts.");
-            document.location.hash = "step1";
-        });
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/downgraded-referrer-for-navigation-with-link-query-from-prevalent-resource-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/downgraded-referrer-for-navigation-with-link-query-from-prevalent-resource-database-expected.txt
deleted file mode 100644 (file)
index 0fba810..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Check that document.referrer is downgraded to the eTLD+1 after a cross-site navigation with link query.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS The referrer is downgraded.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/downgraded-referrer-for-navigation-with-link-query-from-prevalent-resource-database.html b/LayoutTests/http/tests/resourceLoadStatistics/downgraded-referrer-for-navigation-with-link-query-from-prevalent-resource-database.html
deleted file mode 100644 (file)
index 9aebde9..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="/cookies/resources/cookie-utilities.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body onload="setTimeout('runTest()', 0)">
-<script>
-    description("Check that document.referrer is downgraded to the eTLD+1 after a cross-site navigation with link query.");
-    jsTestIsAsync = true;
-
-    let numberOfTries = 0;
-    function testReferrer() {
-        if (document.referrer === prevalentResourceOrigin + "/") {
-            testPassed("The referrer is downgraded.");
-            setEnableFeature(false, finishJSTest);
-        } else if (++numberOfTries <= 5)
-            setTimeout(testReferrer, 200);
-        else {
-            testFailed("The referrer is not downgraded: " + document.referrer);
-            setEnableFeature(false, finishJSTest);
-        }
-    }
-
-    function navigateSameOriginToAddQuery() {
-        document.location.href = prevalentResourceOrigin + "/resourceLoadStatistics/downgraded-referrer-for-navigation-with-link-query-from-prevalent-resource.html?link=query";
-    }
-
-    function navigateCrossOrigin() {
-        document.location.href = destinationOrigin + "/resourceLoadStatistics/downgraded-referrer-for-navigation-with-link-query-from-prevalent-resource.html";
-    }
-
-    const destinationOrigin = "http://localhost:8000";
-    const prevalentResourceOrigin = "http://127.0.0.1:8000";
-    function runTest() {
-        if (document.location.origin === prevalentResourceOrigin && document.location.search === "") {
-            navigateSameOriginToAddQuery();
-        } else if (document.location.origin === prevalentResourceOrigin) {
-            testRunner.setUseITPDatabase(true);
-            setEnableFeature(true, function () {
-                testRunner.setStatisticsPrevalentResource(prevalentResourceOrigin, true, function() {
-                    if (!testRunner.isStatisticsPrevalentResource(prevalentResourceOrigin))
-                        testFailed("Host did not get set as prevalent resource.");
-                    testRunner.statisticsUpdateCookieBlocking(navigateCrossOrigin);
-                });
-            });
-        } else {
-            testReferrer();
-        }
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/enable-debug-mode-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/enable-debug-mode-database-expected.txt
deleted file mode 100644 (file)
index 65219dd..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Test for enabling debug mode and that it permanently treats 3rdpartytestwebkit.org as a prevalent resource.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS http://3rdpartytestwebkit.org got set as prevalent resource in debug mode.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/enable-debug-mode-database.html b/LayoutTests/http/tests/resourceLoadStatistics/enable-debug-mode-database.html
deleted file mode 100644 (file)
index 637ff92..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    description("Test for enabling debug mode and that it permanently treats 3rdpartytestwebkit.org as a prevalent resource.");
-    jsTestIsAsync = true;
-
-    const thirdPartyOrigin = "http://3rdpartytestwebkit.org";
-
-    if (window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, function() {
-            if (testRunner.isStatisticsPrevalentResource(thirdPartyOrigin))
-                testFailed(thirdPartyOrigin + " already set as prevalent resource.");
-
-            testRunner.setStatisticsDebugMode(true, function() {
-                if (!testRunner.isStatisticsPrevalentResource(thirdPartyOrigin))
-                    testFailed(thirdPartyOrigin + " didn't get set as prevalent resource.");
-                else
-                    testPassed(thirdPartyOrigin + " got set as prevalent resource in debug mode.");
-                testRunner.setStatisticsDebugMode(false, function() {
-                    setEnableFeature(false, finishJSTest);
-                });
-            });
-        });
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/grandfathering-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/grandfathering-database-expected.txt
deleted file mode 100644 (file)
index 01803bf..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS Grandfathered cookie was not purged.
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/grandfathering-database.html b/LayoutTests/http/tests/resourceLoadStatistics/grandfathering-database.html
deleted file mode 100644 (file)
index aaf0b85..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Test for Grandfathering</title>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    const firstPartyOrigin = "http://localhost:8000";
-    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 + "/resourceLoadStatistics/grandfathering.html";
-    const thirdPartyOrigin = "http://127.0.0.1:8000";
-    const thirdPartyBaseUrl = thirdPartyOrigin + "/resourceLoadStatistics/resources";
-    const subPathToSetThirdPartyCookie = "/set-cookie.php?name=" + thirdPartyCookieName + "&value=" + cookieValue;
-
-    function finishTest() {
-        testRunner.setUseITPDatabase(false);
-        setEnableFeature(false, function() {
-            testRunner.notifyDone();
-        });
-    }
-
-    function fireDataModificationHandlerAndContinue() {
-        testRunner.installStatisticsDidScanDataRecordsCallback(function() {
-            runTest();
-        });
-        testRunner.statisticsProcessStatisticsAndDataRecords();
-    }
-
-    function clearInMemoryAndPersistentStoreAndContinue() {
-        testRunner.statisticsClearInMemoryAndPersistentStore(function() {
-            runTest();
-        });
-    }
-
-    function runTest() {
-        switch (document.location.hash) {
-            case "#step1":
-                // Set a first-party cookie for localhost.
-                document.location.href = firstPartyBaseUrl + subPathToSetFirstPartyCookie + "#" + returnUrl + "#step2";
-                break;
-            case "#step2":
-                document.location.hash = "step3";
-                // Check that localhost's cookie is there.
-                if (document.cookie !== firstPartyCookieName + "=" + cookieValue)
-                    testFailed("First-party cookie not set.");
-                runTest();
-                break;
-            case "#step3":
-                document.location.hash = "step4";
-                // Clear store to trigger grandfathering.
-                clearInMemoryAndPersistentStoreAndContinue();
-                break;
-            case "#step4":
-                document.location.hash = "step5";
-                // Set localhost as prevalent resource.
-                testRunner.setStatisticsPrevalentResource("http://localhost", true, function() {
-                    if (!testRunner.isStatisticsPrevalentResource("http://localhost"))
-                        testFailed("Localhost did not get set as prevalent resource.");
-                    runTest();
-                });
-                break;
-            case "#step5":
-                // Set a first-party cookie for 127.0.0.1.
-                document.location.href = thirdPartyBaseUrl + subPathToSetThirdPartyCookie + "#" + returnUrl + "#step6";
-                break;
-            case "#step6":
-                document.location.hash = "step7";
-                // Set 127.0.0.1 as prevalent resource
-                testRunner.setStatisticsPrevalentResource("http://127.0.0.1", true, function() {
-                    if (!testRunner.isStatisticsPrevalentResource("http://127.0.0.1"))
-                        testFailed("127.0.0.1 did not get set as prevalent resource.");
-                    runTest();
-                });
-                break;
-            case "#step7":
-                document.location.hash = "step8";
-                // Trigger a purge.
-                fireDataModificationHandlerAndContinue();
-                break;
-            case "#step8":
-                // Check that localhost's cookie is still there.
-                if (document.cookie !== firstPartyCookieName + "=" + cookieValue)
-                    testFailed("First-party cookie purged.");
-                else
-                    testPassed("Grandfathered cookie was not purged.");
-                finishTest();
-                break;
-            default:
-                testFailed("Should not be reached.");
-                finishTest();
-        }
-    }
-
-    if (document.location.hash === "" && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, function() {
-            testRunner.setStatisticsShouldClassifyResourcesBeforeDataRecordsRemoval(false);
-            testRunner.setStatisticsMinimumTimeBetweenDataRecordsRemoval(0);
-
-            testRunner.waitUntilDone();
-            testRunner.dumpChildFramesAsText();
-            document.location.hash = "step1";
-            runTest();
-        });
-    } else
-        runTest();
-</script>
-</body>
-</html>
index fcc82c5..c6cb0db 100644 (file)
@@ -8,7 +8,6 @@
 <div id="output"></div>
 <script>
     if (window.testRunner) {
-        testRunner.setUseITPDatabase(false);
         testRunner.waitUntilDone();
         testRunner.dumpAsText();
     }
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-database-expected.txt
deleted file mode 100644 (file)
index c89f855..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS Cookie not deleted.
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-database.html b/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-database.html
deleted file mode 100644 (file)
index d97e80f..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Tests for Non-Prevalent Resource With User Interaction</title>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    const hostUnderTest = "127.0.0.1:8000";
-    const statisticsUrl = "http://" + hostUnderTest + "/temp";
-    const otherPrevalentUrl = "http://localhost:8000/temp";
-
-    function runTestRunnerTest() {
-        if (document.cookie !== "")
-            testFailed("document.cookie not empty.");
-        const cookie = "testCookie=testValue";
-        document.cookie = cookie + "; max-age=100;";
-        if (document.cookie !== cookie)
-            testFailed("document.cookie did not get set.");
-
-        testRunner.setStatisticsPrevalentResource(statisticsUrl, false, function() {
-            if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                testFailed("Host did not get set as non-prevalent resource.");
-
-            // This is done to not have an empty set of prevalent resources.
-            // Otherwise data records are never scanned.
-            testRunner.setStatisticsPrevalentResource(otherPrevalentUrl, true, function() {
-                if (!testRunner.isStatisticsPrevalentResource(otherPrevalentUrl))
-                    testFailed("Other host did not get set as prevalent resource.");
-
-                testRunner.setStatisticsHasHadUserInteraction(statisticsUrl, true, function() {
-                    if (!testRunner.isStatisticsHasHadUserInteraction(statisticsUrl))
-                        testFailed("Host did not get logged for user interaction.");
-
-                    testRunner.installStatisticsDidScanDataRecordsCallback(function() {
-                        if (document.cookie === cookie)
-                            testPassed("Cookie not deleted.");
-                        else
-                            testFailed("Cookie deleted or document.cookie contains other cookies: " + document.cookie);
-
-                        setEnableFeature(false, function() {
-                            testRunner.notifyDone();
-                        });
-                    });
-                    testRunner.setStatisticsShouldClassifyResourcesBeforeDataRecordsRemoval(false);
-                    testRunner.setStatisticsMinimumTimeBetweenDataRecordsRemoval(0);
-                    testRunner.statisticsProcessStatisticsAndDataRecords();
-                });
-            });
-        });
-    }
-
-    if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        testRunner.waitUntilDone();
-        setEnableFeature(true, function() {
-            testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-            runTestRunnerTest();
-        });
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-database-expected.txt
deleted file mode 100644 (file)
index c89f855..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS Cookie not deleted.
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-database.html b/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-database.html
deleted file mode 100644 (file)
index 6bce990..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Tests for Non-Prevalent Resource Without User Interaction</title>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    const hostUnderTest = "127.0.0.1:8000";
-    const statisticsUrl = "http://" + hostUnderTest + "/temp";
-    const otherPrevalentUrl = "http://localhost:8000/temp";
-
-    function runTestRunnerTest() {
-        if (document.cookie !== "")
-            testFailed("document.cookie not empty.");
-        const cookie = "testCookie=testValue";
-        document.cookie = cookie + "; max-age=100;";
-        if (document.cookie !== cookie)
-            testFailed("document.cookie did not get set.");
-
-        testRunner.setStatisticsPrevalentResource(statisticsUrl, false, function() {
-            if (testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                testFailed("Host did not get set as non-prevalent resource.");
-
-            // This is done to not have an empty set of prevalent resources.
-            // Otherwise data records are never scanned.
-            testRunner.setStatisticsPrevalentResource(otherPrevalentUrl, true, function() {
-                if (!testRunner.isStatisticsPrevalentResource(otherPrevalentUrl))
-                    testFailed("Other host did not get set as prevalent resource.");
-
-                testRunner.setStatisticsHasHadUserInteraction(statisticsUrl, false, function() {
-                    if (testRunner.isStatisticsHasHadUserInteraction(statisticsUrl))
-                        testFailed("Host did not get cleared of user interaction.");
-
-                    testRunner.installStatisticsDidScanDataRecordsCallback(function() {
-                        if (document.cookie === cookie)
-                            testPassed("Cookie not deleted.");
-                        else
-                            testFailed("Cookie deleted or document.cookie contains other cookies: " + document.cookie);
-
-                        setEnableFeature(false, function() {
-                            testRunner.notifyDone();
-                        });
-                    });
-                    testRunner.setStatisticsShouldClassifyResourcesBeforeDataRecordsRemoval(false);
-                    testRunner.setStatisticsMinimumTimeBetweenDataRecordsRemoval(0);
-                    testRunner.statisticsProcessStatisticsAndDataRecords();
-                });
-            });
-        });
-    }
-
-    if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        testRunner.waitUntilDone();
-        setEnableFeature(true, function() {
-            testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-            runTestRunnerTest();
-        });
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context-database-expected.txt
deleted file mode 100644 (file)
index 0fb97f9..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
-
---------
-Frame: '<!--frame1-->'
---------
-Should receive one cookie.
-Received cookie named 'firstPartyCookie'.
-Client-side document.cookie: firstPartyCookie=value
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context-database.html b/LayoutTests/http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context-database.html
deleted file mode 100644 (file)
index c64cfcb..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Test to ensure non-prevalent resources can access their cookies in a third party context</title>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    const partitionHost = "127.0.0.1:8000";
-    const thirdPartyOrigin = "http://localhost:8000";
-    const thirdPartyBaseUrl = thirdPartyOrigin + "/resourceLoadStatistics/resources";
-    const firstPartyCookieName = "firstPartyCookie";
-    const subPathToSetFirstPartyCookie = "/set-cookie.php?name=" + firstPartyCookieName + "&value=value";
-    const fragmentWithReturnUrl = "http://127.0.0.1:8000/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context.html";
-    const subPathToGetCookies = "/get-cookies.php?name1=" + firstPartyCookieName;
-
-    function finishTest() {
-        setEnableFeature(false, function() {
-            testRunner.notifyDone();
-        });
-    }
-
-    function openIframe(url, onLoadHandler) {
-        const element = document.createElement("iframe");
-        element.src = url;
-        if (onLoadHandler) {
-            element.onload = onLoadHandler;
-        }
-        document.body.appendChild(element);
-    }
-
-    function runTest() {
-        switch (document.location.hash) {
-            case "#step1":
-                // Set a first-party cookie for localhost.
-                document.location.href = thirdPartyBaseUrl + subPathToSetFirstPartyCookie + "#" + fragmentWithReturnUrl + "#step2";
-                break;
-            case "#step2":
-                // Load localhost under 127.0.0.1 and check that it gets its cookie.
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should receive one cookie.", finishTest);
-                break;
-        }
-    }
-
-    if (document.location.host === partitionHost && document.location.hash == "" && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        testRunner.waitUntilDone();
-        testRunner.dumpChildFramesAsText();
-        setEnableFeature(true, function() {
-            testRunner.setStatisticsPrevalentResource(thirdPartyOrigin, false, function() {
-                testRunner.setStatisticsHasHadUserInteraction(thirdPartyOrigin, false, function() {
-                    document.location.hash = "step1";
-                    testRunner.statisticsUpdateCookieBlocking(runTest);
-                });
-            });
-        });
-    } else {
-        runTest();
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt
deleted file mode 100644 (file)
index 863c720..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests that redirects for a non-sandboxed iframe get counted properly.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost") is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html b/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html
deleted file mode 100644 (file)
index b5bda6f..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-    <script>
-        description("Tests that redirects for a non-sandboxed iframe get counted properly.");
-        jsTestIsAsync = true;
-        window.addEventListener("message", receiveMessage, false);
-
-        function finishTest() {
-            setEnableFeature(false, finishJSTest);
-        }
-
-        var lastPageInRedirectChainLoaded = false;
-        var statsChecked = false;
-
-        function receiveMessage(event) {
-            if (event.origin === "http://127.0.0.1:8000") {
-                if (event.data.indexOf("PASS") === -1)
-                    testFailed(event.data.replace("FAIL ", ""));
-            } else
-                testFailed("Received a message from an unexpected origin: " + event.origin);
-
-            lastPageInRedirectChainLoaded = true;
-            if (statsChecked)
-                finishTest();
-            else
-                testRunner.statisticsNotifyObserver();
-        }
-
-        function checkStats() {
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost")');
-
-            statsChecked = true;
-            if (lastPageInRedirectChainLoaded)
-                finishTest();
-        }
-
-        if (testRunner) {
-            testRunner.setUseITPDatabase(true);
-            setEnableFeature(true, function() {
-                testRunner.installStatisticsDidScanDataRecordsCallback(checkStats);
-            });
-        }
-    </script>
-</head>
-<body>
-<iframe src="http://127.0.0.1:8000/resourceLoadStatistics/resources/redirect.php?redirectTo=http://localhost:8000/resourceLoadStatistics/resources/redirect.php/?redirectTo=http://127.0.0.1:8000/resourceLoadStatistics/resources/iframe-report-back-loaded.html">
-</iframe>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt
deleted file mode 100644 (file)
index 863c720..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests that redirects for a non-sandboxed iframe get counted properly.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost") is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html b/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html
deleted file mode 100644 (file)
index 4b5ee99..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-    <script>
-        description("Tests that redirects for a non-sandboxed iframe get counted properly.");
-        jsTestIsAsync = true;
-        window.addEventListener("message", receiveMessage, false);
-
-        function finishTest() {
-            setEnableFeature(false, finishJSTest);
-        }
-
-        var lastPageInRedirectChainLoaded = false;
-        var statsChecked = false;
-
-        function receiveMessage(event) {
-            if (event.origin === "http://localhost:8000") {
-                if (event.data.indexOf("PASS") === -1)
-                    testFailed(event.data.replace("FAIL ", ""));
-            } else
-                testFailed("Received a message from an unexpected origin: " + event.origin);
-
-            lastPageInRedirectChainLoaded = true;
-            if (statsChecked)
-                finishTest();
-            else
-                testRunner.statisticsNotifyObserver();
-        }
-
-        function checkStats() {
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost")');
-
-            statsChecked = true;
-            if (lastPageInRedirectChainLoaded)
-                finishTest();
-        }
-
-        if (testRunner) {
-            testRunner.setUseITPDatabase(true);
-            setEnableFeature(true, function() {
-                testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-                testRunner.installStatisticsDidScanDataRecordsCallback(checkStats);
-            });
-        }
-    </script>
-</head>
-<body>
-<iframe src="http://localhost:8000/resourceLoadStatistics/resources/redirect.php/?redirectTo=http://127.0.0.1:8000/resourceLoadStatistics/resources/redirect.php/?redirectTo=http://localhost:8000/resourceLoadStatistics/resources/iframe-report-back-loaded.html">
-</iframe>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt
deleted file mode 100644 (file)
index 9b516f1..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests that redirects for a non-sandboxed iframe nested in a non-sandboxed iframe get counted properly.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost") is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html b/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html
deleted file mode 100644 (file)
index 2d9ca59..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-    <script>
-        description("Tests that redirects for a non-sandboxed iframe nested in a non-sandboxed iframe get counted properly.");
-        jsTestIsAsync = true;
-        window.addEventListener("message", receiveMessage, false);
-
-        function finishTest() {
-            setEnableFeature(false, finishJSTest);
-        }
-
-        var lastPageInRedirectChainLoaded = false;
-        var statsChecked = false;
-
-        function receiveMessage(event) {
-            if (event.origin === "http://127.0.0.1:8000") {
-                if (event.data.indexOf("PASS") === -1)
-                    testFailed(event.data.replace("FAIL ", ""));
-            } else
-                testFailed("Received a message from an unexpected origin: " + event.origin);
-
-            lastPageInRedirectChainLoaded = true;
-            if (statsChecked)
-                finishTest();
-            else
-                testRunner.statisticsNotifyObserver();
-        }
-
-        function checkStats() {
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost")');
-
-            statsChecked = true;
-            if (lastPageInRedirectChainLoaded)
-                finishTest();
-        }
-
-        if (testRunner) {
-            testRunner.setUseITPDatabase(true);
-            setEnableFeature(true, function() {
-                testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-                testRunner.installStatisticsDidScanDataRecordsCallback(checkStats);
-            });
-        }
-    </script>
-</head>
-<body>
-<iframe src="http://127.0.0.1:8000/resourceLoadStatistics/resources/page-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip.html">
-</iframe>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt
deleted file mode 100644 (file)
index 9b516f1..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests that redirects for a non-sandboxed iframe nested in a non-sandboxed iframe get counted properly.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost") is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html b/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html
deleted file mode 100644 (file)
index 31e33f6..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-    <script>
-        description("Tests that redirects for a non-sandboxed iframe nested in a non-sandboxed iframe get counted properly.");
-        jsTestIsAsync = true;
-        window.addEventListener("message", receiveMessage, false);
-
-        function finishTest() {
-            setEnableFeature(false, finishJSTest);
-        }
-
-        var lastPageInRedirectChainLoaded = false;
-        var statsChecked = false;
-
-        function receiveMessage(event) {
-            if (event.origin === "http://localhost:8000") {
-                if (event.data.indexOf("PASS") === -1)
-                    testFailed(event.data.replace("FAIL ", ""));
-            } else
-                testFailed("Received a message from an unexpected origin: " + event.origin);
-
-            lastPageInRedirectChainLoaded = true;
-            if (statsChecked)
-                finishTest();
-            else
-                testRunner.statisticsNotifyObserver();
-        }
-
-        function checkStats() {
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost")');
-
-            statsChecked = true;
-            if (lastPageInRedirectChainLoaded)
-                finishTest();
-        }
-
-        if (testRunner) {
-            testRunner.setUseITPDatabase(true);
-            setEnableFeature(true, function() {
-                testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-                testRunner.installStatisticsDidScanDataRecordsCallback(checkStats);
-            });
-        }
-    </script>
-</head>
-<body>
-<iframe src="http://127.0.0.1:8000/resourceLoadStatistics/resources/page-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost.html">
-</iframe>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt
deleted file mode 100644 (file)
index 715c85e..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests that redirects for a sandboxed iframe nested in a non-sandboxed iframe get counted properly.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost") is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html b/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html
deleted file mode 100644 (file)
index 9738ea3..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-    <script>
-        description("Tests that redirects for a sandboxed iframe nested in a non-sandboxed iframe get counted properly.");
-        jsTestIsAsync = true;
-        window.addEventListener("message", receiveMessage, false);
-
-        function finishTest() {
-            setEnableFeature(false, finishJSTest);
-        }
-
-        var lastPageInRedirectChainLoaded = false;
-        var statsChecked = false;
-
-        function receiveMessage(event) {
-            if (event.origin === "null") {
-                if (event.data.indexOf("PASS") === -1)
-                    testFailed(event.data.replace("FAIL ", ""));
-            } else
-                testFailed("Received a message from an unexpected origin: " + event.origin);
-
-            lastPageInRedirectChainLoaded = true;
-            if (statsChecked)
-                finishTest();
-            else
-                testRunner.statisticsNotifyObserver();
-        }
-
-        function checkStats() {
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost")');
-
-            statsChecked = true;
-            if (lastPageInRedirectChainLoaded)
-                finishTest();
-        }
-
-        if (testRunner) {
-            testRunner.setUseITPDatabase(true);
-            setEnableFeature(true, function() {
-                testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-                testRunner.installStatisticsDidScanDataRecordsCallback(checkStats);
-            });
-        }
-    </script>
-</head>
-<body>
-<iframe src="http://127.0.0.1:8000/resourceLoadStatistics/resources/page-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip.html">
-</iframe>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt
deleted file mode 100644 (file)
index 715c85e..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests that redirects for a sandboxed iframe nested in a non-sandboxed iframe get counted properly.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost") is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html b/LayoutTests/http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html
deleted file mode 100644 (file)
index 57faf00..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-    <script>
-        description("Tests that redirects for a sandboxed iframe nested in a non-sandboxed iframe get counted properly.");
-        jsTestIsAsync = true;
-        window.addEventListener("message", receiveMessage, false);
-
-        function finishTest() {
-            setEnableFeature(false, finishJSTest);
-        }
-
-        var lastPageInRedirectChainLoaded = false;
-        var statsChecked = false;
-
-        function receiveMessage(event) {
-            if (event.origin === "null") {
-                if (event.data.indexOf("PASS") === -1)
-                    testFailed(event.data.replace("FAIL ", ""));
-            } else
-                testFailed("Received a message from an unexpected origin: " + event.origin);
-
-            lastPageInRedirectChainLoaded = true;
-            if (statsChecked)
-                finishTest();
-            else
-                testRunner.statisticsNotifyObserver();
-        }
-
-        function checkStats() {
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost")');
-
-            statsChecked = true;
-            if (lastPageInRedirectChainLoaded)
-                finishTest();
-        }
-
-        if (testRunner) {
-            testRunner.setUseITPDatabase(true);
-            setEnableFeature(true, function() {
-                testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-                testRunner.installStatisticsDidScanDataRecordsCallback(checkStats);
-            });
-        }
-    </script>
-</head>
-<body>
-<iframe src="http://127.0.0.1:8000/resourceLoadStatistics/resources/page-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost.html">
-</iframe>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/ping-to-prevalent-resource-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/ping-to-prevalent-resource-database-expected.txt
deleted file mode 100644 (file)
index 549bfb9..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-Tests that cookie blocking is applied to ping loads.
-   
-
---------
-Frame: '<!--frame1-->'
---------
-Should receive first-party cookie.
-Received cookie named 'firstPartyCookie'.
-Client-side document.cookie: firstPartyCookie=value
-
---------
-Frame: '<!--frame2-->'
---------
-Should receive no cookies.
-Did not receive cookie named 'firstPartyCookie'.
-Client-side document.cookie:
-
---------
-Frame: '<!--frame3-->'
---------
-Ping received.
-HTTP_HOST: localhost:8000
-REQUEST_URI: /contentextensions/resources/save-ping.php?test=ping-to-prevalent-resource
-No cookies in ping.
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/ping-to-prevalent-resource-database.html b/LayoutTests/http/tests/resourceLoadStatistics/ping-to-prevalent-resource-database.html
deleted file mode 100644 (file)
index e621281..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <script src="/js-test-resources/ui-helper.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<div id="description">Tests that cookie blocking is applied to ping loads.</div>
-<a id="targetLink" href="#" ping="http://localhost:8000/contentextensions/resources/save-ping.php?test=ping-to-prevalent-resource">The link</a>
-<script>
-    if (testRunner)
-        testRunner.waitUntilDone();
-
-    const partitionHost = "127.0.0.1:8000";
-    const thirdPartyOrigin = "http://localhost:8000";
-    const resourcePath = "/resourceLoadStatistics/resources";
-    const thirdPartyBaseUrl = thirdPartyOrigin + resourcePath;
-    const firstPartyCookieName = "firstPartyCookie";
-    const subPathToSetFirstPartyCookie = "/set-cookie.php?name=" + firstPartyCookieName + "&value=value";
-    const returnUrl = "http://" + partitionHost + "/resourceLoadStatistics/ping-to-prevalent-resource.html";
-    const subPathToGetCookies = "/get-cookies.php?name1=" + firstPartyCookieName;
-
-    function activateElement(elementID, callback) {
-        var element = document.getElementById(elementID);
-        var centerX = element.offsetLeft + element.offsetWidth / 2;
-        var centerY = element.offsetTop + element.offsetHeight / 2;
-        UIHelper.activateAt(centerX, centerY).then(
-            function () {
-                callback();
-            },
-            function () {
-                testRunner.notifyDone();
-            }
-        );
-    }
-
-    function openIframe(url, onLoadHandler) {
-        const element = document.createElement("iframe");
-        element.src = url;
-        if (onLoadHandler) {
-            element.onload = onLoadHandler;
-        }
-        document.body.appendChild(element);
-    }
-
-    function runTest() {
-        switch (document.location.hash) {
-            case "#step1":
-                // Set first-party cookie for localhost.
-                document.location.href = thirdPartyBaseUrl + subPathToSetFirstPartyCookie + "#" + returnUrl + "#step2";
-                break;
-            case "#step2":
-                // Check that the cookie gets sent for localhost under 127.0.0.1 since localhost is not prevalent.
-                document.location.hash = "step3";
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies + "&message=Should receive first-party cookie.", runTest);
-                break;
-            case "#step3":
-                // Set localhost as prevalent to put it in the blocking category.
-                testRunner.setStatisticsPrevalentResource(thirdPartyOrigin, true, function() {
-                    testRunner.statisticsUpdateCookieBlocking(runTest);
-                    document.location.hash = "step4";
-                });
-                break;
-            case "#step4":
-                // Check that no cookie gets sent for localhost under 127.0.0.1 since localhost's cookies are blocked.
-                document.location.hash = "step5";
-                openIframe(thirdPartyBaseUrl + subPathToGetCookies +  "&message=Should receive no cookies.", runTest);
-                break;
-            case "#step5":
-                // Click the link to trigger the ping.
-                activateElement("targetLink", function() {
-                    openIframe(thirdPartyOrigin + "/contentextensions/resources/get-ping-data.php?test=ping-to-prevalent-resource", function() {
-                        document.body.removeChild(document.getElementById("targetLink"));
-                        setEnableFeature(false, function() {
-                    fetch("/contentextensions/resources/delete-ping.php?test=ping-to-prevalent-resource").then(()=>{
-                                            testRunner.notifyDone();
-                                });
-                        });
-                    });
-                });
-                break;
-        }
-    }
-
-    if (document.location.hash === "") {
-        if (testRunner) {
-            testRunner.setUseITPDatabase(true);
-            setEnableFeature(true, function () {
-                testRunner.dumpChildFramesAsText();
-                document.location.hash = "step1";
-                runTest();
-            });
-        }
-    } else {
-        runTest();
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-handled-keydown-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-handled-keydown-database-expected.txt
deleted file mode 100644 (file)
index e4e32c5..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests that we grant User Interaction credit for handled keypresses.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-Simulate user typing letter 'a' into the field.
-PASS testInput.value is "a"
-PASS Origin was granted user interaction.
-PASS successfullyParsed is true
-
-TEST COMPLETE
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-handled-keydown-database.html b/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-handled-keydown-database.html
deleted file mode 100644 (file)
index 7e56a50..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<script src="/js-test-resources/js-test.js"></script>
-<script>
-description("Tests that we grant User Interaction credit for handled keypresses.");
-jsTestIsAsync = true;
-
-const statisticsUrl = "http://127.0.0.1:8000/temp";
-
-onload = function() {
-    const testFrame = document.getElementById("testFrame");
-
-    if (window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        internals.setResourceLoadStatisticsEnabled(true);
-        testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-    }
-
-    testRunner.setStatisticsPrevalentResource(statisticsUrl, true, function() {
-        if (!testRunner.isStatisticsPrevalentResource(statisticsUrl))
-            testFailed("Host did not get set as prevalent resource.");
-
-        testRunner.setStatisticsHasHadUserInteraction(statisticsUrl, false, function() {
-            if (testRunner.isStatisticsHasHadUserInteraction(statisticsUrl))
-                testFailed("Host did not get cleared of user interaction.");
-
-            testInput = document.getElementById("testInput");
-
-            testRunner.installStatisticsDidModifyDataRecordsCallback(function() {
-                shouldBeEqualToString("testInput.value", "a");
-
-                if (!testRunner.isStatisticsHasHadUserInteraction(statisticsUrl))
-                    testFailed("Origin did not get user interaction credit.");
-                else
-                    testPassed("Origin was granted user interaction.");
-
-                setTimeout(function() {
-                    testFrame.src = "about:blank";
-                    setTimeout(function() {
-                        testRunner.statisticsResetToConsistentState(function() {
-                            finishJSTest();
-                        });
-                    }, 0);
-                }, 0);
-            });
-            testRunner.setStatisticsShouldClassifyResourcesBeforeDataRecordsRemoval(false);
-            testRunner.setStatisticsMinimumTimeBetweenDataRecordsRemoval(0);
-            testRunner.statisticsProcessStatisticsAndDataRecords();
-
-            debug("Simulate user typing letter 'a' into the field.");
-            testInput.focus();
-            if (window.eventSender)
-                eventSender.keyDown("a");
-        });
-    });
-}
-</script>
-<iframe id="testFrame" src="resources/onclick.html"></iframe>
-<input id="testInput" type="text">
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-unhandled-keydown-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-unhandled-keydown-database-expected.txt
deleted file mode 100644 (file)
index 36e559b..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-Tests that we do not grant User Interaction credit for unhandled keypress.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-Simulate an unhandled user key press.
-PASS Origin did not get user interaction credit.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-unhandled-keydown-database.html b/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-unhandled-keydown-database.html
deleted file mode 100644 (file)
index 5acdeb2..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<script src="/js-test-resources/js-test.js"></script>
-<script>
-description("Tests that we do not grant User Interaction credit for unhandled keypress.");
-jsTestIsAsync = true;
-
-const statisticsUrl = "http://127.0.0.1:8000/temp";
-
-onload = function() {
-    const testFrame = document.getElementById("testFrame");
-
-    if (window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        internals.setResourceLoadStatisticsEnabled(true);
-        testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-    }
-
-    testRunner.setStatisticsPrevalentResource(statisticsUrl, true, function() {
-        if (!testRunner.isStatisticsPrevalentResource(statisticsUrl))
-            testFailed("Host did not get set as prevalent resource.");
-
-        testRunner.setStatisticsHasHadUserInteraction(statisticsUrl, false, function() {
-            if (testRunner.isStatisticsHasHadUserInteraction(statisticsUrl))
-                testFailed("Host did not get cleared of user interaction.");
-
-            testRunner.installStatisticsDidModifyDataRecordsCallback(function() {
-
-                if (!testRunner.isStatisticsHasHadUserInteraction(statisticsUrl))
-                    testPassed("Origin did not get user interaction credit.");
-
-                setTimeout(function() {
-                    testFrame.src = "about:blank";
-                    setTimeout(function() {
-                        testRunner.statisticsResetToConsistentState(function() {
-                            finishJSTest();
-                        });
-                    }, 0);
-                }, 0);
-            });
-            testRunner.setStatisticsShouldClassifyResourcesBeforeDataRecordsRemoval(false);
-            testRunner.setStatisticsMinimumTimeBetweenDataRecordsRemoval(0);
-            testRunner.statisticsProcessStatisticsAndDataRecords();
-
-            debug("Simulate an unhandled user key press.");
-            if (window.eventSender)
-                eventSender.keyDown("a", ["metaKey"]);
-        });
-    });
-}
-</script>
-<iframe id="testFrame" src="resources/onclick.html"></iframe>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-database-expected.txt
deleted file mode 100644 (file)
index c89f855..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS Cookie not deleted.
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-database.html b/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-database.html
deleted file mode 100644 (file)
index ec13a50..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Tests for Prevalent Resource With User Interaction</title>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body onload="setTimeout('setUpAndRun()', 0)">
-<script>
-    if (testRunner)
-        testRunner.waitUntilDone();
-
-    const hostUnderTest = "127.0.0.1:8000";
-    const statisticsUrl = "http://" + hostUnderTest + "/temp";
-    const otherPrevalentUrl = "http://localhost:8000/temp";
-    function runTestRunnerTest() {
-        if (document.cookie !== "")
-            testFailed("document.cookie not empty.");
-        const cookie = "testCookie=testValue";
-        document.cookie = cookie + "; max-age=100;";
-        if (document.cookie !== cookie)
-            testFailed("document.cookie did not get set.");
-
-        testRunner.setStatisticsPrevalentResource(statisticsUrl, true, function() {
-            if (!testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                testFailed("Host did not get set as prevalent resource.");
-
-            // This is done to not have an empty set of prevalent resources.
-            // Otherwise data records are never scanned.
-            testRunner.setStatisticsPrevalentResource(otherPrevalentUrl, true, function() {
-                if (!testRunner.isStatisticsPrevalentResource(otherPrevalentUrl))
-                    testFailed("Other host did not get set as prevalent resource.");
-
-                testRunner.setStatisticsHasHadUserInteraction(statisticsUrl, true, function() {
-                    if (!testRunner.isStatisticsHasHadUserInteraction(statisticsUrl))
-                        testFailed("Host did not get logged for user interaction.");
-
-                    testRunner.installStatisticsDidModifyDataRecordsCallback(function() {
-                        if (document.cookie === cookie)
-                            testPassed("Cookie not deleted.");
-                        else
-                            testFailed("Cookie deleted or document.cookie contains other cookies: " + document.cookie);
-                        setEnableFeature(false, function() {
-                            testRunner.notifyDone();
-                        });
-                    });
-                    testRunner.setStatisticsShouldClassifyResourcesBeforeDataRecordsRemoval(false);
-                    testRunner.setStatisticsMinimumTimeBetweenDataRecordsRemoval(0);
-                    testRunner.statisticsProcessStatisticsAndDataRecords();
-                });
-            });
-        });
-    }
-
-    function setUpAndRun() {
-        if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
-            testRunner.setUseITPDatabase(true);
-            setEnableFeature(true, function () {
-                runTestRunnerTest();
-            });
-        } else {
-            testFailed("Wrong host, no testRunner, or no internals.");
-            testRunner.notifyDone();
-        }
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-database-expected.txt
deleted file mode 100644 (file)
index f7809e9..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS Cookie deleted.
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-database.html b/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-database.html
deleted file mode 100644 (file)
index b208970..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Tests for Prevalent Resource With User Interaction Timeout</title>
-    <script src="/js-test-resources/js-test.js"></script>
-</head>
-<body>
-<script>
-    const hostUnderTest = "127.0.0.1:8000";
-    const statisticsUrl = "http://" + hostUnderTest + "/temp";
-    function runTestRunnerTest() {
-        if (document.cookie !== "")
-            testFailed("document.cookie not empty.");
-        const cookie = "testCookie=testValue";
-        document.cookie = cookie + "; max-age=100;";
-        if (document.cookie !== cookie)
-            testFailed("document.cookie did not get set.");
-
-        testRunner.setStatisticsPrevalentResource(statisticsUrl, true, function() {
-            if (!testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                testFailed("Host did not get set as prevalent resource.");
-
-            testRunner.setStatisticsHasHadUserInteraction(statisticsUrl, true, function() {
-                if (!testRunner.isStatisticsHasHadUserInteraction(statisticsUrl))
-                    testFailed("Host did not get logged for user interaction.");
-
-                testRunner.installStatisticsDidModifyDataRecordsCallback(function() {
-                    if (document.cookie !== "")
-                        testFailed("Cookie not deleted: " + document.cookie);
-                    else
-                        testPassed("Cookie deleted.");
-                    internals.setResourceLoadStatisticsEnabled(false);
-                    testRunner.statisticsResetToConsistentState(function() {
-                        testRunner.notifyDone();
-                    });
-                });
-                testRunner.setStatisticsShouldClassifyResourcesBeforeDataRecordsRemoval(false);
-                testRunner.setStatisticsMinimumTimeBetweenDataRecordsRemoval(0);
-                testRunner.setStatisticsTimeToLiveUserInteraction(0);
-
-                // This is to ensure the timeout we're testing.
-                setTimeout("testRunner.statisticsProcessStatisticsAndDataRecords()", 1000);
-            });
-        });
-    }
-
-    if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        testRunner.waitUntilDone();
-        internals.setResourceLoadStatisticsEnabled(true);
-        testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-        runTestRunnerTest();
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-without-user-interaction-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-without-user-interaction-database-expected.txt
deleted file mode 100644 (file)
index f7809e9..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS Cookie deleted.
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-without-user-interaction-database.html b/LayoutTests/http/tests/resourceLoadStatistics/prevalent-resource-without-user-interaction-database.html
deleted file mode 100644 (file)
index 27b0b2a..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Tests for Prevalent Resource Without User Interaction</title>
-    <script src="/js-test-resources/js-test.js"></script>
-</head>
-<body>
-<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.");
-        internals.setResourceLoadStatisticsEnabled(false);
-        testRunner.statisticsResetToConsistentState(function() {
-            testRunner.notifyDone();
-        });
-    }
-
-    function runTestRunnerTest() {
-        if (document.cookie !== "")
-            testFailed("document.cookie not empty.");
-        const cookie = "testCookie=testValue";
-        document.cookie = cookie + "; max-age=100;";
-        if (document.cookie !== cookie)
-            testFailed("document.cookie did not get set.");
-
-        testRunner.setStatisticsPrevalentResource(statisticsUrl, true, function() {
-            if (!testRunner.isStatisticsPrevalentResource(statisticsUrl))
-                testFailed("Host did not get set as prevalent resource.");
-
-            testRunner.setStatisticsHasHadUserInteraction(statisticsUrl, false, function() {
-                if (testRunner.isStatisticsHasHadUserInteraction(statisticsUrl))
-                    testFailed("Host did not get cleared of user interaction.");
-
-                testRunner.installStatisticsDidModifyDataRecordsCallback(function() {
-                    setTimeout("finishTest()", 1000);
-                });
-                testRunner.setStatisticsShouldClassifyResourcesBeforeDataRecordsRemoval(false);
-                testRunner.setStatisticsMinimumTimeBetweenDataRecordsRemoval(0);
-                testRunner.statisticsProcessStatisticsAndDataRecords();
-            });
-        });
-    }
-
-    if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
-        testRunner.waitUntilDone();
-        internals.setResourceLoadStatisticsEnabled(true);
-        testRunner.setUseITPDatabase(true);
-        testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-        runTestRunnerTest();
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/prune-statistics-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/prune-statistics-database-expected.txt
deleted file mode 100644 (file)
index e74757b..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-Tests that statistics are pruned in the right order.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Test iteration 1 passed.
-PASS Test iteration 2 passed.
-PASS Test iteration 3 passed.
-PASS Test iteration 4 passed.
-PASS Test iteration 5 passed.
-PASS Test iteration 6 passed.
-PASS Test iteration 7 passed.
-PASS Test iteration 8 passed.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/prune-statistics-database.html b/LayoutTests/http/tests/resourceLoadStatistics/prune-statistics-database.html
deleted file mode 100644 (file)
index 0cab7d3..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Test for Resource Load Statistics Pruning</title>
-    <script src="/js-test-resources/js-test.js"></script>
-</head>
-<body>
-<script>
-    description("Tests that statistics are pruned in the right order.");
-    jsTestIsAsync = true;
-
-    const olderTimestamp = Math.round((new Date()).getTime() / 1000);
-    const newerTimestamp = olderTimestamp + 10;
-    const newestTimestamp = newerTimestamp + 10;
-
-    const urlsToBePruned = [
-        { url: "http://127.0.0.1:8000/temp", prevalent: false },
-        { url: "http://127.0.0.2:8000/temp", prevalent: false },
-        { url: "http://127.0.0.3:8000/temp", prevalent: true },
-        { url: "http://127.0.0.4:8000/temp", prevalent: true },
-        { url: "http://127.0.0.5:8000/temp", prevalent: false },
-        { url: "http://127.0.0.6:8000/temp", prevalent: false },
-        { url: "http://127.0.0.7:8000/temp", prevalent: true },
-        { url: "http://127.0.0.8:8000/temp", prevalent: true }
-    ];
-
-    function checkIfPrevalentAccordingToInitialExpectation(begin, end) {
-        var failed = false;
-        for (var i = begin; i < end; ++i) {
-            if (testRunner.isStatisticsPrevalentResource(urlsToBePruned[i].url) !== urlsToBePruned[i].prevalent) {
-                testFailed("checkIfPrevalentAccordingToInitialExpectation: Test iteration " + currentTest + " failed. " + urlsToBePruned[i].url + (urlsToBePruned[i].prevalent ? " wasn't " : " was ") + "prevalent");
-                failed = true;
-            }
-        }
-        if (failed) {
-            testRunner.statisticsResetToConsistentState(function() {
-                finishJSTest();
-            });
-        }
-    }
-
-    function checkIfPrevalent(begin, end, expected) {
-        var failed = false;
-        for (var i = begin; i < end; ++i) {
-            if (testRunner.isStatisticsPrevalentResource(urlsToBePruned[i].url) !== expected) {
-                testFailed("checkIfPrevalent: Test iteration " + currentTest + " failed. " + urlsToBePruned[i].url + (expected ? " wasn't " : " was ") + "prevalent");
-                failed = true;
-            }
-        }
-        if (failed) {
-            testRunner.statisticsResetToConsistentState(function() {
-                finishJSTest();
-            });
-        }
-    }
-
-    function initializeStatisticsAndRunTests(step) {
-        switch (step) {
-            // Non-prevalent without user interaction to be pruned first.
-            case 1:
-                testRunner.setStatisticsLastSeen(urlsToBePruned[0].url, olderTimestamp, function() { initializeStatisticsAndRunTests(2); });
-                break;
-            case 2:
-                testRunner.setStatisticsLastSeen(urlsToBePruned[1].url, newerTimestamp, function() { initializeStatisticsAndRunTests(3); });
-                break;
-            // Prevalent without user interaction to be pruned second.
-            case 3:
-                testRunner.setStatisticsPrevalentResource(urlsToBePruned[2].url, true, function() { initializeStatisticsAndRunTests(4); });
-                break;
-            case 4:
-                testRunner.setStatisticsLastSeen(urlsToBePruned[2].url, olderTimestamp, function() { initializeStatisticsAndRunTests(5); });
-                break;
-            case 5:
-                testRunner.setStatisticsPrevalentResource(urlsToBePruned[3].url, true, function() { initializeStatisticsAndRunTests(6); });
-                break;
-            case 6:
-                testRunner.setStatisticsLastSeen(urlsToBePruned[3].url, newerTimestamp, function() { initializeStatisticsAndRunTests(7); });
-                break;
-            // Non-prevalent with user interaction to be pruned third.
-            case 7:
-                testRunner.setStatisticsHasHadUserInteraction(urlsToBePruned[4].url, true, function() { initializeStatisticsAndRunTests(8); });
-                break;
-            case 8:
-                testRunner.setStatisticsLastSeen(urlsToBePruned[4].url, olderTimestamp, function() { initializeStatisticsAndRunTests(9); });
-                break;
-            case 9:
-                testRunner.setStatisticsHasHadUserInteraction(urlsToBePruned[5].url, true, function() { initializeStatisticsAndRunTests(10); });
-                break;
-            case 10:
-                testRunner.setStatisticsLastSeen(urlsToBePruned[5].url, newerTimestamp, function() { initializeStatisticsAndRunTests(11); });
-                break;
-            // Prevalent with user interaction to be pruned last.
-            case 11:
-                testRunner.setStatisticsPrevalentResource(urlsToBePruned[6].url, true, function() { initializeStatisticsAndRunTests(12); });
-                break;
-            case 12:
-                testRunner.setStatisticsHasHadUserInteraction(urlsToBePruned[6].url, true, function() { initializeStatisticsAndRunTests(13); });
-                break;
-            case 13:
-                testRunner.setStatisticsLastSeen(urlsToBePruned[6].url, olderTimestamp, function() { initializeStatisticsAndRunTests(14); });
-                break;
-            case 14:
-                testRunner.setStatisticsPrevalentResource(urlsToBePruned[7].url, true, function() { initializeStatisticsAndRunTests(15); });
-                break;
-            case 15:
-                testRunner.setStatisticsHasHadUserInteraction(urlsToBePruned[7].url, true, function() { initializeStatisticsAndRunTests(16); });
-                break;
-            case 16:
-                testRunner.setStatisticsLastSeen(urlsToBePruned[7].url, newerTimestamp, function() { initializeStatisticsAndRunTests(17); });
-                break;
-            case 17:
-                checkIfPrevalentAccordingToInitialExpectation(0, urlsToBePruned.length);
-                runTest();
-                break;
-        }
-    }
-
-    var currentTest;
-    function checkStatisticsAfterPruning() {
-        // Pruned entries should not be prevalent.
-        checkIfPrevalent(0, currentTest, false);
-        // Non-pruned entries should keep their expected status.
-        checkIfPrevalentAccordingToInitialExpectation(currentTest, urlsToBePruned.length);
-        testPassed("Test iteration " + currentTest + " passed.");
-        if (currentTest < urlsToBePruned.length) {
-            ++currentTest;
-            testRunner.installStatisticsDidScanDataRecordsCallback(checkStatisticsAfterPruning);
-            initializeStatisticsAndRunTests(1);
-        } else {
-            testRunner.statisticsResetToConsistentState(function() {
-                finishJSTest();
-            });
-        }
-    }
-
-    let fillerUrl;
-    function runTest() {
-        fillerUrl = "http://127.0." + currentTest + ".1:8000/temp";
-        testRunner.setStatisticsPrevalentResource(fillerUrl, true, function() {
-            testRunner.setStatisticsHasHadUserInteraction(fillerUrl, true, function() {
-                testRunner.setStatisticsLastSeen(fillerUrl, newestTimestamp, function() {
-                    testRunner.statisticsProcessStatisticsAndDataRecords();
-                });
-            });
-        });
-    }
-
-    if (window.testRunner) {
-            testRunner.setUseITPDatabase(true);
-        testRunner.setStatisticsShouldClassifyResourcesBeforeDataRecordsRemoval(false);
-        testRunner.setStatisticsMinimumTimeBetweenDataRecordsRemoval(0);
-        testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-        testRunner.setStatisticsMaxStatisticsEntries(urlsToBePruned.length);
-        testRunner.setStatisticsPruneEntriesDownTo(urlsToBePruned.length);
-
-        currentTest = 1;
-        testRunner.installStatisticsDidScanDataRecordsCallback(checkStatisticsAfterPruning);
-        initializeStatisticsAndRunTests(1);
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt
deleted file mode 100644 (file)
index b7c1438..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests that redirects for sandboxed iframes get counted properly.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost") is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html b/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html
deleted file mode 100644 (file)
index 6671120..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-    <script>
-        description("Tests that redirects for sandboxed iframes get counted properly.");
-        jsTestIsAsync = true;
-        window.addEventListener("message", receiveMessage, false);
-
-        function finishTest() {
-            setEnableFeature(false, finishJSTest);
-        }
-
-        if (testRunner) {
-            testRunner.setUseITPDatabase(true);
-            setEnableFeature(true, function() {
-                testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-                testRunner.installStatisticsDidScanDataRecordsCallback(checkStats);
-            });
-        }
-
-        var lastPageInRedirectChainLoaded = false;
-        var statsChecked = false;
-
-        function receiveMessage(event) {
-            if (event.origin === "null") {
-                if (event.data.indexOf("PASS") === -1)
-                    testFailed(event.data.replace("FAIL ", ""));
-            } else
-                testFailed("Received a message from an unexpected origin: " + event.origin);
-
-            lastPageInRedirectChainLoaded = true;
-            if (statsChecked)
-                finishTest();
-            else
-                testRunner.statisticsNotifyObserver();
-        }
-
-        function checkStats() {
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost")');
-
-            statsChecked = true;
-            if (lastPageInRedirectChainLoaded)
-                finishTest();
-        }
-    </script>
-</head>
-<body>
-<iframe sandbox="allow-scripts" src="http://127.0.0.1:8000/resourceLoadStatistics/resources/redirect.php/?redirectTo=http://localhost:8000/resourceLoadStatistics/resources/redirect.php/?redirectTo=http://127.0.0.1:8000/resourceLoadStatistics/resources/iframe-report-back-loaded.html">
-</iframe>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt
deleted file mode 100644 (file)
index b7c1438..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests that redirects for sandboxed iframes get counted properly.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost") is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html b/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html
deleted file mode 100644 (file)
index f026bd9..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-    <script>
-        description("Tests that redirects for sandboxed iframes get counted properly.");
-        jsTestIsAsync = true;
-        window.addEventListener("message", receiveMessage, false);
-
-        function finishTest() {
-            setEnableFeature(false, finishJSTest);
-        }
-
-        if (testRunner) {
-            testRunner.setUseITPDatabase(true);
-            setEnableFeature(true, function() {
-                testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-                testRunner.installStatisticsDidScanDataRecordsCallback(checkStats);
-            });
-        }
-
-        var lastPageInRedirectChainLoaded = false;
-        var statsChecked = false;
-
-        function receiveMessage(event) {
-            if (event.origin === "null") {
-                if (event.data.indexOf("PASS") === -1)
-                    testFailed(event.data.replace("FAIL ", ""));
-            } else
-                testFailed("Received a message from an unexpected origin: " + event.origin);
-
-            lastPageInRedirectChainLoaded = true;
-            if (statsChecked)
-                finishTest();
-            else
-                testRunner.statisticsNotifyObserver();
-        }
-
-        function checkStats() {
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost")');
-
-            statsChecked = true;
-            if (lastPageInRedirectChainLoaded)
-                finishTest();
-        }
-    </script>
-</head>
-<body>
-<iframe sandbox="allow-scripts" src="http://localhost:8000/resourceLoadStatistics/resources/redirect.php/?redirectTo=http://127.0.0.1:8000/resourceLoadStatistics/resources/redirect.php/?redirectTo=http://localhost:8000/resourceLoadStatistics/resources/iframe-report-back-loaded.html">
-</iframe>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt
deleted file mode 100644 (file)
index 23658cd..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests that redirects for a non-sandboxed iframe nested in a sandboxed iframe get counted properly.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost") is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html b/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html
deleted file mode 100644 (file)
index 092d599..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-    <script>
-        description("Tests that redirects for a non-sandboxed iframe nested in a sandboxed iframe get counted properly.");
-        jsTestIsAsync = true;
-        window.addEventListener("message", receiveMessage, false);
-
-        function finishTest() {
-            setEnableFeature(false, finishJSTest);
-        }
-
-        if (testRunner) {
-            testRunner.setUseITPDatabase(true);
-            setEnableFeature(true, function() {
-                testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-                testRunner.installStatisticsDidScanDataRecordsCallback(checkStats);
-            });
-        }
-
-        var lastPageInRedirectChainLoaded = false;
-        var statsChecked = false;
-
-        function receiveMessage(event) {
-            if (event.origin === "null") {
-                if (event.data.indexOf("PASS") === -1)
-                    testFailed(event.data.replace("FAIL ", ""));
-            } else
-                testFailed("Received a message from an unexpected origin: " + event.origin);
-
-            lastPageInRedirectChainLoaded = true;
-            if (statsChecked)
-                finishTest();
-            else
-                testRunner.statisticsNotifyObserver();
-        }
-
-        function checkStats() {
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost")');
-
-            statsChecked = true;
-            if (lastPageInRedirectChainLoaded)
-                finishTest();
-        }
-    </script>
-</head>
-<body>
-<iframe sandbox="allow-scripts" src="http://127.0.0.1:8000/resourceLoadStatistics/resources/page-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip.html">
-</iframe>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt
deleted file mode 100644 (file)
index 23658cd..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests that redirects for a non-sandboxed iframe nested in a sandboxed iframe get counted properly.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost") is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html b/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html
deleted file mode 100644 (file)
index df86fe8..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-    <script>
-        description("Tests that redirects for a non-sandboxed iframe nested in a sandboxed iframe get counted properly.");
-        jsTestIsAsync = true;
-        window.addEventListener("message", receiveMessage, false);
-
-        function finishTest() {
-            setEnableFeature(false, finishJSTest);
-        }
-
-        if (testRunner) {
-            testRunner.setUseITPDatabase(true);
-            setEnableFeature(true, function() {
-                testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-                testRunner.installStatisticsDidScanDataRecordsCallback(checkStats);
-            });
-        }
-
-        var lastPageInRedirectChainLoaded = false;
-        var statsChecked = false;
-
-        function receiveMessage(event) {
-            if (event.origin === "null") {
-                if (event.data.indexOf("PASS") === -1)
-                    testFailed(event.data.replace("FAIL ", ""));
-            } else
-                testFailed("Received a message from an unexpected origin: " + event.origin);
-
-            lastPageInRedirectChainLoaded = true;
-            if (statsChecked)
-                finishTest();
-            else
-                testRunner.statisticsNotifyObserver();
-        }
-
-        function checkStats() {
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost")');
-
-            statsChecked = true;
-            if (lastPageInRedirectChainLoaded)
-                finishTest();
-        }
-    </script>
-</head>
-<body>
-<iframe sandbox="allow-scripts" src="http://127.0.0.1:8000/resourceLoadStatistics/resources/page-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost.html">
-</iframe>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt
deleted file mode 100644 (file)
index 715c85e..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests that redirects for a sandboxed iframe nested in a non-sandboxed iframe get counted properly.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost") is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html b/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html
deleted file mode 100644 (file)
index d6e94a4..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-    <script>
-        description("Tests that redirects for a sandboxed iframe nested in a non-sandboxed iframe get counted properly.");
-        jsTestIsAsync = true;
-        window.addEventListener("message", receiveMessage, false);
-
-        function finishTest() {
-            setEnableFeature(false, finishJSTest);
-        }
-
-        if (testRunner) {
-            testRunner.setUseITPDatabase(true);
-            setEnableFeature(true, function() {
-                testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-                testRunner.installStatisticsDidScanDataRecordsCallback(checkStats);
-            });
-        }
-
-        var lastPageInRedirectChainLoaded = false;
-        var statsChecked = false;
-
-        function receiveMessage(event) {
-            if (event.origin === "null") {
-                if (event.data.indexOf("PASS") === -1)
-                    testFailed(event.data.replace("FAIL ", ""));
-            } else
-                testFailed("Received a message from an unexpected origin: " + event.origin);
-
-            lastPageInRedirectChainLoaded = true;
-            if (statsChecked)
-                finishTest();
-            else
-                testRunner.statisticsNotifyObserver();
-        }
-
-        function checkStats() {
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost")');
-
-            statsChecked = true;
-            if (lastPageInRedirectChainLoaded)
-                finishTest();
-        }
-    </script>
-</head>
-<body>
-<iframe sandbox="allow-scripts" src="http://127.0.0.1:8000/resourceLoadStatistics/resources/page-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip.html">
-</iframe>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt
deleted file mode 100644 (file)
index 715c85e..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests that redirects for a sandboxed iframe nested in a non-sandboxed iframe get counted properly.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1") is true
-PASS testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost") is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html b/LayoutTests/http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html
deleted file mode 100644 (file)
index 5e19dd1..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-    <script>
-        description("Tests that redirects for a sandboxed iframe nested in a non-sandboxed iframe get counted properly.");
-        jsTestIsAsync = true;
-        window.addEventListener("message", receiveMessage, false);
-
-        function finishTest() {
-            setEnableFeature(false, finishJSTest);
-        }
-
-        if (testRunner) {
-            testRunner.setUseITPDatabase(true);
-            setEnableFeature(true, function() {
-                testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-                testRunner.installStatisticsDidScanDataRecordsCallback(checkStats);
-            });
-        }
-
-        var lastPageInRedirectChainLoaded = false;
-        var statsChecked = false;
-
-        function receiveMessage(event) {
-            if (event.origin === "null") {
-                if (event.data.indexOf("PASS") === -1)
-                    testFailed(event.data.replace("FAIL ", ""));
-            } else
-                testFailed("Received a message from an unexpected origin: " + event.origin);
-
-            lastPageInRedirectChainLoaded = true;
-            if (statsChecked)
-                finishTest();
-            else
-                testRunner.statisticsNotifyObserver();
-        }
-
-        function checkStats() {
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsSubFrameUnder("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://localhost", "http://127.0.0.1")');
-            shouldBeTrue('testRunner.isStatisticsRegisteredAsRedirectingTo("http://127.0.0.1", "http://localhost")');
-
-            statsChecked = true;
-            if (lastPageInRedirectChainLoaded)
-                finishTest();
-        }
-    </script>
-</head>
-<body>
-<iframe sandbox="allow-scripts" src="http://127.0.0.1:8000/resourceLoadStatistics/resources/page-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost.html">
-</iframe>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/set-custom-prevalent-resource-in-debug-mode-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/set-custom-prevalent-resource-in-debug-mode-database-expected.txt
deleted file mode 100644 (file)
index 2dc073d..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Test for enabling debug mode and that it allows setting a custom domain as a prevalent resource.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS http://localhost:8000 got set as a custom prevalent resource in debug mode.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/set-custom-prevalent-resource-in-debug-mode-database.html b/LayoutTests/http/tests/resourceLoadStatistics/set-custom-prevalent-resource-in-debug-mode-database.html
deleted file mode 100644 (file)
index 5fda812..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    description("Test for enabling debug mode and that it allows setting a custom domain as a prevalent resource.");
-    jsTestIsAsync = true;
-
-    const thirdPartyOrigin = "http://localhost:8000";
-
-    if (window.testRunner && window.internals) {
-        testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, function() {
-            if (testRunner.isStatisticsPrevalentResource(thirdPartyOrigin))
-                testFailed(thirdPartyOrigin + " already set as prevalent resource.");
-
-            testRunner.setStatisticsPrevalentResourceForDebugMode(thirdPartyOrigin, function() {
-                testRunner.setStatisticsDebugMode(true, function() {
-                    if (!testRunner.isStatisticsPrevalentResource(thirdPartyOrigin))
-                        testFailed(thirdPartyOrigin + " didn't get set as prevalent resource.");
-                    else
-                        testPassed(thirdPartyOrigin + " got set as a custom prevalent resource in debug mode.");
-                    testRunner.setStatisticsDebugMode(false, function() {
-                        setEnableFeature(false, finishJSTest);
-                    });
-                });
-            });
-        });
-    }
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-redirects-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-redirects-database-expected.txt
deleted file mode 100644 (file)
index 7bd543e..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Tests that only the origin is sent as referrer in redirects to prevalent resources without user interaction.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS referrer is "http://127.0.0.1:8000/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-redirects-database.html"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
-
---------
-Frame: '<!--frame1-->'
---------
-http://127.0.0.1:8000/
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-redirects-database.html b/LayoutTests/http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-redirects-database.html
deleted file mode 100644 (file)
index b0f8a2f..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    description("Tests that only the origin is sent as referrer in redirects to prevalent resources without user interaction.");
-    jsTestIsAsync = true;
-    testRunner.dumpChildFramesAsText();
-
-    function openIframe(url, onLoadHandler) {
-        const element = document.createElement("iframe");
-        element.src = url;
-        if (onLoadHandler) {
-            element.onload = onLoadHandler;
-        }
-        document.body.appendChild(element);
-    }
-
-    var referrer;
-    testRunner.setUseITPDatabase(true);
-    setEnableFeature(true, function() {
-        if (testRunner.isStatisticsPrevalentResource("http://localhost"))
-            testFailed("Localhost was classified as prevalent resource before the test started.");
-
-        fetch("resources/echo-referrer.php").then(function(response) {
-            return response.text();
-        }).then(function(data) {
-            referrer = data;
-            shouldBeEqualToString("referrer", "http://127.0.0.1:8000/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-redirects-database.html");
-
-            testRunner.setStatisticsPrevalentResource("http://localhost", true, function() {
-                if (!testRunner.isStatisticsPrevalentResource("http://localhost"))
-                    testFailed("Host did not get set as prevalent resource.");
-
-                testRunner.statisticsUpdateCookieBlocking(function() {
-                    openIframe("resources/redirect.php?redirectTo=http://localhost:8000/resourceLoadStatistics/resources/echo-referrer.php", function() {
-                        setEnableFeature(false, finishJSTest);
-                    });
-                });
-            });
-        }).catch(function(error) {
-            console.log(error.message);
-            setEnableFeature(false, finishJSTest);
-        });
-    });
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-requests-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-requests-database-expected.txt
deleted file mode 100644 (file)
index 89ccb9c..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-Tests that only the origin is sent as referrer for prevalent resources without user interaction.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS referrer is "http://127.0.0.1:8000/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-requests-database.html"
-PASS referrer is "http://127.0.0.1:8000/"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
-
---------
-Frame: '<!--frame1-->'
---------
-http://127.0.0.1:8000/
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-requests-database.html b/LayoutTests/http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-requests-database.html
deleted file mode 100644 (file)
index 15d4f03..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body>
-<script>
-    description("Tests that only the origin is sent as referrer for prevalent resources without user interaction.");
-    jsTestIsAsync = true;
-    testRunner.dumpChildFramesAsText();
-
-    function openIframe(url, onLoadHandler) {
-        const element = document.createElement("iframe");
-        element.src = url;
-        if (onLoadHandler) {
-            element.onload = onLoadHandler;
-        }
-        document.body.appendChild(element);
-    }
-
-    var referrer;
-    testRunner.setUseITPDatabase(true);
-    setEnableFeature(true, function() {
-        if (testRunner.isStatisticsPrevalentResource("http://localhost"))
-            testFailed("Localhost was classified as prevalent resource before the test started.");
-
-        fetch("resources/echo-referrer.php").then(function(response) {
-            return response.text();
-        }).then(function(data) {
-            referrer = data;
-            shouldBeEqualToString("referrer", "http://127.0.0.1:8000/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-requests-database.html");
-
-            testRunner.setStatisticsPrevalentResource("http://localhost", true, function() {
-                if (!testRunner.isStatisticsPrevalentResource("http://localhost"))
-                    testFailed("Host did not get set as prevalent resource.");
-
-                testRunner.statisticsUpdateCookieBlocking(function() {
-                    fetch("http://localhost:8000/resourceLoadStatistics/resources/echo-referrer.php").then(function(response) {
-                        return response.text();
-                    }).then(function(data) {
-                        referrer = data;
-                        shouldBeEqualToString("referrer", "http://127.0.0.1:8000/");
-
-                        openIframe("resources/redirect.php?redirectTo=http://localhost:8000/resourceLoadStatistics/resources/echo-referrer.php", function() {
-                            setEnableFeature(false, finishJSTest);
-                        });
-
-                    }).catch(function(error) {
-                        console.log(error.message);
-                        setEnableFeature(false, finishJSTest);
-                    });
-                });
-            });
-        }).catch(function(error) {
-            console.log(error.message);
-            setEnableFeature(false, finishJSTest);
-        });
-    });
-</script>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/switch-session-on-navigation-to-prevalent-with-interaction-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/switch-session-on-navigation-to-prevalent-with-interaction-database-expected.txt
deleted file mode 100644 (file)
index 343922f..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests that the session is switched upon top frame navigation to a prevalent resource with user interaction.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Should have and has the session cookie.
-PASS Should have and has the persistent cookie.
-PASS Origin has isolated session.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/switch-session-on-navigation-to-prevalent-with-interaction-database.html b/LayoutTests/http/tests/resourceLoadStatistics/switch-session-on-navigation-to-prevalent-with-interaction-database.html
deleted file mode 100644 (file)
index 6270c00..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <script src="/js-test-resources/js-test.js"></script>
-    <script src="resources/util.js"></script>
-</head>
-<body onload="runTest()">
-<script>
-    description("Tests that the session is switched upon top frame navigation to a prevalent resource with user interaction.");
-    jsTestIsAsync = true;
-
-    const prevalentOrigin = "http://127.0.0.1:8000";
-    const nonPrevalentOrigin = "http://localhost:8000";
-    const sessionCookieName = "sessionCookie";
-    const persistentCookieName = "persistentCookie";
-    const twoMinutesInSeconds = 120;
-
-    function setSessionCookie() {
-        document.cookie = sessionCookieName + "=1; path=/";
-    }
-
-    function setPersistentCookie() {
-        document.cookie = persistentCookieName + "=1; path=/; Max-Age=" + twoMinutesInSeconds + ";";
-    }
-
-    function checkCookies(shouldHaveSessionCookie, shouldHavePersistentCookie) {
-        let hasSessionCookie = (document.cookie + "").includes(sessionCookieName),
-            hasPersistentCookie = (document.cookie + "").includes(persistentCookieName);
-
-        if (shouldHaveSessionCookie && hasSessionCookie)
-            testPassed("Should have and has the session cookie.");
-        else if (shouldHaveSessionCookie && !hasSessionCookie) {
-            testFailed("Should have but doesn't have the session cookie.");
-            setEnableFeature(false, finishJSTest);
-        } else if (!shouldHaveSessionCookie && hasSessionCookie) {
-            testFailed("Shouldn't have but has the session cookie.");
-            setEnableFeature(false, finishJSTest);
-        } else
-            testPassed("Shouldn't have and doesn't have the session cookie.");
-
-
-        if (shouldHavePersistentCookie && hasPersistentCookie)
-            testPassed("Should have and has the persistent cookie.");
-        else if (shouldHavePersistentCookie && !hasPersistentCookie) {
-            testFailed("Should have but doesn't have the persistent cookie.");
-            setEnableFeature(false, finishJSTest);
-        } else if (!shouldHavePersistentCookie && hasPersistentCookie) {
-            testFailed("Shouldn't have but has the persistent cookie.");
-            setEnableFeature(false, finishJSTest);
-        } else
-            testPassed("Shouldn't have and doesn't have the persistent cookie.");
-    }
-
-    function runTest() {
-        switch (document.location.hash) {
-            case "#step1":
-                testRunner.setStatisticsHasHadUserInteraction(prevalentOrigin, true, function() {
-                    setSessionCookie();
-                    setPersistentCookie();
-                    checkCookies(true, true);
-                    if (testRunner.hasStatisticsIsolatedSession(prevalentOrigin)) {
-                        testFailed("Origin has isolated session.");
-                        setEnableFeature(false, finishJSTest);
-                    } else
-                        testPassed("Origin has no isolated session.");
-                    document.location.href = nonPrevalentOrigin + "/resourceLoadStatistics/switch-session-on-navigation-to-prevalent-with-interaction-database.html#step2";
-                });
-                break;
-            case "#step2":
-                document.location.hash = "step3";
-                if (document.location.origin !== nonPrevalentOrigin)
-                    testFailed("Step 2 is not on " + nonPrevalentOrigin + ".");
-                testRunner.setStatisticsPrevalentResource(prevalentOrigin, true, function() {
-                    if (!testRunner.isStatisticsPrevalentResource(prevalentOrigin)) {
-                        testFailed(prevalentOrigin + " did not get set as prevalent resource.");
-                        setEnableFeature(false, finishJSTest);
-                    }
-                    testRunner.statisticsUpdateCookieBlocking(runTest);
-                });
-                break;
-            case "#step3":
-                document.location.href = prevalentOrigin + "/resourceLoadStatistics/switch-session-on-navigation-to-prevalent-with-interaction-database.html#step4";
-                break;
-            case "#step4":
-                checkCookies(true, true);
-                if (testRunner.hasStatisticsIsolatedSession(prevalentOrigin))
-                    testPassed("Origin has isolated session.");
-                else
-                    testFailed("Origin has no isolated session.");
-                setEnableFeature(false, finishJSTest);
-                break;
-            default:
-                testFailed("Unknown hash.");
-                setEnableFeature(false, finishJSTest);
-        }
-    }
-
-    if (document.location.hash === "") {
-        if (document.location.origin !== prevalentOrigin)
-            testFailed("Test is not starting out on " + prevalentOrigin + ".");
-        testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, function () {
-            if (testRunner.isStatisticsPrevalentResource(prevalentOrigin))
-                testFailed(prevalentOrigin + " was classified as prevalent resource before the test starts.");
-            document.location.hash = "step1";
-        });
-    }
-</script>
-</body>
-</html>
index 647db30..8419562 100644 (file)
@@ -8,7 +8,6 @@
 </head>
 <body>
 <script>
-    testRunner.setUseITPDatabase(false);
     description("Tests that telemetry for prevalent resources is calculated correctly.");
     jsTestIsAsync = true;
 
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame-database-expected.txt
deleted file mode 100644 (file)
index 2842730..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-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".
-
-
-PASS document.location.origin is topFrameOrigin
-PASS testRunner.isStatisticsHasHadUserInteraction(topFrameOrigin) is false
-PASS testRunner.isStatisticsHasHadUserInteraction(subFrameOrigin) is false
-PASS testRunner.isStatisticsHasHadUserInteraction(topFrameOrigin) is true
-PASS testRunner.isStatisticsHasHadUserInteraction(subFrameOrigin) is false
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame-database.html b/LayoutTests/http/tests/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame-database.html
deleted file mode 100644 (file)
index a674d09..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<script src="/js-test-resources/js-test.js"></script>
-<script src="/js-test-resources/ui-helper.js"></script>
-<script src="resources/util.js"></script>
-<script>
-description("Tests that user interaction is always logged for the top document/frame.");
-jsTestIsAsync = true;
-testRunner.setUseITPDatabase(true);
-
-const topFrameOrigin = "http://127.0.0.1:8000";
-const subFrameOrigin = "http://localhost:8000";
-
-function activateElement(elementId) {
-    var element = document.getElementById(elementId);
-    var centerX = element.offsetLeft + element.offsetWidth / 2;
-    var centerY = element.offsetTop + element.offsetHeight / 2;
-    UIHelper.activateAt(centerX, centerY);
-}
-
-function finishTest() {
-    shouldBeTrue("testRunner.isStatisticsHasHadUserInteraction(topFrameOrigin)");
-    shouldBeFalse("testRunner.isStatisticsHasHadUserInteraction(subFrameOrigin)");
-    setEnableFeature(false, finishJSTest);
-}
-
-onload = function() {
-    setEnableFeature(true, function() {
-        if (testRunner) {
-            testRunner.setStatisticsNotifyPagesWhenDataRecordsWereScanned(true);
-            testRunner.installStatisticsDidScanDataRecordsCallback(finishTest);
-        }
-
-        shouldBe("document.location.origin", "topFrameOrigin");
-
-        if (testRunner) {
-            shouldBeFalse("testRunner.isStatisticsHasHadUserInteraction(topFrameOrigin)");
-            shouldBeFalse("testRunner.isStatisticsHasHadUserInteraction(subFrameOrigin)");
-
-            activateElement("testFrame");
-        }
-    });
-};
-</script>
-<iframe id="testFrame" src="http://localhost:8000/resourceLoadStatistics/resources/dummy.html"></iframe>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-database-expected.txt
deleted file mode 100644 (file)
index 5432bc8..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-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".
-
-
-PASS document.location.origin is topFrameOrigin
-PASS testRunner.isStatisticsHasHadUserInteraction(topFrameOrigin) is false
-PASS testRunner.isStatisticsHasHadUserInteraction(subFrameOrigin) is false
-PASS testRunner.isStatisticsHasHadUserInteraction(topFrameOrigin) is true
-PASS testRunner.isStatisticsHasHadUserInteraction(subFrameOrigin) is false
-PASS testRunner.isStatisticsHasHadUserInteraction(topFrameOrigin) is false
-PASS testRunner.isStatisticsHasHadUserInteraction(topFrameOrigin) is false
-PASS testRunner.isStatisticsHasHadUserInteraction(subFrameOrigin) is false
-PASS successfullyParsed is true
-
-TEST COMPLETE
-This is the test element
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-database.html b/LayoutTests/http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-database.html
deleted file mode 100644 (file)
index 6095242..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<script src="/js-test-resources/js-test.js"></script>
-<script src="/js-test-resources/ui-helper.js"></script>
-<script src="resources/util.js"></script>
-<script>
-    description("Tests that user interaction is not reported repeatedly within a short period of time.");
-    jsTestIsAsync = true;
-
-    const topFrameOrigin = "http://127.0.0.1:8000";
-    const subFrameOrigin = "http://localhost:8000";
-
-    function activateElement(elementId, callback) {
-        var element = document.getElementById(elementId);
-        var centerX = element.offsetLeft + element.offsetWidth / 2;
-        var centerY = element.offsetTop + element.offsetHeight / 2;
-        UIHelper.activateAt(centerX, centerY).then(
-            function() {
-                callback();
-            },
-            function() {
-                testFailed("Promise rejected.");
-                setEnableFeature(false, finishJSTest);
-            }
-        );
-    }
-
-    function firstInteraction() {
-        shouldBeFalse("testRunner.isStatisticsHasHadUserInteraction(topFrameOrigin)");
-        shouldBeFalse("testRunner.isStatisticsHasHadUserInteraction(subFrameOrigin)");
-        activateElement("testElement", secondInteraction);
-    }
-
-    function secondInteraction() {
-        shouldBeTrue("testRunner.isStatisticsHasHadUserInteraction(topFrameOrigin)");
-        shouldBeFalse("testRunner.isStatisticsHasHadUserInteraction(subFrameOrigin)");
-
-        if (testRunner) {
-            testRunner.setStatisticsHasHadUserInteraction(topFrameOrigin, false, function() {
-                shouldBeFalse("testRunner.isStatisticsHasHadUserInteraction(topFrameOrigin)");
-
-                activateElement("testElement", finishTest);
-            });
-        }
-    }
-
-    function finishTest() {
-        shouldBeFalse("testRunner.isStatisticsHasHadUserInteraction(topFrameOrigin)");
-        shouldBeFalse("testRunner.isStatisticsHasHadUserInteraction(subFrameOrigin)");
-        setEnableFeature(false, finishJSTest);
-    }
-
-    onload = function() {
-        testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, function() {
-            shouldBe("document.location.origin", "topFrameOrigin");
-
-            firstInteraction();
-        });
-    };
-</script>
-<div id="testElement">This is the test element</div>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal-database-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal-database-expected.txt
deleted file mode 100644 (file)
index bf28c99..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-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".
-
-
-PASS document.location.origin is topFrameOrigin
-PASS testRunner.isStatisticsHasHadUserInteraction(topFrameOrigin) is false
-PASS testRunner.isStatisticsHasHadUserInteraction(subFrameOrigin) is false
-PASS testRunner.isStatisticsHasHadUserInteraction(topFrameOrigin) is true
-PASS testRunner.isStatisticsHasHadUserInteraction(subFrameOrigin) is false
-PASS testRunner.isStatisticsHasHadUserInteraction(topFrameOrigin) is false
-PASS testRunner.isStatisticsHasHadUserInteraction(topFrameOrigin) is true
-PASS testRunner.isStatisticsHasHadUserInteraction(subFrameOrigin) is false
-PASS successfullyParsed is true
-
-TEST COMPLETE
-This is the test element
diff --git a/LayoutTests/http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal-database.html b/LayoutTests/http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal-database.html
deleted file mode 100644 (file)
index 2beb42f..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<script src="/js-test-resources/js-test.js"></script>
-<script src="/js-test-resources/ui-helper.js"></script>
-<script src="resources/util.js"></script>
-<script>
-    description("Tests that user interaction is reported after history removal since that means all statistics have been reset.");
-    jsTestIsAsync = true;
-
-    const topFrameOrigin = "http://127.0.0.1:8000";
-    const subFrameOrigin = "http://localhost:8000";
-
-    function activateElement(elementId, callback) {
-        var element = document.getElementById(elementId);
-        var centerX = element.offsetLeft + element.offsetWidth / 2;
-        var centerY = element.offsetTop + element.offsetHeight / 2;
-        UIHelper.activateAt(centerX, centerY).then(
-            function() {
-                callback();
-            },
-            function() {
-                testFailed("Promise rejected.");
-                setEnableFeature(false, finishJSTest);
-            }
-        );
-    }
-
-    function firstInteraction() {
-        shouldBeFalse("testRunner.isStatisticsHasHadUserInteraction(topFrameOrigin)");
-        shouldBeFalse("testRunner.isStatisticsHasHadUserInteraction(subFrameOrigin)");
-        activateElement("testElement", clearWebsiteData);
-    }
-
-    function clearWebsiteData() {
-        shouldBeTrue("testRunner.isStatisticsHasHadUserInteraction(topFrameOrigin)");
-        shouldBeFalse("testRunner.isStatisticsHasHadUserInteraction(subFrameOrigin)");
-
-        if (testRunner)
-            testRunner.statisticsClearThroughWebsiteDataRemoval(secondInteraction);
-    }
-
-    function secondInteraction() {
-        shouldBeFalse("testRunner.isStatisticsHasHadUserInteraction(topFrameOrigin)");
-        activateElement("testElement", finishTest);
-    }
-
-    function finishTest() {
-        shouldBeTrue("testRunner.isStatisticsHasHadUserInteraction(topFrameOrigin)");
-        shouldBeFalse("testRunner.isStatisticsHasHadUserInteraction(subFrameOrigin)");
-
-        setEnableFeature(false, finishJSTest);
-    }
-
-    onload = function() {
-        testRunner.setUseITPDatabase(true);
-        setEnableFeature(true, function() {
-            shouldBe("document.location.origin", "topFrameOrigin");
-
-            firstInteraction();
-        });
-    };
-</script>
-<div id="testElement">This is the test element</div>
-</body>
-</html>
index dd0c3b9..31bfa98 100644 (file)
@@ -989,8 +989,6 @@ http/tests/navigation/keyboard-events-during-provisional-navigation.html [ Skip
 http/tests/navigation/keyboard-events-during-provisional-subframe-navigation.html [ Skip ]
 http/tests/resourceLoadStatistics/prevalent-resource-handled-keydown.html [ Skip ]
 http/tests/resourceLoadStatistics/prevalent-resource-unhandled-keydown.html [ Skip ]
-http/tests/resourceLoadStatistics/prevalent-resource-handled-keydown-database.html [ Skip ]
-http/tests/resourceLoadStatistics/prevalent-resource-unhandled-keydown-database.html [ Skip ]
 media/audio-playback-volume-changes-with-restrictions-and-user-gestures.html [ Skip ]
 media/audio-playback-volume-changes-with-restrictions.html [ Skip ]
 media/picture-in-picture-interruption.html [ Skip ]
@@ -2781,9 +2779,6 @@ fast/canvas/webgl/readPixels-float.html [ Skip ]
 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 ]
-webkit.org/b/174120 http/tests/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame-database.html [ Skip ]
-http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-database.html [ Skip ]
-http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal-database.html [ Skip ]
 # Skipped in WK2 expectations because cookie partitioning is only available in macOS High Sierra and iOS 11.
 http/tests/resourceLoadStatistics/cookie-deletion.html [ Pass ]
 http/tests/resourceLoadStatistics/cookies-with-and-without-user-interaction.html [ Pass ]
index 3aa2d0a..87ffb0a 100644 (file)
@@ -1,3 +1,16 @@
+2019-09-25  Jonathan Bedard  <jbedard@apple.com>
+
+        Unreviewed, rolling out r250324.
+
+        Broke many mac wk2 layout tests
+
+        Reverted changeset:
+
+        "Enable LayoutTests using ResourceLoadStatistics SQLite
+        backend (195420)"
+        https://bugs.webkit.org/show_bug.cgi?id=195420
+        https://trac.webkit.org/changeset/250324
+
 2019-09-25  Antti Koivisto  <antti@apple.com>
 
         Rename LineLayoutInterface to LineLayoutTraversal
index 5224f1e..149866f 100644 (file)
@@ -64,7 +64,7 @@ public:
     bool returnsAtLeastOneResult(const String&);
     
     WEBCORE_EXPORT bool tableExists(const String&);
-    WEBCORE_EXPORT void clearAllTables();
+    void clearAllTables();
     WEBCORE_EXPORT int runVacuumCommand();
     int runIncrementalVacuumCommand();
     
@@ -125,7 +125,7 @@ public:
     //               file, but removes the empty pages only when PRAGMA INCREMANTAL_VACUUM
     //               is called.
     enum AutoVacuumPragma { AutoVacuumNone = 0, AutoVacuumFull = 1, AutoVacuumIncremental = 2 };
-    WEBCORE_EXPORT bool turnOnIncrementalAutoVacuum();
+    bool turnOnIncrementalAutoVacuum();
 
     WEBCORE_EXPORT void setCollationFunction(const String& collationName, WTF::Function<int(int, const void*, int, const void*)>&&);
     void removeCollationFunction(const String& collationName);
index 6fcc484..d8af97d 100644 (file)
@@ -1,3 +1,16 @@
+2019-09-25  Jonathan Bedard  <jbedard@apple.com>
+
+        Unreviewed, rolling out r250324.
+
+        Broke many mac wk2 layout tests
+
+        Reverted changeset:
+
+        "Enable LayoutTests using ResourceLoadStatistics SQLite
+        backend (195420)"
+        https://bugs.webkit.org/show_bug.cgi?id=195420
+        https://trac.webkit.org/changeset/250324
+
 2019-09-25  Youenn Fablet  <youenn@apple.com>
 
         Make IsNSURLSessionWebSocketEnabled an experimental flag
index f76e9d3..7e1f0ac 100644 (file)
@@ -160,7 +160,7 @@ constexpr auto createSubresourceUniqueRedirectsFrom = "CREATE TABLE SubresourceU
     "FOREIGN KEY(subresourceDomainID) REFERENCES ObservedDomains(domainID) ON DELETE CASCADE, "
     "FOREIGN KEY(fromDomainID) REFERENCES ObservedDomains(domainID) ON DELETE CASCADE);"_s;
     
-ResourceLoadStatisticsDatabaseStore::ResourceLoadStatisticsDatabaseStore(WebResourceLoadStatisticsStore& store, WorkQueue& workQueue, ShouldIncludeLocalhost shouldIncludeLocalhost, const String& storageDirectoryPath, PAL::SessionID sessionID)
+ResourceLoadStatisticsDatabaseStore::ResourceLoadStatisticsDatabaseStore(WebResourceLoadStatisticsStore& store, WorkQueue& workQueue, ShouldIncludeLocalhost shouldIncludeLocalhost, const String& storageDirectoryPath)
     : ResourceLoadStatisticsStore(store, workQueue, shouldIncludeLocalhost)
     , m_storageDirectoryPath(storageDirectoryPath + "/observations.db")
     , m_observedDomainCount(m_database, observedDomainCountQuery)
@@ -193,7 +193,6 @@ ResourceLoadStatisticsDatabaseStore::ResourceLoadStatisticsDatabaseStore(WebReso
     , m_updateGrandfatheredStatement(m_database, updateGrandfatheredQuery)
     , m_isGrandfatheredStatement(m_database, isGrandfatheredQuery)
     , m_findExpiredUserInteractionStatement(m_database, findExpiredUserInteractionQuery)
-    , m_sessionID(sessionID)
 {
     ASSERT(!RunLoop::isMain());
 
@@ -213,9 +212,6 @@ ResourceLoadStatisticsDatabaseStore::ResourceLoadStatisticsDatabaseStore(WebReso
             return;
         }
     }
-    
-    if (!m_database.turnOnIncrementalAutoVacuum())
-        RELEASE_LOG_ERROR(Network, "%p - ResourceLoadStatisticsDatabaseStore::turnOnIncrementalAutoVacuum failed, error message: %{public}s", this, m_database.lastErrorMsg());
 
     if (!prepareStatements()) {
         RELEASE_LOG_ERROR(Network, "%p - ResourceLoadStatisticsDatabaseStore::prepareStatements failed, error message: %{public}s, database path: %{public}s", this, m_database.lastErrorMsg(), m_storageDirectoryPath.utf8().data());
@@ -332,8 +328,7 @@ bool ResourceLoadStatisticsDatabaseStore::prepareStatements()
         || m_updateGrandfatheredStatement.prepare() != SQLITE_OK
         || m_isGrandfatheredStatement.prepare() != SQLITE_OK
         || m_findExpiredUserInteractionStatement.prepare() != SQLITE_OK
-        || m_topFrameLinkDecorationsFrom.prepare() != SQLITE_OK
-        || m_topFrameLinkDecorationsFromExists.prepare() != SQLITE_OK) {
+        ) {
         RELEASE_LOG_ERROR(Network, "%p - ResourceLoadStatisticsDatabaseStore::prepareStatements failed to prepare, error message: %{public}s", this, m_database.lastErrorMsg());
         ASSERT_NOT_REACHED();
         return false;
@@ -360,7 +355,7 @@ bool ResourceLoadStatisticsDatabaseStore::insertObservedDomain(const ResourceLoa
         || m_insertObservedDomainStatement.bindInt(8, loadStatistics.dataRecordsRemoved) != SQLITE_OK
         || m_insertObservedDomainStatement.bindInt(9, loadStatistics.timesAccessedAsFirstPartyDueToUserInteraction) != SQLITE_OK
         || m_insertObservedDomainStatement.bindInt(10, loadStatistics.timesAccessedAsFirstPartyDueToStorageAccessAPI) != SQLITE_OK) {
-        RELEASE_LOG_ERROR_IF_ALLOWED(m_sessionID, "%p - ResourceLoadStatisticsDatabaseStore::insertObservedDomain failed to bind, error message: %{public}s", this, m_database.lastErrorMsg());
+        RELEASE_LOG_ERROR(Network, "%p - ResourceLoadStatisticsDatabaseStore::insertObservedDomain failed to bind, error message: %{public}s", this, m_database.lastErrorMsg());
         ASSERT_NOT_REACHED();
         return false;
     }
@@ -377,26 +372,24 @@ bool ResourceLoadStatisticsDatabaseStore::insertObservedDomain(const ResourceLoa
     return true;
 }
 
-bool ResourceLoadStatisticsDatabaseStore::relationshipExists(WebCore::SQLiteStatement& statement, Optional<unsigned> firstDomainID, const RegistrableDomain& secondDomain) const
+bool ResourceLoadStatisticsDatabaseStore::relationshipExists(WebCore::SQLiteStatement& statement, unsigned firstDomainID, const RegistrableDomain& secondDomain) const
 {
-    if (!firstDomainID)
-        return false;
-    
     ASSERT(!RunLoop::isMain());
 
-    if (statement.bindInt(1, *firstDomainID) != SQLITE_OK
+    if (statement.bindInt(1, firstDomainID) != SQLITE_OK
         || statement.bindText(2, secondDomain.string()) != SQLITE_OK
         || statement.step() != SQLITE_ROW) {
-        RELEASE_LOG_ERROR_IF_ALLOWED(m_sessionID, "%p - ResourceLoadStatisticsDatabaseStore::m_insertDomainRelationshipStatement failed to bind, error message: %{public}s", this, m_database.lastErrorMsg());
+        RELEASE_LOG_ERROR(Network, "%p - ResourceLoadStatisticsDatabaseStore::m_insertDomainRelationshipStatement failed to bind, error message: %{public}s", this, m_database.lastErrorMsg());
         ASSERT_NOT_REACHED();
         return false;
     }
-    bool relationshipExists = !!statement.getColumnInt(0);
+    
+    bool relationShipExists = !!statement.getColumnInt(0);
 
     int resetResult = statement.reset();
     ASSERT_UNUSED(resetResult, resetResult == SQLITE_OK);
     
-    return relationshipExists;
+    return relationShipExists;
 }
 
 bool ResourceLoadStatisticsDatabaseStore::insertDomainRelationship(WebCore::SQLiteStatement& statement, unsigned domainID, const RegistrableDomain& topFrame)
@@ -406,7 +399,7 @@ bool ResourceLoadStatisticsDatabaseStore::insertDomainRelationship(WebCore::SQLi
     if (statement.bindInt(1, domainID) != SQLITE_OK
         || statement.bindText(2, topFrame.string()) != SQLITE_OK
         || statement.step() != SQLITE_DONE) {
-        RELEASE_LOG_ERROR_IF_ALLOWED(m_sessionID, "%p - ResourceLoadStatisticsDatabaseStore::m_insertDomainRelationshipStatement failed to bind, error message: %{public}s", this, m_database.lastErrorMsg());
+        RELEASE_LOG_ERROR(Network, "%p - ResourceLoadStatisticsDatabaseStore::m_insertDomainRelationshipStatement failed to bind, error message: %{public}s", this, m_database.lastErrorMsg());
         ASSERT_NOT_REACHED();
         return false;
     }
@@ -423,7 +416,7 @@ bool ResourceLoadStatisticsDatabaseStore::confirmDomainDoesNotExist(const Regist
     ASSERT(!RunLoop::isMain());
 
     if (m_domainIDFromStringStatement.bindText(1, domain.string()) != SQLITE_OK) {
-        RELEASE_LOG_ERROR_IF_ALLOWED(m_sessionID, "%p - ResourceLoadStatisticsDatabaseStore::confirmDomainDoesNotExist failed to bind, error message: %{public}s", this, m_database.lastErrorMsg());
+        RELEASE_LOG_ERROR(Network, "%p - ResourceLoadStatisticsDatabaseStore::confirmDomainDoesNotExist failed to bind, error message: %{public}s", this, m_database.lastErrorMsg());
         ASSERT_NOT_REACHED();
         return false;
     }
@@ -441,21 +434,17 @@ bool ResourceLoadStatisticsDatabaseStore::confirmDomainDoesNotExist(const Regist