Context Navigation

← Previous Changeset
Next Changeset →

Changeset 267750 in webkit

Timestamp:

Sep 29, 2020, 10:38:11 AM (6 years ago)

Author:

achristensen@apple.com

Message:

Remove plist-based ResourceLoadStatistics storage, which has been replaced by database-based storage
https://bugs.webkit.org/show_bug.cgi?id=217063

Reviewed by John Wilander.

Source/WebCore:

ResourceLoadStatistics was initially implemented using plists to store the persistent data on disk.
This caused some performance issues, so a sqlite database backend was implemented and transitioned to.
Now that the transition is complete, let's remove the old plist backend.

page/RuntimeEnabledFeatures.h:

(WebCore::RuntimeEnabledFeatures::setIsITPDatabaseEnabled): Deleted.
(WebCore::RuntimeEnabledFeatures::isITPDatabaseEnabled const): Deleted.

Source/WebKit:

NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h:
NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp:

(WebKit::ResourceLoadStatisticsMemoryStore::setPersistentStorage): Deleted.
(WebKit::ResourceLoadStatisticsMemoryStore::syncStorageIfNeeded): Deleted.
(WebKit::ResourceLoadStatisticsMemoryStore::syncStorageImmediately): Deleted.

NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.h:
NetworkProcess/Classifier/ResourceLoadStatisticsPersistentStorage.cpp: Removed.
NetworkProcess/Classifier/ResourceLoadStatisticsPersistentStorage.h: Removed.
NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp:

(WebKit::ResourceLoadStatisticsStore::processStatisticsAndDataRecords):
(WebKit::ResourceLoadStatisticsStore::grandfatherExistingWebsiteData):

NetworkProcess/Classifier/ResourceLoadStatisticsStore.h:
NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:

(WebKit::WebResourceLoadStatisticsStore::WebResourceLoadStatisticsStore):
(WebKit::WebResourceLoadStatisticsStore::~WebResourceLoadStatisticsStore):
(WebKit::WebResourceLoadStatisticsStore::didDestroyNetworkSession):
(WebKit::WebResourceLoadStatisticsStore::populateMemoryStoreFromDisk):
(WebKit::WebResourceLoadStatisticsStore::scheduleClearInMemoryAndPersistent):
(WebKit::WebResourceLoadStatisticsStore::flushAndDestroyPersistentStore): Deleted.

NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h:
NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::didClose):
(WebKit::NetworkProcess::initializeNetworkProcess):
(WebKit::NetworkProcess::setUseITPDatabase): Deleted.

NetworkProcess/NetworkProcess.h:

(WebKit::NetworkProcess::isITPDatabaseEnabled const): Deleted.

NetworkProcess/NetworkProcess.messages.in:
NetworkProcess/NetworkProcessCreationParameters.cpp:

(WebKit::NetworkProcessCreationParameters::encode const):
(WebKit::NetworkProcessCreationParameters::decode):

NetworkProcess/NetworkProcessCreationParameters.h:
NetworkProcess/NetworkSession.cpp:

(WebKit::NetworkSession::destroyResourceLoadStatistics):
(WebKit::NetworkSession::flushAndDestroyPersistentStore): Deleted.

NetworkProcess/NetworkSession.h:
Shared/WebPreferencesInternal.yaml:
Sources.txt:
SourcesCocoa.txt:
UIProcess/API/C/WKPreferences.cpp:

(WKPreferencesSetIsITPDatabaseEnabled): Deleted.
(WKPreferencesGetIsITPDatabaseEnabled): Deleted.

UIProcess/API/C/WKPreferencesRef.h:
UIProcess/API/C/WKWebsiteDataStoreRef.cpp:

(WKWebsiteDataStoreStatisticsResetToConsistentState):
(WKWebsiteDataStoreSetUseITPDatabase): Deleted.

UIProcess/API/C/WKWebsiteDataStoreRef.h:
UIProcess/API/Cocoa/WKPreferences.mm:

(-[WKPreferences _isITPDatabaseEnabled]): Deleted.

UIProcess/API/Cocoa/WKPreferencesPrivate.h:
UIProcess/API/Cocoa/WKWebsiteDataStore.mm:

(-[WKWebsiteDataStore _setUseITPDatabase:completionHandler:]): Deleted.

UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h:
UIProcess/Cocoa/WebProcessPoolCocoa.mm:

(WebKit::WebProcessPool::platformInitializeNetworkProcess):

UIProcess/Network/NetworkProcessProxy.cpp:

(WebKit::NetworkProcessProxy::setUseITPDatabase): Deleted.

UIProcess/Network/NetworkProcessProxy.h:
UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::WebsiteDataStore::setUseITPDatabase): Deleted.

UIProcess/WebsiteData/WebsiteDataStore.h:
UIProcess/ios/ResourceLoadStatisticsPersistentStorageIOS.mm: Removed.
WebKit.xcodeproj/project.pbxproj:

Source/WTF:

Scripts/Preferences/WebPreferencesInternal.yaml:

Tools:

These three tests API tests have been removed:

ResourceLoadStatistics.ChildProcessesNotLaunched
ResourceLoadStatistics.GrandfatherCallback
ResourceLoadStatistics.ShouldNotGrandfatherOnStartup

Each of those tests has a corresponding test that ends with "Database" that tests the database backend,
so the only test coverage loss was of the code that was removed.

TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadStatistics.mm:

(ensureITPFileIsCreated):
(TEST):
(isITPDatabaseEnabled): Deleted.

WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
WebKitTestRunner/InjectedBundle/TestRunner.cpp:

(WTR::TestRunner::setUseITPDatabase): Deleted.

WebKitTestRunner/InjectedBundle/TestRunner.h:
WebKitTestRunner/TestController.cpp:

(WTR::TestController::setUseITPDatabase): Deleted.

WebKitTestRunner/TestController.h:
WebKitTestRunner/TestInvocation.cpp:

(WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):

LayoutTests:

http/tests/resourceLoadStatistics/add-blocking-to-redirect-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/add-blocking-to-redirect-database.html: Removed.
http/tests/resourceLoadStatistics/aggregate-sorted-data-no-storage-access-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/aggregate-sorted-data-no-storage-access-database.html: Removed.
http/tests/resourceLoadStatistics/aggregate-sorted-data-no-storage-access-expected.txt:
http/tests/resourceLoadStatistics/blocking-in-web-worker-script-import-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/blocking-in-web-worker-script-import-database.html: Removed.
http/tests/resourceLoadStatistics/cap-cache-max-age-for-prevalent-resource-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/cap-cache-max-age-for-prevalent-resource-database.html: Removed.
http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-database.html: Removed.
http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-decoration-same-site-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-decoration-same-site-database.html: Removed.
http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-fragment-from-prevalent-resource-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-fragment-from-prevalent-resource-database.html: Removed.
http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-and-fragment-from-prevalent-resource-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-and-fragment-from-prevalent-resource-database.html: Removed.
http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-from-prevalent-resource-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-from-prevalent-resource-database.html: Removed.
http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-without-link-decoration-from-prevalent-resource-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-without-link-decoration-from-prevalent-resource-database.html: Removed.
http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-database.html: Removed.
http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-database.html: Removed.
http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-database.html: Removed.
http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-database.html: Removed.
http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-database.html: Removed.
http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-database.html: Removed.
http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-redirect-collusion-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-redirect-collusion-database.html: Removed.
http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-redirect-to-prevalent-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-redirect-to-prevalent-database.html: Removed.
http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-database.html: Removed.
http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-database.html: Removed.
http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-collusion-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-collusion-database.html: Removed.
http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-to-prevalent-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-to-prevalent-database.html: Removed.
http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-unique-redirects-to-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-unique-redirects-to-database.html: Removed.
http/tests/resourceLoadStatistics/classify-as-very-prevalent-based-on-mixed-statistics-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/classify-as-very-prevalent-based-on-mixed-statistics-database.html: Removed.
http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-database.html: Removed.
http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-database.html: Removed.
http/tests/resourceLoadStatistics/cookie-deletion-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/cookie-deletion-database.html: Removed.
http/tests/resourceLoadStatistics/cookies-with-and-without-user-interaction-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/cookies-with-and-without-user-interaction-database.html: Removed.
http/tests/resourceLoadStatistics/count-third-party-script-import-in-worker-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/count-third-party-script-import-in-worker-database.html: Removed.
http/tests/resourceLoadStatistics/count-third-party-script-import-in-worker-expected.txt:
http/tests/resourceLoadStatistics/count-third-party-script-loads-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/count-third-party-script-loads-database.html: Removed.
http/tests/resourceLoadStatistics/count-third-party-script-loads-expected.txt:
http/tests/resourceLoadStatistics/delete-script-accessible-cookies-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/delete-script-accessible-cookies-database.html: Removed.
http/tests/resourceLoadStatistics/do-not-block-top-level-navigation-redirect-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/do-not-block-top-level-navigation-redirect-database.html: Removed.
http/tests/resourceLoadStatistics/do-not-capture-statistics-for-simple-top-navigations-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/do-not-capture-statistics-for-simple-top-navigations-database.html: Removed.
http/tests/resourceLoadStatistics/do-not-remove-blocking-in-redirect-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/do-not-remove-blocking-in-redirect-database.html: Removed.
http/tests/resourceLoadStatistics/do-not-switch-session-on-navigation-to-prevalent-without-interaction-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/do-not-switch-session-on-navigation-to-prevalent-without-interaction-database.php: Removed.
http/tests/resourceLoadStatistics/dont-count-third-party-image-as-third-party-script-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/dont-count-third-party-image-as-third-party-script-database.html: Removed.
http/tests/resourceLoadStatistics/dont-count-third-party-image-as-third-party-script-expected.txt:
http/tests/resourceLoadStatistics/downgrade-document-referrer-nested-third-party-iframe.html:
http/tests/resourceLoadStatistics/downgrade-document-referrer-third-party-iframe.html:
http/tests/resourceLoadStatistics/downgraded-referrer-for-navigation-with-link-query-from-prevalent-resource-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/downgraded-referrer-for-navigation-with-link-query-from-prevalent-resource-database.html: Removed.
http/tests/resourceLoadStatistics/enable-debug-mode-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/enable-debug-mode-database.html: Removed.
http/tests/resourceLoadStatistics/enforce-samesite-strict-based-on-top-frame-unique-redirects-to-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/enforce-samesite-strict-based-on-top-frame-unique-redirects-to-database.html: Removed.
http/tests/resourceLoadStatistics/exemptDomains/app-bound-domains-exempt-from-website-data-deletion-database.html:
http/tests/resourceLoadStatistics/grandfathering-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/grandfathering-database.html: Removed.
http/tests/resourceLoadStatistics/leave-empty-document-referrer-alone-third-party-iframe.html:
http/tests/resourceLoadStatistics/log-cross-site-load-with-link-decoration-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/log-cross-site-load-with-link-decoration-database.html: Removed.
http/tests/resourceLoadStatistics/log-cross-site-load-with-link-decoration-expected.txt:
http/tests/resourceLoadStatistics/log-delayed-client-side-redirects-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/log-delayed-client-side-redirects-database.html: Removed.
http/tests/resourceLoadStatistics/log-delayed-client-side-redirects-expected.txt:
http/tests/resourceLoadStatistics/many-inserts-only-insert-once.html:
http/tests/resourceLoadStatistics/merge-statistic-does-not-overwrite-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/merge-statistic-does-not-overwrite-database.html: Removed.
http/tests/resourceLoadStatistics/merge-statistic-does-overwrite-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/merge-statistic-does-overwrite-database.html: Removed.
http/tests/resourceLoadStatistics/merge-statistic-does-partially-overwrite-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/merge-statistic-does-partially-overwrite-database.html: Removed.
http/tests/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-database.html: Removed.
http/tests/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-database.html: Removed.
http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context-database.html: Removed.
http/tests/resourceLoadStatistics/non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html: Removed.
http/tests/resourceLoadStatistics/non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html: Removed.
http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html: Removed.
http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html: Removed.
http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html: Removed.
http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html: Removed.
http/tests/resourceLoadStatistics/operating-dates-all-but-cookies-removed-statistics-with-no-user-interaction-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/operating-dates-all-but-cookies-removed-statistics-with-no-user-interaction-database.html: Removed.
http/tests/resourceLoadStatistics/operating-dates-all-but-cookies-removed-statistics-with-no-user-interaction-expected.txt:
http/tests/resourceLoadStatistics/operating-dates-all-website-data-removed-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/operating-dates-all-website-data-removed-database.html: Removed.
http/tests/resourceLoadStatistics/ping-to-prevalent-resource-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/ping-to-prevalent-resource-database.html: Removed.
http/tests/resourceLoadStatistics/prevalent-resource-handled-keydown-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/prevalent-resource-handled-keydown-database.html: Removed.
http/tests/resourceLoadStatistics/prevalent-resource-unhandled-keydown-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/prevalent-resource-unhandled-keydown-database.html: Removed.
http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-database.html: Removed.
http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-database.html: Removed.
http/tests/resourceLoadStatistics/prevalent-resource-without-user-interaction-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/prevalent-resource-without-user-interaction-database.html: Removed.
http/tests/resourceLoadStatistics/prune-statistics-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/prune-statistics-database.html: Removed.
http/tests/resourceLoadStatistics/remove-website-data-for-origin-deletes-link-decoration-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/remove-website-data-for-origin-deletes-link-decoration-database.html: Removed.
http/tests/resourceLoadStatistics/remove-website-data-for-origin-deletes-link-decoration-expected.txt:
http/tests/resourceLoadStatistics/remove-website-data-for-origin-deletes-mixed-statistics-entries-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/remove-website-data-for-origin-deletes-mixed-statistics-entries-database.html: Removed.
http/tests/resourceLoadStatistics/remove-website-data-for-origin-deletes-third-party-script-loads-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/remove-website-data-for-origin-deletes-third-party-script-loads-database.html: Removed.
http/tests/resourceLoadStatistics/remove-website-data-for-origin-deletes-third-party-script-loads-expected.txt:
http/tests/resourceLoadStatistics/sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html: Removed.
http/tests/resourceLoadStatistics/sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html: Removed.
http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html: Removed.
http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html: Removed.
http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html: Removed.
http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html: Removed.
http/tests/resourceLoadStatistics/set-custom-prevalent-resource-in-debug-mode-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/set-custom-prevalent-resource-in-debug-mode-database.html: Removed.
http/tests/resourceLoadStatistics/standalone-web-application-exempt-from-website-data-deletion-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/standalone-web-application-exempt-from-website-data-deletion-database.html: Removed.
http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-redirects-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-redirects-database.html: Removed.
http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-requests-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-requests-database.html: Removed.
http/tests/resourceLoadStatistics/switch-session-on-navigation-to-prevalent-with-interaction-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/switch-session-on-navigation-to-prevalent-with-interaction-database.php: Removed.
http/tests/resourceLoadStatistics/telemetry-generation-advanced-functionality-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/telemetry-generation-advanced-functionality-database.html: Removed.
http/tests/resourceLoadStatistics/telemetry-generation-basic-functionality-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/telemetry-generation-basic-functionality-database.html: Removed.
http/tests/resourceLoadStatistics/telemetry-generation-expected.txt:
http/tests/resourceLoadStatistics/third-party-cookie-blocking-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/third-party-cookie-blocking-database.html: Removed.
http/tests/resourceLoadStatistics/third-party-cookie-blocking-ephemeral-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/third-party-cookie-blocking-ephemeral-database.html: Removed.
http/tests/resourceLoadStatistics/third-party-cookie-blocking-on-sites-without-user-interaction-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/third-party-cookie-blocking-on-sites-without-user-interaction-database.html: Removed.
http/tests/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame-database.html: Removed.
http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-database.html: Removed.
http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal-database.html: Removed.
http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration-database.html: Removed.
http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration-expected.txt:
http/tests/resourceLoadStatistics/website-data-removal-for-site-with-user-interaction-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/website-data-removal-for-site-with-user-interaction-database.html: Removed.
http/tests/resourceLoadStatistics/website-data-removal-for-site-without-user-interaction-database-expected.txt: Removed.
http/tests/resourceLoadStatistics/website-data-removal-for-site-without-user-interaction-database.html: Removed.
http/tests/storageAccess/aggregate-sorted-data-with-storage-access-database-expected.txt: Removed.
http/tests/storageAccess/aggregate-sorted-data-with-storage-access-database.html: Removed.
http/tests/storageAccess/aggregate-sorted-data-with-storage-access-expected.txt:
http/tests/storageAccess/deny-due-to-no-interaction-under-general-third-party-cookie-blocking-database-expected.txt: Removed.
http/tests/storageAccess/deny-due-to-no-interaction-under-general-third-party-cookie-blocking-database.html: Removed.
http/tests/storageAccess/deny-storage-access-under-opener-database-expected.txt: Removed.
http/tests/storageAccess/deny-storage-access-under-opener-database.html: Removed.
http/tests/storageAccess/deny-storage-access-under-opener-if-auto-dismiss-database-expected.txt: Removed.
http/tests/storageAccess/deny-storage-access-under-opener-if-auto-dismiss-database.html: Removed.
http/tests/storageAccess/deny-with-prompt-does-not-preserve-gesture-database-expected.txt: Removed.
http/tests/storageAccess/deny-with-prompt-does-not-preserve-gesture-database.html: Removed.
http/tests/storageAccess/deny-without-prompt-preserves-gesture-database-expected.txt: Removed.
http/tests/storageAccess/deny-without-prompt-preserves-gesture-database.html: Removed.
http/tests/storageAccess/grant-storage-access-under-opener-at-popup-user-gesture-database-expected.txt: Removed.
http/tests/storageAccess/grant-storage-access-under-opener-at-popup-user-gesture-database.html: Removed.
http/tests/storageAccess/grant-with-prompt-preserves-gesture-database-expected.txt: Removed.
http/tests/storageAccess/grant-with-prompt-preserves-gesture-database.html: Removed.
http/tests/storageAccess/grant-with-prompt-under-general-third-party-cookie-blocking-database-expected.txt: Removed.
http/tests/storageAccess/grant-with-prompt-under-general-third-party-cookie-blocking-database.html: Removed.
http/tests/storageAccess/has-storage-access-crash-database-expected.txt: Removed.
http/tests/storageAccess/has-storage-access-crash-database.html: Removed.
http/tests/storageAccess/has-storage-access-false-by-default-database-expected.txt: Removed.
http/tests/storageAccess/has-storage-access-false-by-default-database.html: Removed.
http/tests/storageAccess/has-storage-access-false-by-default-ephemeral-database-expected.txt: Removed.
http/tests/storageAccess/has-storage-access-false-by-default-ephemeral-database.html: Removed.
http/tests/storageAccess/has-storage-access-from-prevalent-domain-with-user-interaction-database-expected.txt: Removed.
http/tests/storageAccess/has-storage-access-from-prevalent-domain-with-user-interaction-database.html: Removed.
http/tests/storageAccess/has-storage-access-true-if-third-party-has-cookies-database-expected.txt: Removed.
http/tests/storageAccess/has-storage-access-true-if-third-party-has-cookies-database.html: Removed.
http/tests/storageAccess/has-storage-access-true-if-third-party-has-cookies-ephemeral-database-expected.txt: Removed.
http/tests/storageAccess/has-storage-access-true-if-third-party-has-cookies-ephemeral-database.html: Removed.
http/tests/storageAccess/has-storage-access-under-general-third-party-cookie-blocking-with-cookie-database-expected.txt: Removed.
http/tests/storageAccess/has-storage-access-under-general-third-party-cookie-blocking-with-cookie-database.html: Removed.
http/tests/storageAccess/has-storage-access-under-general-third-party-cookie-blocking-without-cookie-database-expected.txt: Removed.
http/tests/storageAccess/has-storage-access-under-general-third-party-cookie-blocking-without-cookie-database.html: Removed.
http/tests/storageAccess/remove-requesting-iframe-database-expected.txt: Removed.
http/tests/storageAccess/remove-requesting-iframe-database.html: Removed.
http/tests/storageAccess/request-and-grant-access-cross-origin-non-sandboxed-iframe-database-expected.txt: Removed.
http/tests/storageAccess/request-and-grant-access-cross-origin-non-sandboxed-iframe-database.html: Removed.
http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-database-expected.txt: Removed.
http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-database.html: Removed.
http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-user-interaction-and-access-from-right-frame-database-expected.txt: Removed.
http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-user-interaction-and-access-from-right-frame-database.html: Removed.
http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-user-interaction-but-access-from-wrong-frame-database-expected.txt: Removed.
http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-user-interaction-but-access-from-wrong-frame-database.html: Removed.
http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-user-interaction-database-expected.txt: Removed.
http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-user-interaction-database.html: Removed.
http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-without-user-interaction-database-expected.txt: Removed.
http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-without-user-interaction-database.html: Removed.
http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-nested-iframe-database-expected.txt: Removed.
http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-nested-iframe-database.html: Removed.
http/tests/storageAccess/request-and-grant-access-then-detach-should-not-have-access-database-expected.txt: Removed.
http/tests/storageAccess/request-and-grant-access-then-detach-should-not-have-access-database.html: Removed.
http/tests/storageAccess/request-and-grant-access-then-navigate-cross-site-should-not-have-access-database-expected.txt: Removed.
http/tests/storageAccess/request-and-grant-access-then-navigate-cross-site-should-not-have-access-database.html: Removed.
http/tests/storageAccess/request-and-grant-access-then-navigate-same-site-should-have-access-database-expected.txt: Removed.
http/tests/storageAccess/request-and-grant-access-then-navigate-same-site-should-have-access-database.html: Removed.
http/tests/storageAccess/request-storage-access-crash-database-expected.txt: Removed.
http/tests/storageAccess/request-storage-access-crash-database.html: Removed.
http/tests/storageAccess/request-storage-access-cross-origin-sandboxed-iframe-with-unique-origin-database-expected.txt: Removed.
http/tests/storageAccess/request-storage-access-cross-origin-sandboxed-iframe-with-unique-origin-database.html: Removed.
http/tests/storageAccess/request-storage-access-cross-origin-sandboxed-iframe-without-allow-token-database-expected.txt: Removed.
http/tests/storageAccess/request-storage-access-cross-origin-sandboxed-iframe-without-allow-token-database.html: Removed.
http/tests/storageAccess/request-storage-access-cross-origin-sandboxed-iframe-without-user-gesture-database-expected.txt: Removed.
http/tests/storageAccess/request-storage-access-cross-origin-sandboxed-iframe-without-user-gesture-database.html: Removed.
http/tests/storageAccess/request-storage-access-same-origin-iframe-database-expected.txt: Removed.
http/tests/storageAccess/request-storage-access-same-origin-iframe-database.html: Removed.
http/tests/storageAccess/request-storage-access-same-origin-sandboxed-iframe-database-expected.txt: Removed.
http/tests/storageAccess/request-storage-access-same-origin-sandboxed-iframe-database.html: Removed.
http/tests/storageAccess/request-storage-access-same-origin-sandboxed-iframe-without-allow-token-database-expected.txt: Removed.
http/tests/storageAccess/request-storage-access-same-origin-sandboxed-iframe-without-allow-token-database.html: Removed.
http/tests/storageAccess/request-storage-access-top-frame-database-expected.txt: Removed.
http/tests/storageAccess/request-storage-access-top-frame-database.html: Removed.
http/tests/webAPIStatistics/canvas-read-and-write-data-collection-expected.txt:
http/tests/webAPIStatistics/font-load-data-collection-expected.txt:
http/tests/webAPIStatistics/navigator-functions-accessed-data-collection-expected.txt:
http/tests/webAPIStatistics/screen-functions-accessed-data-collection-expected.txt:
platform/gtk/TestExpectations:
platform/ios-wk2/TestExpectations:
platform/ios/TestExpectations:
platform/mac-wk2/TestExpectations:
platform/wk2/TestExpectations:
platform/wpe/TestExpectations:

Location:

trunk

Files:

: 251 deleted
: 73 edited

Legend:

: Unmodified
: Added
: Removed

trunk/LayoutTests/ChangeLog

-              r267744
+              r267750
+-09-29  Alex Christensen  <achristensen@webkit.org>
+        Remove plist-based ResourceLoadStatistics storage, which has been replaced by database-based storage
+        https://bugs.webkit.org/show_bug.cgi?id=217063
+        Reviewed by John Wilander.
+        * http/tests/resourceLoadStatistics/add-blocking-to-redirect-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/add-blocking-to-redirect-database.html: Removed.
+        * http/tests/resourceLoadStatistics/aggregate-sorted-data-no-storage-access-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/aggregate-sorted-data-no-storage-access-database.html: Removed.
+        * http/tests/resourceLoadStatistics/aggregate-sorted-data-no-storage-access-expected.txt:
+        * http/tests/resourceLoadStatistics/blocking-in-web-worker-script-import-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/blocking-in-web-worker-script-import-database.html: Removed.
+        * http/tests/resourceLoadStatistics/cap-cache-max-age-for-prevalent-resource-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/cap-cache-max-age-for-prevalent-resource-database.html: Removed.
+        * http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-database.html: Removed.
+        * http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-decoration-same-site-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-decoration-same-site-database.html: Removed.
+        * http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-fragment-from-prevalent-resource-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-fragment-from-prevalent-resource-database.html: Removed.
+        * http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-and-fragment-from-prevalent-resource-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-and-fragment-from-prevalent-resource-database.html: Removed.
+        * http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-from-prevalent-resource-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-with-link-query-from-prevalent-resource-database.html: Removed.
+        * http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-without-link-decoration-from-prevalent-resource-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/capped-lifetime-for-cookie-set-in-js-without-link-decoration-from-prevalent-resource-database.html: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-mixed-statistics-database.html: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins-database.html: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-under-top-frame-origins-database.html: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-subresource-unique-redirects-to-database.html: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-mixed-statistics-database.html: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-sub-frame-under-top-frame-origins-database.html: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-redirect-collusion-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-redirect-collusion-database.html: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-redirect-to-prevalent-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-redirect-to-prevalent-database.html: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-under-top-frame-origins-database.html: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-subresource-unique-redirects-to-database.html: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-collusion-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-collusion-database.html: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-to-prevalent-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-redirect-to-prevalent-database.html: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-unique-redirects-to-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-prevalent-based-on-top-frame-unique-redirects-to-database.html: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-very-prevalent-based-on-mixed-statistics-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/classify-as-very-prevalent-based-on-mixed-statistics-database.html: Removed.
+        * http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-database.html: Removed.
+        * http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-database.html: Removed.
+        * http/tests/resourceLoadStatistics/cookie-deletion-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/cookie-deletion-database.html: Removed.
+        * http/tests/resourceLoadStatistics/cookies-with-and-without-user-interaction-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/cookies-with-and-without-user-interaction-database.html: Removed.
+        * http/tests/resourceLoadStatistics/count-third-party-script-import-in-worker-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/count-third-party-script-import-in-worker-database.html: Removed.
+        * http/tests/resourceLoadStatistics/count-third-party-script-import-in-worker-expected.txt:
+        * http/tests/resourceLoadStatistics/count-third-party-script-loads-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/count-third-party-script-loads-database.html: Removed.
+        * http/tests/resourceLoadStatistics/count-third-party-script-loads-expected.txt:
+        * http/tests/resourceLoadStatistics/delete-script-accessible-cookies-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/delete-script-accessible-cookies-database.html: Removed.
+        * http/tests/resourceLoadStatistics/do-not-block-top-level-navigation-redirect-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/do-not-block-top-level-navigation-redirect-database.html: Removed.
+        * http/tests/resourceLoadStatistics/do-not-capture-statistics-for-simple-top-navigations-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/do-not-capture-statistics-for-simple-top-navigations-database.html: Removed.
+        * http/tests/resourceLoadStatistics/do-not-remove-blocking-in-redirect-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/do-not-remove-blocking-in-redirect-database.html: Removed.
+        * http/tests/resourceLoadStatistics/do-not-switch-session-on-navigation-to-prevalent-without-interaction-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/do-not-switch-session-on-navigation-to-prevalent-without-interaction-database.php: Removed.
+        * http/tests/resourceLoadStatistics/dont-count-third-party-image-as-third-party-script-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/dont-count-third-party-image-as-third-party-script-database.html: Removed.
+        * http/tests/resourceLoadStatistics/dont-count-third-party-image-as-third-party-script-expected.txt:
+        * http/tests/resourceLoadStatistics/downgrade-document-referrer-nested-third-party-iframe.html:
+        * http/tests/resourceLoadStatistics/downgrade-document-referrer-third-party-iframe.html:
+        * http/tests/resourceLoadStatistics/downgraded-referrer-for-navigation-with-link-query-from-prevalent-resource-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/downgraded-referrer-for-navigation-with-link-query-from-prevalent-resource-database.html: Removed.
+        * http/tests/resourceLoadStatistics/enable-debug-mode-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/enable-debug-mode-database.html: Removed.
+        * http/tests/resourceLoadStatistics/enforce-samesite-strict-based-on-top-frame-unique-redirects-to-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/enforce-samesite-strict-based-on-top-frame-unique-redirects-to-database.html: Removed.
+        * http/tests/resourceLoadStatistics/exemptDomains/app-bound-domains-exempt-from-website-data-deletion-database.html:
+        * http/tests/resourceLoadStatistics/grandfathering-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/grandfathering-database.html: Removed.
+        * http/tests/resourceLoadStatistics/leave-empty-document-referrer-alone-third-party-iframe.html:
+        * http/tests/resourceLoadStatistics/log-cross-site-load-with-link-decoration-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/log-cross-site-load-with-link-decoration-database.html: Removed.
+        * http/tests/resourceLoadStatistics/log-cross-site-load-with-link-decoration-expected.txt:
+        * http/tests/resourceLoadStatistics/log-delayed-client-side-redirects-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/log-delayed-client-side-redirects-database.html: Removed.
+        * http/tests/resourceLoadStatistics/log-delayed-client-side-redirects-expected.txt:
+        * http/tests/resourceLoadStatistics/many-inserts-only-insert-once.html:
+        * http/tests/resourceLoadStatistics/merge-statistic-does-not-overwrite-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/merge-statistic-does-not-overwrite-database.html: Removed.
+        * http/tests/resourceLoadStatistics/merge-statistic-does-overwrite-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/merge-statistic-does-overwrite-database.html: Removed.
+        * http/tests/resourceLoadStatistics/merge-statistic-does-partially-overwrite-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/merge-statistic-does-partially-overwrite-database.html: Removed.
+        * http/tests/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/non-prevalent-resource-with-user-interaction-database.html: Removed.
+        * http/tests/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/non-prevalent-resource-without-user-interaction-database.html: Removed.
+        * http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/non-prevalent-resources-can-access-cookies-in-a-third-party-context-database.html: Removed.
+        * http/tests/resourceLoadStatistics/non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html: Removed.
+        * http/tests/resourceLoadStatistics/non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html: Removed.
+        * http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html: Removed.
+        * http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html: Removed.
+        * http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html: Removed.
+        * http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/non-sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html: Removed.
+        * http/tests/resourceLoadStatistics/operating-dates-all-but-cookies-removed-statistics-with-no-user-interaction-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/operating-dates-all-but-cookies-removed-statistics-with-no-user-interaction-database.html: Removed.
+        * http/tests/resourceLoadStatistics/operating-dates-all-but-cookies-removed-statistics-with-no-user-interaction-expected.txt:
+        * http/tests/resourceLoadStatistics/operating-dates-all-website-data-removed-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/operating-dates-all-website-data-removed-database.html: Removed.
+        * http/tests/resourceLoadStatistics/ping-to-prevalent-resource-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/ping-to-prevalent-resource-database.html: Removed.
+        * http/tests/resourceLoadStatistics/prevalent-resource-handled-keydown-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/prevalent-resource-handled-keydown-database.html: Removed.
+        * http/tests/resourceLoadStatistics/prevalent-resource-unhandled-keydown-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/prevalent-resource-unhandled-keydown-database.html: Removed.
+        * http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-database.html: Removed.
+        * http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/prevalent-resource-with-user-interaction-timeout-database.html: Removed.
+        * http/tests/resourceLoadStatistics/prevalent-resource-without-user-interaction-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/prevalent-resource-without-user-interaction-database.html: Removed.
+        * http/tests/resourceLoadStatistics/prune-statistics-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/prune-statistics-database.html: Removed.
+        * http/tests/resourceLoadStatistics/remove-website-data-for-origin-deletes-link-decoration-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/remove-website-data-for-origin-deletes-link-decoration-database.html: Removed.
+        * http/tests/resourceLoadStatistics/remove-website-data-for-origin-deletes-link-decoration-expected.txt:
+        * http/tests/resourceLoadStatistics/remove-website-data-for-origin-deletes-mixed-statistics-entries-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/remove-website-data-for-origin-deletes-mixed-statistics-entries-database.html: Removed.
+        * http/tests/resourceLoadStatistics/remove-website-data-for-origin-deletes-third-party-script-loads-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/remove-website-data-for-origin-deletes-third-party-script-loads-database.html: Removed.
+        * http/tests/resourceLoadStatistics/remove-website-data-for-origin-deletes-third-party-script-loads-expected.txt:
+        * http/tests/resourceLoadStatistics/sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html: Removed.
+        * http/tests/resourceLoadStatistics/sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html: Removed.
+        * http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html: Removed.
+        * http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-non-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html: Removed.
+        * http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-ip-to-localhost-to-ip-database.html: Removed.
+        * http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/sandboxed-nesting-iframe-with-sandboxed-iframe-redirect-localhost-to-ip-to-localhost-database.html: Removed.
+        * http/tests/resourceLoadStatistics/set-custom-prevalent-resource-in-debug-mode-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/set-custom-prevalent-resource-in-debug-mode-database.html: Removed.
+        * http/tests/resourceLoadStatistics/standalone-web-application-exempt-from-website-data-deletion-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/standalone-web-application-exempt-from-website-data-deletion-database.html: Removed.
+        * http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-redirects-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-redirects-database.html: Removed.
+        * http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-requests-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/strip-referrer-to-origin-for-prevalent-subresource-requests-database.html: Removed.
+        * http/tests/resourceLoadStatistics/switch-session-on-navigation-to-prevalent-with-interaction-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/switch-session-on-navigation-to-prevalent-with-interaction-database.php: Removed.
+        * http/tests/resourceLoadStatistics/telemetry-generation-advanced-functionality-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/telemetry-generation-advanced-functionality-database.html: Removed.
+        * http/tests/resourceLoadStatistics/telemetry-generation-basic-functionality-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/telemetry-generation-basic-functionality-database.html: Removed.
+        * http/tests/resourceLoadStatistics/telemetry-generation-expected.txt:
+        * http/tests/resourceLoadStatistics/third-party-cookie-blocking-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/third-party-cookie-blocking-database.html: Removed.
+        * http/tests/resourceLoadStatistics/third-party-cookie-blocking-ephemeral-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/third-party-cookie-blocking-ephemeral-database.html: Removed.
+        * http/tests/resourceLoadStatistics/third-party-cookie-blocking-on-sites-without-user-interaction-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/third-party-cookie-blocking-on-sites-without-user-interaction-database.html: Removed.
+        * http/tests/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/user-interaction-in-cross-origin-sub-frame-database.html: Removed.
+        * http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-database.html: Removed.
+        * http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal-database.html: Removed.
+        * http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration-database.html: Removed.
+        * http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration-expected.txt:
+        * http/tests/resourceLoadStatistics/website-data-removal-for-site-with-user-interaction-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/website-data-removal-for-site-with-user-interaction-database.html: Removed.
+        * http/tests/resourceLoadStatistics/website-data-removal-for-site-without-user-interaction-database-expected.txt: Removed.
+        * http/tests/resourceLoadStatistics/website-data-removal-for-site-without-user-interaction-database.html: Removed.
+        * http/tests/storageAccess/aggregate-sorted-data-with-storage-access-database-expected.txt: Removed.
+        * http/tests/storageAccess/aggregate-sorted-data-with-storage-access-database.html: Removed.
+        * http/tests/storageAccess/aggregate-sorted-data-with-storage-access-expected.txt:
+        * http/tests/storageAccess/deny-due-to-no-interaction-under-general-third-party-cookie-blocking-database-expected.txt: Removed.
+        * http/tests/storageAccess/deny-due-to-no-interaction-under-general-third-party-cookie-blocking-database.html: Removed.
+        * http/tests/storageAccess/deny-storage-access-under-opener-database-expected.txt: Removed.
+        * http/tests/storageAccess/deny-storage-access-under-opener-database.html: Removed.
+        * http/tests/storageAccess/deny-storage-access-under-opener-if-auto-dismiss-database-expected.txt: Removed.
+        * http/tests/storageAccess/deny-storage-access-under-opener-if-auto-dismiss-database.html: Removed.
+        * http/tests/storageAccess/deny-with-prompt-does-not-preserve-gesture-database-expected.txt: Removed.
+        * http/tests/storageAccess/deny-with-prompt-does-not-preserve-gesture-database.html: Removed.
+        * http/tests/storageAccess/deny-without-prompt-preserves-gesture-database-expected.txt: Removed.
+        * http/tests/storageAccess/deny-without-prompt-preserves-gesture-database.html: Removed.
+        * http/tests/storageAccess/grant-storage-access-under-opener-at-popup-user-gesture-database-expected.txt: Removed.
+        * http/tests/storageAccess/grant-storage-access-under-opener-at-popup-user-gesture-database.html: Removed.
+        * http/tests/storageAccess/grant-with-prompt-preserves-gesture-database-expected.txt: Removed.
+        * http/tests/storageAccess/grant-with-prompt-preserves-gesture-database.html: Removed.
+        * http/tests/storageAccess/grant-with-prompt-under-general-third-party-cookie-blocking-database-expected.txt: Removed.
+        * http/tests/storageAccess/grant-with-prompt-under-general-third-party-cookie-blocking-database.html: Removed.
+        * http/tests/storageAccess/has-storage-access-crash-database-expected.txt: Removed.
+        * http/tests/storageAccess/has-storage-access-crash-database.html: Removed.
+        * http/tests/storageAccess/has-storage-access-false-by-default-database-expected.txt: Removed.
+        * http/tests/storageAccess/has-storage-access-false-by-default-database.html: Removed.
+        * http/tests/storageAccess/has-storage-access-false-by-default-ephemeral-database-expected.txt: Removed.
+        * http/tests/storageAccess/has-storage-access-false-by-default-ephemeral-database.html: Removed.
+        * http/tests/storageAccess/has-storage-access-from-prevalent-domain-with-user-interaction-database-expected.txt: Removed.
+        * http/tests/storageAccess/has-storage-access-from-prevalent-domain-with-user-interaction-database.html: Removed.
+        * http/tests/storageAccess/has-storage-access-true-if-third-party-has-cookies-database-expected.txt: Removed.
+        * http/tests/storageAccess/has-storage-access-true-if-third-party-has-cookies-database.html: Removed.
+        * http/tests/storageAccess/has-storage-access-true-if-third-party-has-cookies-ephemeral-database-expected.txt: Removed.
+        * http/tests/storageAccess/has-storage-access-true-if-third-party-has-cookies-ephemeral-database.html: Removed.
+        * http/tests/storageAccess/has-storage-access-under-general-third-party-cookie-blocking-with-cookie-database-expected.txt: Removed.
+        * http/tests/storageAccess/has-storage-access-under-general-third-party-cookie-blocking-with-cookie-database.html: Removed.
+        * http/tests/storageAccess/has-storage-access-under-general-third-party-cookie-blocking-without-cookie-database-expected.txt: Removed.
+        * http/tests/storageAccess/has-storage-access-under-general-third-party-cookie-blocking-without-cookie-database.html: Removed.
+        * http/tests/storageAccess/remove-requesting-iframe-database-expected.txt: Removed.
+        * http/tests/storageAccess/remove-requesting-iframe-database.html: Removed.
+        * http/tests/storageAccess/request-and-grant-access-cross-origin-non-sandboxed-iframe-database-expected.txt: Removed.
+        * http/tests/storageAccess/request-and-grant-access-cross-origin-non-sandboxed-iframe-database.html: Removed.
+        * http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-database-expected.txt: Removed.
+        * http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-database.html: Removed.
+        * http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-user-interaction-and-access-from-right-frame-database-expected.txt: Removed.
+        * http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-user-interaction-and-access-from-right-frame-database.html: Removed.
+        * http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-user-interaction-but-access-from-wrong-frame-database-expected.txt: Removed.
+        * http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-user-interaction-but-access-from-wrong-frame-database.html: Removed.
+        * http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-user-interaction-database-expected.txt: Removed.
+        * http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-user-interaction-database.html: Removed.
+        * http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-without-user-interaction-database-expected.txt: Removed.
+        * http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-without-user-interaction-database.html: Removed.
+        * http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-nested-iframe-database-expected.txt: Removed.
+        * http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-nested-iframe-database.html: Removed.
+        * http/tests/storageAccess/request-and-grant-access-then-detach-should-not-have-access-database-expected.txt: Removed.
+        * http/tests/storageAccess/request-and-grant-access-then-detach-should-not-have-access-database.html: Removed.
+        * http/tests/storageAccess/request-and-grant-access-then-navigate-cross-site-should-not-have-access-database-expected.txt: Removed.
+        * http/tests/storageAccess/request-and-grant-access-then-navigate-cross-site-should-not-have-access-database.html: Removed.
+        * http/tests/storageAccess/request-and-grant-access-then-navigate-same-site-should-have-access-database-expected.txt: Removed.
+        * http/tests/storageAccess/request-and-grant-access-then-navigate-same-site-should-have-access-database.html: Removed.
+        * http/tests/storageAccess/request-storage-access-crash-database-expected.txt: Removed.
+        * http/tests/storageAccess/request-storage-access-crash-database.html: Removed.
+        * http/tests/storageAccess/request-storage-access-cross-origin-sandboxed-iframe-with-unique-origin-database-expected.txt: Removed.
+        * http/tests/storageAccess/request-storage-access-cross-origin-sandboxed-iframe-with-unique-origin-database.html: Removed.
+        * http/tests/storageAccess/request-storage-access-cross-origin-sandboxed-iframe-without-allow-token-database-expected.txt: Removed.
+        * http/tests/storageAccess/request-storage-access-cross-origin-sandboxed-iframe-without-allow-token-database.html: Removed.
+        * http/tests/storageAccess/request-storage-access-cross-origin-sandboxed-iframe-without-user-gesture-database-expected.txt: Removed.
+        * http/tests/storageAccess/request-storage-access-cross-origin-sandboxed-iframe-without-user-gesture-database.html: Removed.
+        * http/tests/storageAccess/request-storage-access-same-origin-iframe-database-expected.txt: Removed.
+        * http/tests/storageAccess/request-storage-access-same-origin-iframe-database.html: Removed.
+        * http/tests/storageAccess/request-storage-access-same-origin-sandboxed-iframe-database-expected.txt: Removed.
+        * http/tests/storageAccess/request-storage-access-same-origin-sandboxed-iframe-database.html: Removed.
+        * http/tests/storageAccess/request-storage-access-same-origin-sandboxed-iframe-without-allow-token-database-expected.txt: Removed.
+        * http/tests/storageAccess/request-storage-access-same-origin-sandboxed-iframe-without-allow-token-database.html: Removed.
+        * http/tests/storageAccess/request-storage-access-top-frame-database-expected.txt: Removed.
+        * http/tests/storageAccess/request-storage-access-top-frame-database.html: Removed.
+        * http/tests/webAPIStatistics/canvas-read-and-write-data-collection-expected.txt:
+        * http/tests/webAPIStatistics/font-load-data-collection-expected.txt:
+        * http/tests/webAPIStatistics/navigator-functions-accessed-data-collection-expected.txt:
+        * http/tests/webAPIStatistics/screen-functions-accessed-data-collection-expected.txt:
+        * platform/gtk/TestExpectations:
+        * platform/ios-wk2/TestExpectations:
+        * platform/ios/TestExpectations:
+        * platform/mac-wk2/TestExpectations:
+        * platform/wk2/TestExpectations:
+        * platform/wpe/TestExpectations:
 -09-29  Chris Dumez  <cdumez@apple.com>

trunk/LayoutTests/http/tests/resourceLoadStatistics/aggregate-sorted-data-no-storage-access-expected.txt

-              r263474
+              r267750
     mostRecentUserInteraction: -1
     grandfathered: No
     gotLinkDecorationFromPrevalentResource: No
     subframeUnderTopFrameDomains:
+    IsScheduledForAllButCookieDataRemoval: No
+    SubframeUnderTopFrameDomains:
         topframe1
     subresourceUniqueRedirectsTo:
+    SubresourceUniqueRedirectsTo:
         topframe2
     isPrevalentResource: Yes
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No
 Registrable domain: subframe2
     hadUserInteraction: No
     mostRecentUserInteraction: -1
     grandfathered: No
     gotLinkDecorationFromPrevalentResource: No
     subframeUnderTopFrameDomains:
+    IsScheduledForAllButCookieDataRemoval: No
+    SubframeUnderTopFrameDomains:
         topframe1
     isPrevalentResource: Yes
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No
 Registrable domain: subframe3
     hadUserInteraction: No
     mostRecentUserInteraction: -1
     grandfathered: No
     gotLinkDecorationFromPrevalentResource: No
     subframeUnderTopFrameDomains:
+    IsScheduledForAllButCookieDataRemoval: No
+    SubframeUnderTopFrameDomains:
         topframe1
         topframe4
     subresourceUnderTopFrameDomains:
+    SubresourceUnderTopFrameDomains:
         topframe3
     subresourceUniqueRedirectsTo:
+    SubresourceUniqueRedirectsTo:
         topframe2
     isPrevalentResource: Yes
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No
 Registrable domain: topframe1
     hadUserInteraction: No
     mostRecentUserInteraction: -1
     grandfathered: No
     gotLinkDecorationFromPrevalentResource: No
+    IsScheduledForAllButCookieDataRemoval: No
     isPrevalentResource: No
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No
 Registrable domain: topframe2
     hadUserInteraction: No
     mostRecentUserInteraction: -1
     grandfathered: No
     gotLinkDecorationFromPrevalentResource: No
+    IsScheduledForAllButCookieDataRemoval: No
     isPrevalentResource: No
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No
 Registrable domain: topframe3
     hadUserInteraction: No
     mostRecentUserInteraction: -1
     grandfathered: No
     gotLinkDecorationFromPrevalentResource: No
+    IsScheduledForAllButCookieDataRemoval: No
     isPrevalentResource: No
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No
 Registrable domain: topframe4
     hadUserInteraction: No
     mostRecentUserInteraction: -1
     grandfathered: No
     gotLinkDecorationFromPrevalentResource: No
+    IsScheduledForAllButCookieDataRemoval: No
     isPrevalentResource: No
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No
 ITP Data:
 Third Party Registrable Domain: subframe3
     {{ Has been granted storage access under topframe1: 0; Has been seen under topframe1 in the last 24 hours: 0 },{ Has been granted storage access under topframe4: 0; Has been seen under topframe4 in the last 24 hours: 0 },{ Has been granted storage access under topframe3: 0; Has been seen under topframe3 in the last 24 hours: 0 },{ Has been granted storage access under topframe2: 0; Has been seen under topframe2 in the last 24 hours: 0 },}
+    {{ Has been granted storage access under topframe1: 0; Has been seen under topframe1 in the last 24 hours: 1 },{ Has been granted storage access under topframe4: 0; Has been seen under topframe4 in the last 24 hours: 1 },{ Has been granted storage access under topframe3: 0; Has been seen under topframe3 in the last 24 hours: 1 },{ Has been granted storage access under topframe2: 0; Has been seen under topframe2 in the last 24 hours: 1 },}
 Third Party Registrable Domain: subframe1
     {{ Has been granted storage access under topframe1: 0; Has been seen under topframe1 in the last 24 hours: 0 },{ Has been granted storage access under topframe2: 0; Has been seen under topframe2 in the last 24 hours: 0 },}
+    {{ Has been granted storage access under topframe1: 0; Has been seen under topframe1 in the last 24 hours: 1 },{ Has been granted storage access under topframe2: 0; Has been seen under topframe2 in the last 24 hours: 1 },}
 Third Party Registrable Domain: subframe2
     {{ Has been granted storage access under topframe1: 0; Has been seen under topframe1 in the last 24 hours: 0 },}
+    {{ Has been granted storage access under topframe1: 0; Has been seen under topframe1 in the last 24 hours: 1 },}

trunk/LayoutTests/http/tests/resourceLoadStatistics/count-third-party-script-import-in-worker-expected.txt

-              r263474
+              r267750
     mostRecentUserInteraction: -1
     grandfathered: No
+    gotLinkDecorationFromPrevalentResource: No
+    topFrameLoadedThirdPartyScripts:
+    TopFrameLoadedThirdPartyScripts:
         localhost
+    IsScheduledForAllButCookieDataRemoval: No
     isPrevalentResource: No
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No
 Registrable domain: localhost
     hadUserInteraction: No
     mostRecentUserInteraction: -1
     grandfathered: No
     gotLinkDecorationFromPrevalentResource: No
     subresourceUnderTopFrameDomains:
+    IsScheduledForAllButCookieDataRemoval: No
+    SubresourceUnderTopFrameDomains:
 .0.0.1
     isPrevalentResource: No
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No

trunk/LayoutTests/http/tests/resourceLoadStatistics/count-third-party-script-loads-expected.txt

-              r263474
+              r267750
     mostRecentUserInteraction: -1
     grandfathered: No
+    gotLinkDecorationFromPrevalentResource: No
+    topFrameLoadedThirdPartyScripts:
+    TopFrameLoadedThirdPartyScripts:
         localhost
+    IsScheduledForAllButCookieDataRemoval: No
     isPrevalentResource: No
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No
 Registrable domain: localhost
     hadUserInteraction: No
     mostRecentUserInteraction: -1
     grandfathered: No
     gotLinkDecorationFromPrevalentResource: No
     subresourceUnderTopFrameDomains:
+    IsScheduledForAllButCookieDataRemoval: No
+    SubresourceUnderTopFrameDomains:
 .0.0.1
     isPrevalentResource: No
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No

trunk/LayoutTests/http/tests/resourceLoadStatistics/dont-count-third-party-image-as-third-party-script-expected.txt

-              r263474
+              r267750
 Resource load statistics:
+Registrable domain: 127.0.0.1
+    hadUserInteraction: No
+    mostRecentUserInteraction: -1
+    grandfathered: No
+    IsScheduledForAllButCookieDataRemoval: No
+    isPrevalentResource: No
+    isVeryPrevalentResource: No
+    dataRecordsRemoved: 0
 Registrable domain: localhost
     hadUserInteraction: No
     mostRecentUserInteraction: -1
     grandfathered: No
     gotLinkDecorationFromPrevalentResource: No
     subresourceUnderTopFrameDomains:
+    IsScheduledForAllButCookieDataRemoval: No
+    SubresourceUnderTopFrameDomains:
 .0.0.1
     isPrevalentResource: No
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No

trunk/LayoutTests/http/tests/resourceLoadStatistics/downgrade-document-referrer-nested-third-party-iframe.html

r250676	r267750
25	25	function runTest() {
26	26	if (testRunner) {
27		~~testRunner.setUseITPDatabase(true);~~
28	27	setEnableFeature(true, function() {
29	28	let iframeElement = document.createElement("iframe");

trunk/LayoutTests/http/tests/resourceLoadStatistics/downgrade-document-referrer-third-party-iframe.html

r250676	r267750
25	25	function runTest() {
26	26	if (testRunner) {
27		~~testRunner.setUseITPDatabase(true);~~
28	27	setEnableFeature(true, function() {
29	28	let iframeElement = document.createElement("iframe");

trunk/LayoutTests/http/tests/resourceLoadStatistics/exemptDomains/app-bound-domains-exempt-from-website-data-deletion-database.html

r261242	r267750
13	13	testRunner.waitUntilDone();
14	14	testRunner.dumpAsText();
15		~~testRunner.setUseITPDatabase(true);~~
16	15
17	16	const httpOnlyCookieName = "http-only-cookie";

trunk/LayoutTests/http/tests/resourceLoadStatistics/leave-empty-document-referrer-alone-third-party-iframe.html

r250676	r267750
25	25	function runTest() {
26	26	if (testRunner) {
27		~~testRunner.setUseITPDatabase(true);~~
28	27	setEnableFeature(true, function() {
29	28	let iframeElement = document.createElement("iframe");

trunk/LayoutTests/http/tests/resourceLoadStatistics/log-cross-site-load-with-link-decoration-expected.txt

-              r263474
+              r267750
     mostRecentUserInteraction: -1
     grandfathered: No
     topFrameUniqueRedirectsTo:
+    TopFrameUniqueRedirectsTo:
         localhost
     gotLinkDecorationFromPrevalentResource: No
+    IsScheduledForAllButCookieDataRemoval: No
     isPrevalentResource: Yes
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No
 Registrable domain: localhost
     hadUserInteraction: No
     mostRecentUserInteraction: -1
     grandfathered: No
     topFrameUniqueRedirectsFrom:
+    TopFrameUniqueRedirectsFrom:
 .0.0.1
     topFrameLinkDecorationsFrom:
+    TopFrameLinkDecorationsFrom:
 .0.0.1
     gotLinkDecorationFromPrevalentResource: Yes
+    IsScheduledForAllButCookieDataRemoval: Yes
     isPrevalentResource: No
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No

trunk/LayoutTests/http/tests/resourceLoadStatistics/log-delayed-client-side-redirects-expected.txt

-              r263474
+              r267750
     mostRecentUserInteraction: -1
     grandfathered: No
     topFrameUniqueRedirectsTo:
+    TopFrameUniqueRedirectsTo:
         localhost
     gotLinkDecorationFromPrevalentResource: No
+    IsScheduledForAllButCookieDataRemoval: No
     isPrevalentResource: No
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No
 Registrable domain: localhost
     hadUserInteraction: No
     mostRecentUserInteraction: -1
     grandfathered: No
     topFrameUniqueRedirectsFrom:
+    TopFrameUniqueRedirectsFrom:
 .0.0.1
     gotLinkDecorationFromPrevalentResource: No
+    IsScheduledForAllButCookieDataRemoval: No
     isPrevalentResource: No
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No

trunk/LayoutTests/http/tests/resourceLoadStatistics/many-inserts-only-insert-once.html

r264609	r267750
9	9	<body>
10	10	<script>
11		~~testRunner.setUseITPDatabase(true);~~
12	11	description("Tests that many inserts into the database only result in one row.");
13	12	jsTestIsAsync = true;

trunk/LayoutTests/http/tests/resourceLoadStatistics/remove-website-data-for-origin-deletes-link-decoration-expected.txt

-              r263474
+              r267750
     mostRecentUserInteraction: -1
     grandfathered: No
     gotLinkDecorationFromPrevalentResource: No
+    IsScheduledForAllButCookieDataRemoval: No
     isPrevalentResource: Yes
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No

trunk/LayoutTests/http/tests/resourceLoadStatistics/remove-website-data-for-origin-deletes-third-party-script-loads-expected.txt

-              r263474
+              r267750
     mostRecentUserInteraction: -1
     grandfathered: No
     gotLinkDecorationFromPrevalentResource: No
+    IsScheduledForAllButCookieDataRemoval: No
     isPrevalentResource: No
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No

trunk/LayoutTests/http/tests/resourceLoadStatistics/telemetry-generation-expected.txt

-              r225640
+              r267750
 PASS Hosts classified as prevalent resources.
+PASS testResult.totalPrevalentResources is 0
+PASS testResult.totalPrevalentResourcesWithUserInteraction is 0
+PASS testResult.top3SubframeUnderTopFrameOrigins is 0
+FAIL testResult.totalPrevalentResources should be 0 (of type number). Was undefined (of type undefined).
+FAIL testResult.totalPrevalentResourcesWithUserInteraction should be 0 (of type number). Was undefined (of type undefined).
+FAIL testResult.top3SubframeUnderTopFrameOrigins should be 0 (of type number). Was undefined (of type undefined).
 PASS Hosts classified as prevalent resources.
+PASS testResult.totalPrevalentResources is 4
+PASS testResult.totalPrevalentResourcesWithUserInteraction is 1
+PASS testResult.top3SubframeUnderTopFrameOrigins is 4
+FAIL testResult.totalPrevalentResources should be 4 (of type number). Was undefined (of type undefined).
+FAIL testResult.totalPrevalentResourcesWithUserInteraction should be 1 (of type number). Was undefined (of type undefined).
+FAIL testResult.top3SubframeUnderTopFrameOrigins should be 4 (of type number). Was undefined (of type undefined).
 PASS successfullyParsed is true
+Some tests failed.
 TEST COMPLETE

trunk/LayoutTests/http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration-expected.txt

-              r263474
+              r267750
     mostRecentUserInteraction: -1
     grandfathered: No
     topFrameLinkDecorationsFrom:
+    TopFrameLinkDecorationsFrom:
         localhost
     gotLinkDecorationFromPrevalentResource: No
+    IsScheduledForAllButCookieDataRemoval: No
     isPrevalentResource: No
     isVeryPrevalentResource: No
     dataRecordsRemoved: 1
-    canvasReadData: No
 Registrable domain: localhost
     hadUserInteraction: No
     mostRecentUserInteraction: -1
     grandfathered: No
     gotLinkDecorationFromPrevalentResource: No
+    IsScheduledForAllButCookieDataRemoval: No
     isPrevalentResource: Yes
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No

trunk/LayoutTests/http/tests/storageAccess/aggregate-sorted-data-with-storage-access-expected.txt

-              r263474
+              r267750
     mostRecentUserInteraction: within 24 hours
     grandfathered: No
     topFrameUniqueRedirectsTo:
+    TopFrameUniqueRedirectsTo:
         localhost
     topFrameUniqueRedirectsFrom:
+    TopFrameUniqueRedirectsFrom:
         localhost
     gotLinkDecorationFromPrevalentResource: No
+    IsScheduledForAllButCookieDataRemoval: No
     isPrevalentResource: Yes
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No
 Registrable domain: localhost
     hadUserInteraction: Yes
     mostRecentUserInteraction: within 24 hours
     grandfathered: No
     storageAccessUnderTopFrameDomains:
+    StorageAccessUnderTopFrameDomains:
 .0.0.1
     topFrameUniqueRedirectsTo:
+    TopFrameUniqueRedirectsTo:
 .0.0.1
     topFrameUniqueRedirectsFrom:
+    TopFrameUniqueRedirectsFrom:
 .0.0.1
     gotLinkDecorationFromPrevalentResource: No
     subframeUnderTopFrameDomains:
+    IsScheduledForAllButCookieDataRemoval: No
+    SubframeUnderTopFrameDomains:
 .0.0.1
     isPrevalentResource: Yes
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    canvasReadData: No
 ITP Data:
 Third Party Registrable Domain: localhost
     {{ Has been granted storage access under 127.0.0.1: 1; Has been seen under 127.0.0.1 in the last 24 hours: 0 },}
+    {{ Has been granted storage access under 127.0.0.1: 1; Has been seen under 127.0.0.1 in the last 24 hours: 1 },}

trunk/LayoutTests/http/tests/webAPIStatistics/canvas-read-and-write-data-collection-expected.txt

-              r263474
+              r267750
     mostRecentUserInteraction: -1
     grandfathered: No
     gotLinkDecorationFromPrevalentResource: No
+    IsScheduledForAllButCookieDataRemoval: No
     isPrevalentResource: No
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    fontsSuccessfullyLoaded:
-        Helvetica
-        Times
-    topFrameRegistrableDomainsWhichAccessedWebAPIs:
-.0.0.1
-    canvasTextWritten:
-        suspicious invisible text
-    canvasReadData: Yes

trunk/LayoutTests/http/tests/webAPIStatistics/font-load-data-collection-expected.txt

-              r263474
+              r267750
     mostRecentUserInteraction: -1
     grandfathered: No
     gotLinkDecorationFromPrevalentResource: No
+    IsScheduledForAllButCookieDataRemoval: No
     isPrevalentResource: No
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    fontsFailedToLoad:
-        Fransiscan
-        Andale
-        notARealFont
-    fontsSuccessfullyLoaded:
-        Times
-    topFrameRegistrableDomainsWhichAccessedWebAPIs:
-.0.0.1
-    canvasReadData: No

trunk/LayoutTests/http/tests/webAPIStatistics/navigator-functions-accessed-data-collection-expected.txt

-              r263474
+              r267750
     mostRecentUserInteraction: -1
     grandfathered: No
     gotLinkDecorationFromPrevalentResource: No
+    IsScheduledForAllButCookieDataRemoval: No
     isPrevalentResource: No
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    fontsSuccessfullyLoaded:
-        Times
-    topFrameRegistrableDomainsWhichAccessedWebAPIs:
-.0.0.1
-    navigatorFunctionsAccessed:
-        appVersion
-        userAgent
-        plugins
-        mimeTypes
-        cookieEnabled
-        javaEnabled
-    canvasReadData: No

trunk/LayoutTests/http/tests/webAPIStatistics/screen-functions-accessed-data-collection-expected.txt

-              r263474
+              r267750
     mostRecentUserInteraction: -1
     grandfathered: No
     gotLinkDecorationFromPrevalentResource: No
+    IsScheduledForAllButCookieDataRemoval: No
     isPrevalentResource: No
     isVeryPrevalentResource: No
     dataRecordsRemoved: 0
-    fontsSuccessfullyLoaded:
-        Times
-    topFrameRegistrableDomainsWhichAccessedWebAPIs:
-.0.0.1
-    screenFunctionsAccessed:
-        height
-        width
-        colorDepth
-        pixelDepth
-        availLeft
-        availTop
-        availHeight
-        availWidth
-    canvasReadData: No

trunk/LayoutTests/platform/glib/TestExpectations

r267558	r267750
1002	1002	http/tests/storageAccess/ [ Pass ]
1003	1003	http/tests/storageAccess/deny-with-prompt-does-not-preserve-gesture.html [ Skip ]
1004		~~http/tests/storageAccess/deny-with-prompt-does-not-preserve-gesture-database.html [ Skip ]~~
1005		~~webkit.org/b/208400 http/tests/storageAccess/has-storage-access-true-if-third-party-has-cookies-ephemeral-database.html [ Failure ]~~
1006	1004	webkit.org/b/208400 http/tests/storageAccess/has-storage-access-true-if-third-party-has-cookies-ephemeral.html [ Failure ]
1007	1005

trunk/LayoutTests/platform/gtk/TestExpectations

-              r267531
+              r267750
 webkit.org/b/210226 imported/w3c/web-platform-tests/IndexedDB/interleaved-cursors-small.html [ Failure ]
-webkit.org/b/210487 http/tests/resourceLoadStatistics/switch-session-on-navigation-to-prevalent-with-interaction-database.php [ Failure ]
 webkit.org/b/210487 http/tests/resourceLoadStatistics/switch-session-on-navigation-to-prevalent-with-interaction.php [ Failure ]
-webkit.org/b/210796 http/tests/resourceLoadStatistics/standalone-web-application-exempt-from-website-data-deletion-database.html [ Failure ]
 webkit.org/b/210796 http/tests/resourceLoadStatistics/standalone-web-application-exempt-from-website-data-deletion.html [ Failure ]
 …
 webkit.org/b/212202 compositing/fixed-with-main-thread-scrolling.html [ Skip ]
-webkit.org/b/210796 http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-database.html [ Timeout Pass ]
 webkit.org/b/210796 http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html [ Timeout Pass ]
-webkit.org/b/210796 http/tests/resourceLoadStatistics/operating-dates-all-website-data-removed-database.html [ Timeout Pass ]
 webkit.org/b/210796 http/tests/resourceLoadStatistics/operating-dates-all-website-data-removed.html [ Timeout Pass ]
-webkit.org/b/210796 http/tests/resourceLoadStatistics/ping-to-prevalent-resource-database.html [ Timeout Pass ]
 webkit.org/b/210796 http/tests/resourceLoadStatistics/ping-to-prevalent-resource.html [ Timeout Pass ]
-webkit.org/b/210796 http/tests/resourceLoadStatistics/prevalent-resource-handled-keydown-database.html [ Timeout Pass ]
-webkit.org/b/210796 http/tests/resourceLoadStatistics/telemetry-generation-advanced-functionality-database.html [ Failure Pass ]
 webkit.org/b/210796 http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time.html [ Failure Pass ]
 webkit.org/b/210796 http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration.html [ Timeout Pass ]
-webkit.org/b/210796 http/tests/resourceLoadStatistics/website-data-removal-for-site-with-user-interaction-database.html [ Timeout Pass ]
 webkit.org/b/210796 http/tests/resourceLoadStatistics/website-data-removal-for-site-with-user-interaction.html [ Timeout Pass ]

trunk/LayoutTests/platform/ios-wk2/TestExpectations

-              r267724
+              r267750
 webkit.org/b/208739 http/tests/resourceLoadStatistics/third-party-cookie-blocking-ephemeral.html [ Pass Timeout ]
-webkit.org/b/208739 http/tests/resourceLoadStatistics/third-party-cookie-blocking-ephemeral-database.html [ Pass Timeout ]
 webkit.org/b/208890 imported/w3c/web-platform-tests/IndexedDB/idbobjectstore_openKeyCursor.htm [ Pass Failure ]
 …
 webkit.org/b/210046 [ Release ] storage/indexeddb/value-cursor-cycle.html [ Pass Failure ]
 webkit.org/b/211928 http/tests/resourceLoadStatistics/standalone-web-application-exempt-from-website-data-deletion-database.html [ Pass Timeout ]
+webkit.org/b/211928 http/tests/resourceLoadStatistics/standalone-web-application-exempt-from-website-data-deletion.html [ Pass Timeout ]
 webkit.org/b/212219 media/track/track-cue-missing.html [ Pass Failure ]

trunk/LayoutTests/platform/ios/TestExpectations

-              r267314
+              r267750
 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-handled-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 ]
 …
 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/set-all-cookies-to-same-site-strict.html [ Pass ]
 http/tests/resourceLoadStatistics/enforce-samesite-strict-based-on-top-frame-unique-redirects-to.html [ Pass ]
-http/tests/resourceLoadStatistics/enforce-samesite-strict-based-on-top-frame-unique-redirects-to-database.html [ Pass ]
 http/tests/storageAccess/deny-storage-access-under-opener.html [ Pass ]
 …
 http/tests/storageAccess/has-storage-access-false-by-default-ephemeral.html [ Pass ]
 http/tests/storageAccess/has-storage-access-true-if-third-party-has-cookies.html [ Pass Timeout ]
-http/tests/storageAccess/has-storage-access-true-if-third-party-has-cookies-database.html [ Pass Timeout ]
-http/tests/storageAccess/deny-storage-access-under-opener-database.html [ Pass ]
-http/tests/storageAccess/deny-storage-access-under-opener-if-auto-dismiss-database.html [ Pass ]
-http/tests/storageAccess/has-storage-access-false-by-default-database.html [ Pass ]
-http/tests/storageAccess/has-storage-access-false-by-default-ephemeral-database.html [ Pass ]
 # Enable again when fixing https://bugs.webkit.org/show_bug.cgi?id=208400.
 http/tests/storageAccess/has-storage-access-true-if-third-party-has-cookies-ephemeral.html [ Skip ]
-http/tests/storageAccess/has-storage-access-true-if-third-party-has-cookies-ephemeral-database.html [ Skip ]
 # Skipped in general expectations since they only work on iOS and Mac, WK2.
 …
 webkit.org/b/177617 http/tests/storageAccess/request-storage-access-top-frame.html [ Pass Timeout ]
-http/tests/storageAccess/request-storage-access-top-frame-database.html [ Pass Timeout ]
 webkit.org/b/177547 imported/w3c/web-platform-tests/fetch/security/dangling-markup-mitigation-data-url.tentative.sub.html [ Pass Failure ]

trunk/LayoutTests/platform/mac-wk2/TestExpectations

-              r267607
+              r267750
 http/tests/resourceLoadStatistics/user-interaction-reported-after-website-data-removal.html [ Pass ]
 http/tests/storageAccess/ [ Pass ]
 http/tests/storageAccess/request-and-grant-access-then-navigate-cross-site-should-not-have-access-database.html [ Pass Timeout ]
+http/tests/storageAccess/request-and-grant-access-then-navigate-cross-site-should-not-have-access.html [ Pass Timeout ]
 http/tests/storageAccess/deny-with-prompt-does-not-preserve-gesture.html [ Skip ]
-http/tests/storageAccess/deny-with-prompt-does-not-preserve-gesture-database.html [ Skip ]
 # Enable again when fixing https://bugs.webkit.org/show_bug.cgi?id=208400.
-http/tests/storageAccess/has-storage-access-true-if-third-party-has-cookies-ephemeral-database.html [ Skip ]
 http/tests/storageAccess/has-storage-access-true-if-third-party-has-cookies-ephemeral.html [ Skip ]
 # As of https://trac.webkit.org/changeset/227762 the timestampResolution is just 5 seconds which makes this test flaky
 http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time.html [ Skip ]
-http/tests/resourceLoadStatistics/user-interaction-only-reported-once-within-short-period-of-time-database.html [ Skip ]
 webkit.org/b/173861 [ Release ] http/tests/webrtc/filtering-ice-candidate-same-origin-frame.html [ Pass Timeout ]
 …
 [ Catalina+ ] http/tests/resourceLoadStatistics/set-all-cookies-to-same-site-strict.html [ Pass ]
 [ Catalina+ ] http/tests/resourceLoadStatistics/enforce-samesite-strict-based-on-top-frame-unique-redirects-to.html [ Pass ]
-[ Catalina+ ] http/tests/resourceLoadStatistics/enforce-samesite-strict-based-on-top-frame-unique-redirects-to-database.html [ Pass ]
 # The CNAME and cookie transform SPIs are only available in macOS Big Sur and above.
 …
 webkit.org/b/187391 accessibility/mac/async-increment-decrement-action.html [ Skip ]
 http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-user-interaction-but-access-from-wrong-frame-database.html [ Pass Timeout ]
+http/tests/storageAccess/request-and-grant-access-cross-origin-sandboxed-iframe-from-prevalent-domain-with-user-interaction-but-access-from-wrong-frame.html [ Pass Timeout ]
 webkit.org/b/197068 [ Debug ] fast/selectors/is-backtracking.html [ Pass Timeout ]
 …
 webkit.org/b/213461 fast/mediastream/mediastreamtrack-video-frameRate-clone-increasing.html [ Pass Failure ]
-webkit.org/b/213553 http/tests/resourceLoadStatistics/grandfathering-database.html [ Pass Timeout ]
 webkit.org/b/213621 imported/w3c/web-platform-tests/webrtc/RTCRtpReceiver-getContributingSources.https.html [ Pass Failure ]

trunk/LayoutTests/platform/wk2/TestExpectations

-              r267313
+              r267750
 http/tests/resourceLoadStatistics/set-all-cookies-to-same-site-strict.html [ Skip ]
 http/tests/resourceLoadStatistics/enforce-samesite-strict-based-on-top-frame-unique-redirects-to.html [ Skip ]
+http/tests/resourceLoadStatistics/enforce-samesite-strict-based-on-top-frame-unique-redirects-to-database.html [ Skip ]
+# This test is flaky. <rdar://problem/69748720>
+http/tests/resourceLoadStatistics/operating-dates-all-but-cookies-removed-statistics-with-no-user-interaction.html [ Pass Failure ]
 # The CNAME and cookie transform SPIs are only available in macOS Big Sur + iOS 14 and above.

trunk/LayoutTests/platform/wpe/TestExpectations

r267531	r267750
643	643	media/now-playing-status-without-media.html [ Skip ]
644	644
645		~~webkit.org/b/210487 http/tests/resourceLoadStatistics/switch-session-on-navigation-to-prevalent-with-interaction-database.php [ Failure ]~~
646	645	webkit.org/b/210487 http/tests/resourceLoadStatistics/switch-session-on-navigation-to-prevalent-with-interaction.php [ Failure ]
647	646

trunk/Source/WTF/ChangeLog

-              r267727
+              r267750
+-09-29  Alex Christensen  <achristensen@webkit.org>
+        Remove plist-based ResourceLoadStatistics storage, which has been replaced by database-based storage
+        https://bugs.webkit.org/show_bug.cgi?id=217063
+        Reviewed by John Wilander.
+        * Scripts/Preferences/WebPreferencesInternal.yaml:
 -09-28  Yusuke Suzuki  <ysuzuki@apple.com>

trunk/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml

-              r267714
+              r267750
       default: false
-# FIXME: This is not relevent for WebKitLegacy, so should be excluded from WebKitLegacy entirely.
-IsITPDatabaseEnabled:
-  type: bool
-  humanReadableName: "ITP Database Backend"
-  humanReadableDescription: "Enable Intelligent Tracking Prevention Database Backend"
-  webcoreBinding: RuntimeEnabledFeatures
-  defaultValue:
-    WebKitLegacy:
-      default: false
-    WebKit:
-      default: true
 KeygenElementEnabled:
   type: bool

trunk/Source/WebCore/ChangeLog

-              r267744
+              r267750
+-09-29  Alex Christensen  <achristensen@webkit.org>
+        Remove plist-based ResourceLoadStatistics storage, which has been replaced by database-based storage
+        https://bugs.webkit.org/show_bug.cgi?id=217063
+        Reviewed by John Wilander.
+        ResourceLoadStatistics was initially implemented using plists to store the persistent data on disk.
+        This caused some performance issues, so a sqlite database backend was implemented and transitioned to.
+        Now that the transition is complete, let's remove the old plist backend.
+        * page/RuntimeEnabledFeatures.h:
+        (WebCore::RuntimeEnabledFeatures::setIsITPDatabaseEnabled): Deleted.
+        (WebCore::RuntimeEnabledFeatures::isITPDatabaseEnabled const): Deleted.
 -09-29  Chris Dumez  <cdumez@apple.com>

trunk/Source/WebCore/page/RuntimeEnabledFeatures.h

-              r267311
+              r267750
     bool itpDebugModeEnabled() const { return m_itpDebugMode; }
-    void setIsITPDatabaseEnabled(bool isEnabled) { m_isITPDatabaseEnabled = isEnabled; }
-    bool isITPDatabaseEnabled() const { return m_isITPDatabaseEnabled; }
     void setRestrictedHTTPResponseAccess(bool isEnabled) { m_isRestrictedHTTPResponseAccess = isEnabled; }
     bool restrictedHTTPResponseAccess() const { return m_isRestrictedHTTPResponseAccess; }
 …
 #endif
-    bool m_isITPDatabaseEnabled { true };
 #if HAVE(NSURLSESSION_WEBSOCKET)
     bool m_isNSURLSessionWebSocketEnabled { false };

trunk/Source/WebKit/ChangeLog

-              r267744
+              r267750
+-09-29  Alex Christensen  <achristensen@webkit.org>
+        Remove plist-based ResourceLoadStatistics storage, which has been replaced by database-based storage
+        https://bugs.webkit.org/show_bug.cgi?id=217063
+        Reviewed by John Wilander.
+        * NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h:
+        * NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp:
+        (WebKit::ResourceLoadStatisticsMemoryStore::setPersistentStorage): Deleted.
+        (WebKit::ResourceLoadStatisticsMemoryStore::syncStorageIfNeeded): Deleted.
+        (WebKit::ResourceLoadStatisticsMemoryStore::syncStorageImmediately): Deleted.
+        * NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.h:
+        * NetworkProcess/Classifier/ResourceLoadStatisticsPersistentStorage.cpp: Removed.
+        * NetworkProcess/Classifier/ResourceLoadStatisticsPersistentStorage.h: Removed.
+        * NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp:
+        (WebKit::ResourceLoadStatisticsStore::processStatisticsAndDataRecords):
+        (WebKit::ResourceLoadStatisticsStore::grandfatherExistingWebsiteData):
+        * NetworkProcess/Classifier/ResourceLoadStatisticsStore.h:
+        * NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:
+        (WebKit::WebResourceLoadStatisticsStore::WebResourceLoadStatisticsStore):
+        (WebKit::WebResourceLoadStatisticsStore::~WebResourceLoadStatisticsStore):
+        (WebKit::WebResourceLoadStatisticsStore::didDestroyNetworkSession):
+        (WebKit::WebResourceLoadStatisticsStore::populateMemoryStoreFromDisk):
+        (WebKit::WebResourceLoadStatisticsStore::scheduleClearInMemoryAndPersistent):
+        (WebKit::WebResourceLoadStatisticsStore::flushAndDestroyPersistentStore): Deleted.
+        * NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h:
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::didClose):
+        (WebKit::NetworkProcess::initializeNetworkProcess):
+        (WebKit::NetworkProcess::setUseITPDatabase): Deleted.
+        * NetworkProcess/NetworkProcess.h:
+        (WebKit::NetworkProcess::isITPDatabaseEnabled const): Deleted.
+        * NetworkProcess/NetworkProcess.messages.in:
+        * NetworkProcess/NetworkProcessCreationParameters.cpp:
+        (WebKit::NetworkProcessCreationParameters::encode const):
+        (WebKit::NetworkProcessCreationParameters::decode):
+        * NetworkProcess/NetworkProcessCreationParameters.h:
+        * NetworkProcess/NetworkSession.cpp:
+        (WebKit::NetworkSession::destroyResourceLoadStatistics):
+        (WebKit::NetworkSession::flushAndDestroyPersistentStore): Deleted.
+        * NetworkProcess/NetworkSession.h:
+        * Shared/WebPreferencesInternal.yaml:
+        * Sources.txt:
+        * SourcesCocoa.txt:
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesSetIsITPDatabaseEnabled): Deleted.
+        (WKPreferencesGetIsITPDatabaseEnabled): Deleted.
+        * UIProcess/API/C/WKPreferencesRef.h:
+        * UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
+        (WKWebsiteDataStoreStatisticsResetToConsistentState):
+        (WKWebsiteDataStoreSetUseITPDatabase): Deleted.
+        * UIProcess/API/C/WKWebsiteDataStoreRef.h:
+        * UIProcess/API/Cocoa/WKPreferences.mm:
+        (-[WKPreferences _isITPDatabaseEnabled]): Deleted.
+        * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+        * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+        (-[WKWebsiteDataStore _setUseITPDatabase:completionHandler:]): Deleted.
+        * UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h:
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+        * UIProcess/Network/NetworkProcessProxy.cpp:
+        (WebKit::NetworkProcessProxy::setUseITPDatabase): Deleted.
+        * UIProcess/Network/NetworkProcessProxy.h:
+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+        (WebKit::WebsiteDataStore::setUseITPDatabase): Deleted.
+        * UIProcess/WebsiteData/WebsiteDataStore.h:
+        * UIProcess/ios/ResourceLoadStatisticsPersistentStorageIOS.mm: Removed.
+        * WebKit.xcodeproj/project.pbxproj:
 -09-29  Chris Dumez  <cdumez@apple.com>

trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.h

r266237	r267750
94	94
95	95	void classifyPrevalentResources() override;
96		~~void syncStorageIfNeeded() override { };~~
97		~~void syncStorageImmediately() override { };~~
98	96	void runIncrementalVacuumCommand();
99	97

trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp

-              r264650
+              r267750
 #include "PluginProcessManager.h"
 #include "PluginProcessProxy.h"
-#include "ResourceLoadStatisticsPersistentStorage.h"
 #include "StorageAccessStatus.h"
 #include "WebProcessProxy.h"
 …
+}
-void ResourceLoadStatisticsMemoryStore::setPersistentStorage(ResourceLoadStatisticsPersistentStorage& persistentStorage)
+{
-    ASSERT(!RunLoop::isMain());
-    m_persistentStorage = makeWeakPtr(persistentStorage);
+}
 void ResourceLoadStatisticsMemoryStore::calculateAndSubmitTelemetry(NotifyPagesForTesting shouldNotifyPagesForTesting) const
+{
 …
+        }
+    }
+}
-void ResourceLoadStatisticsMemoryStore::syncStorageIfNeeded()
+{
-    ASSERT(!RunLoop::isMain());
-    if (m_persistentStorage)
-        m_persistentStorage->scheduleOrWriteMemoryStore(ResourceLoadStatisticsPersistentStorage::ForceImmediateWrite::No);
+}
-void ResourceLoadStatisticsMemoryStore::syncStorageImmediately()
+{
-    ASSERT(!RunLoop::isMain());
-    if (m_persistentStorage)
-        m_persistentStorage->scheduleOrWriteMemoryStore(ResourceLoadStatisticsPersistentStorage::ForceImmediateWrite::Yes);
+}

trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.h

-              r264356
+              r267750
 namespace WebKit {
-class ResourceLoadStatisticsPersistentStorage;
 // This is always constructed / used / destroyed on the WebResourceLoadStatisticsStore's statistics queue.
 class ResourceLoadStatisticsMemoryStore final : public ResourceLoadStatisticsStore {
 public:
     ResourceLoadStatisticsMemoryStore(WebResourceLoadStatisticsStore&, WorkQueue&, ShouldIncludeLocalhost);
-    void setPersistentStorage(ResourceLoadStatisticsPersistentStorage&);
     void clear(CompletionHandler<void()>&&) override;
 …
     void classifyPrevalentResources() override;
-    void syncStorageIfNeeded() override;
-    void syncStorageImmediately() override;
     void requestStorageAccessUnderOpener(DomainInNeedOfStorageAccess&&, WebCore::PageIdentifier, OpenerDomain&&) override;
 …
     Optional<WallTime> mostRecentUserInteractionTime(const ResourceLoadStatistics&);
-    WeakPtr<ResourceLoadStatisticsPersistentStorage> m_persistentStorage;
     HashMap<RegistrableDomain, ResourceLoadStatistics> m_resourceStatisticsMap;
     Vector<OperatingDate> m_operatingDates;

trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp

-              r266829
+              r267750
 #include "PluginProcessManager.h"
 #include "PluginProcessProxy.h"
-#include "ResourceLoadStatisticsPersistentStorage.h"
 #include "StorageAccessStatus.h"
 #include "WebProcessProxy.h"
 …
         pruneStatisticsIfNeeded();
-        syncStorageIfNeeded();
         logTestingEvent("Storage Synced"_s);
 …
                 weakThis->grandfatherDataForDomains(domainsWithWebsiteData);
                 weakThis->m_endOfGrandfatheringTimestamp = WallTime::now() + weakThis->m_parameters.grandfatheringTime;
-                weakThis->syncStorageImmediately();
                 callback();
                 weakThis->logTestingEvent("Grandfathered"_s);

trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h

-              r266829
+              r267750
 namespace WebKit {
-class ResourceLoadStatisticsPersistentStorage;
 class OperatingDate {
 public:
 …
     virtual void classifyPrevalentResources() = 0;
-    virtual void syncStorageIfNeeded() = 0;
-    virtual void syncStorageImmediately() = 0;
     virtual void mergeStatistics(Vector<ResourceLoadStatistics>&&) = 0;

trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp

-              r266829
+              r267750
 #include "ResourceLoadStatisticsDatabaseStore.h"
 #include "ResourceLoadStatisticsMemoryStore.h"
-#include "ResourceLoadStatisticsPersistentStorage.h"
 #include "ShouldGrandfatherStatistics.h"
 #include "StorageAccessStatus.h"
 …
     if (!resourceLoadStatisticsDirectory.isEmpty()) {
+        postTask([this, databaseEnabled = networkSession.networkProcess().isITPDatabaseEnabled(), resourceLoadStatisticsDirectory = resourceLoadStatisticsDirectory.isolatedCopy(), shouldIncludeLocalhost, sessionID = networkSession.sessionID()] {
+            if (databaseEnabled) {
+                m_statisticsStore = makeUnique<ResourceLoadStatisticsDatabaseStore>(*this, m_statisticsQueue, shouldIncludeLocalhost, resourceLoadStatisticsDirectory, sessionID);
+                auto memoryStore = makeUnique<ResourceLoadStatisticsMemoryStore>(*this, m_statisticsQueue, shouldIncludeLocalhost);
+                downcast<ResourceLoadStatisticsDatabaseStore>(*m_statisticsStore.get()).populateFromMemoryStore(*memoryStore);
+                auto legacyPlistFilePath = FileSystem::pathByAppendingComponent(resourceLoadStatisticsDirectory, "full_browsing_session_resourceLog.plist");
+                if (FileSystem::fileExists(legacyPlistFilePath))
+                    FileSystem::deleteFile(legacyPlistFilePath);
+            } else {
+                m_statisticsStore = makeUnique<ResourceLoadStatisticsMemoryStore>(*this, m_statisticsQueue, shouldIncludeLocalhost);
+                m_persistentStorage = makeUnique<ResourceLoadStatisticsPersistentStorage>(downcast<ResourceLoadStatisticsMemoryStore>(*m_statisticsStore), m_statisticsQueue, resourceLoadStatisticsDirectory);
+                SQLiteFileSystem::deleteDatabaseFile(FileSystem::pathByAppendingComponent(resourceLoadStatisticsDirectory, "observations.db"));
+            }
+        postTask([this, resourceLoadStatisticsDirectory = resourceLoadStatisticsDirectory.isolatedCopy(), shouldIncludeLocalhost, sessionID = networkSession.sessionID()] {
+            m_statisticsStore = makeUnique<ResourceLoadStatisticsDatabaseStore>(*this, m_statisticsQueue, shouldIncludeLocalhost, resourceLoadStatisticsDirectory, sessionID);
+            auto memoryStore = makeUnique<ResourceLoadStatisticsMemoryStore>(*this, m_statisticsQueue, shouldIncludeLocalhost);
+            downcast<ResourceLoadStatisticsDatabaseStore>(*m_statisticsStore.get()).populateFromMemoryStore(*memoryStore);
+            auto legacyPlistFilePath = FileSystem::pathByAppendingComponent(resourceLoadStatisticsDirectory, "full_browsing_session_resourceLog.plist");
+            if (FileSystem::fileExists(legacyPlistFilePath))
+                FileSystem::deleteFile(legacyPlistFilePath);
             m_statisticsStore->didCreateNetworkProcess();
 …
     RELEASE_ASSERT(RunLoop::isMain());
     RELEASE_ASSERT(!m_statisticsStore);
-    RELEASE_ASSERT(!m_persistentStorage);
+}
 …
     m_networkSession = nullptr;
-    flushAndDestroyPersistentStore([callbackAggregator] { });
     destroyResourceLoadStatisticsStore([callbackAggregator] { });
+}
 …
+}
-void WebResourceLoadStatisticsStore::flushAndDestroyPersistentStore(CompletionHandler<void()>&& completionHandler)
+{
-    RELEASE_ASSERT(RunLoop::isMain());
-    // Make sure we destroy the persistent store on the background queue and stay alive until it
-    // is destroyed because it has a C++ reference to us.
-    m_statisticsQueue->dispatch([this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)] () mutable {
-        m_persistentStorage = nullptr;
-        RunLoop::main().dispatch(WTFMove(completionHandler));
-    });
+}
 void WebResourceLoadStatisticsStore::populateMemoryStoreFromDisk(CompletionHandler<void()>&& completionHandler)
+{
 …
     postTask([this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)]() mutable {
+        if (m_persistentStorage)
+            m_persistentStorage->populateMemoryStoreFromDisk([protectedThis = WTFMove(protectedThis), completionHandler = WTFMove(completionHandler)]() mutable {
+                postTaskReply(WTFMove(completionHandler));
+            });
+        else if (m_statisticsStore && is<ResourceLoadStatisticsDatabaseStore>(*m_statisticsStore)) {
+        if (m_statisticsStore && is<ResourceLoadStatisticsDatabaseStore>(*m_statisticsStore)) {
             auto& databaseStore = downcast<ResourceLoadStatisticsDatabaseStore>(*m_statisticsStore);
             if (databaseStore.isNewResourceLoadStatisticsDatabaseFile()) {
 …
     ASSERT(RunLoop::isMain());
     postTask([this, protectedThis = makeRef(*this), shouldGrandfather, completionHandler = WTFMove(completionHandler)]() mutable {
-        if (m_persistentStorage)
-            m_persistentStorage->clear();
         if (!m_statisticsStore) {
             if (shouldGrandfather == ShouldGrandfatherStatistics::Yes)

trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h

-              r266829
+              r267750
 class NetworkSession;
 class ResourceLoadStatisticsStore;
-class ResourceLoadStatisticsPersistentStorage;
 class WebFrameProxy;
 class WebProcessProxy;
 …
     bool isEphemeral() const { return m_isEphemeral == WebCore::ResourceLoadStatistics::IsEphemeral::Yes; };
     void insertExpiredStatisticForTesting(const RegistrableDomain&, bool hadUserInteraction, bool isScheduledForAllButCookieDataRemoval, bool isPrevalent, CompletionHandler<void()>&&);
-    void flushAndDestroyPersistentStore(CompletionHandler<void()>&&);
 private:
 …
     Ref<WTF::WorkQueue> m_statisticsQueue;
     std::unique_ptr<ResourceLoadStatisticsStore> m_statisticsStore;
-    std::unique_ptr<ResourceLoadStatisticsPersistentStorage> m_persistentStorage;
     RunLoop::Timer<WebResourceLoadStatisticsStore> m_dailyTasksTimer;

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

-              r267618
+              r267750
     });
+    // Make sure we flush all cookies and resource load statistics to disk before exiting.
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
+    forEachNetworkSession([&] (auto& networkSession) {
+        networkSession.flushAndDestroyPersistentStore([callbackAggregator] { });
+    });
+#endif
+    // Make sure we flush all cookies to disk before exiting.
     forEachNetworkSession([&] (auto& networkSession) {
         platformFlushCookies(networkSession.sessionID(), [callbackAggregator] { });
 …
     setCacheModel(parameters.cacheModel);
-#if ENABLE(RESOURCE_LOAD_STATISTICS)
-    m_isITPDatabaseEnabled = parameters.shouldEnableITPDatabase;
-#endif
     setAdClickAttributionDebugMode(parameters.enableAdClickAttributionDebugMode);
 …
             resourceLoadStatistics->setGrandfathered(domain, isGrandfathered, WTFMove(completionHandler));
         else
-            completionHandler();
-    } else {
-        ASSERT_NOT_REACHED();
-        completionHandler();
+    }
+}
-void NetworkProcess::setUseITPDatabase(PAL::SessionID sessionID, bool value, CompletionHandler<void()>&& completionHandler)
+{
-    if (auto* networkSession = this->networkSession(sessionID)) {
-        if (m_isITPDatabaseEnabled != value) {
-            m_isITPDatabaseEnabled = value;
-            networkSession->recreateResourceLoadStatisticStore(WTFMove(completionHandler));
-        } else
             completionHandler();
     } else {

trunk/Source/WebKit/NetworkProcess/NetworkProcess.h

-              r267618
+              r267750
     void isRegisteredAsSubresourceUnder(PAL::SessionID, const SubResourceDomain&, const TopFrameDomain&, CompletionHandler<void(bool)>&&);
     void setGrandfathered(PAL::SessionID, const RegistrableDomain&, bool isGrandfathered, CompletionHandler<void()>&&);
-    void setUseITPDatabase(PAL::SessionID, bool value, CompletionHandler<void()>&&);
     void setMaxStatisticsEntries(PAL::SessionID, uint64_t maximumEntryCount, CompletionHandler<void()>&&);
     void setPrevalentResource(PAL::SessionID, const RegistrableDomain&, CompletionHandler<void()>&&);
 …
     void setAppBoundDomainsForResourceLoadStatistics(PAL::SessionID, HashSet<WebCore::RegistrableDomain>&&, CompletionHandler<void()>&&);
 #endif
-    bool isITPDatabaseEnabled() const { return m_isITPDatabaseEnabled; }
     void setShouldDowngradeReferrerForTesting(bool, CompletionHandler<void()>&&);
     void setThirdPartyCookieBlockingMode(PAL::SessionID, WebCore::ThirdPartyCookieBlockingMode, CompletionHandler<void()>&&);
 …
     std::unique_ptr<NetworkHTTPSUpgradeChecker> m_networkHTTPSUpgradeChecker;
 #endif
-#if ENABLE(RESOURCE_LOAD_STATISTICS)
-    bool m_isITPDatabaseEnabled { false };
-#endif
     Lock m_sessionStorageQuotaManagersLock;

trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in

r267534	r267750
118	118	SetCacheMaxAgeCapForPrevalentResources(PAL::SessionID sessionID, Seconds seconds) -> () Async
119	119	SetGrandfathered(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain, bool isGrandfathered) -> () Async
120		~~SetUseITPDatabase(PAL::SessionID sessionID, bool value) -> () Async~~
121	120	GetResourceLoadStatisticsDataSummary(PAL::SessionID sessionID) -> (Vector<WebKit::WebResourceLoadStatisticsStore::ThirdPartyData> thirdPartyData) Async
122	121	SetGrandfatheringTime(PAL::SessionID sessionID, Seconds seconds) -> () Async

trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp

-              r267618
+              r267750
     encoder << serviceWorkerRegistrationDirectory << serviceWorkerRegistrationDirectoryExtensionHandle << shouldDisableServiceWorkerProcessTerminationDelay;
 #endif
-    encoder << shouldEnableITPDatabase;
     encoder << enableAdClickAttributionDebugMode;
+}
 …
 #endif
-    if (!decoder.decode(result.shouldEnableITPDatabase))
-        return false;
     if (!decoder.decode(result.enableAdClickAttributionDebugMode))
         return false;

trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h

r267618	r267750
88	88	bool shouldDisableServiceWorkerProcessTerminationDelay { false };
89	89	#endif
90		~~bool shouldEnableITPDatabase { false };~~
91	90	bool enableAdClickAttributionDebugMode { false };
92	91	};

trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp

-              r267540
+              r267750
     m_resourceLoadStatistics = nullptr;
+}
-void NetworkSession::flushAndDestroyPersistentStore(CompletionHandler<void()>&& completionHandler)
+{
-    if (!m_resourceLoadStatistics)
-        return completionHandler();
-    m_resourceLoadStatistics->flushAndDestroyPersistentStore(WTFMove(completionHandler));
+}
 #endif

trunk/Source/WebKit/NetworkProcess/NetworkSession.h

r266829	r267750
112	112	void resetCNAMEDomainData();
113	113	void destroyResourceLoadStatistics(CompletionHandler<void()>&&);
114		~~void flushAndDestroyPersistentStore(CompletionHandler<void()>&&);~~
115	114	#endif
116	115

trunk/Source/WebKit/Shared/WebPreferencesInternal.yaml

-              r267597
+              r267750
   webcoreName: experimentalPlugInSandboxProfilesEnabled
-IsITPDatabaseEnabled:
-  type: bool
-  defaultValue: true
-  humanReadableName: "ITP Database Backend"
-  humanReadableDescription: "Enable Intelligent Tracking Prevention Database Backend"
-  webcoreBinding: RuntimeEnabledFeatures
 ServiceWorkersEnabled:
   type: bool

trunk/Source/WebKit/Sources.txt

r266063	r267750
78	78	NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp
79	79	NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp
80		~~NetworkProcess/Classifier/ResourceLoadStatisticsPersistentStorage.cpp~~
81	80	NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp
82	81

trunk/Source/WebKit/SourcesCocoa.txt

r267602	r267750
448	448	UIProcess/ios/PageClientImplIOS.mm
449	449	UIProcess/ios/ProcessAssertionIOS.mm
450		~~UIProcess/ios/ResourceLoadStatisticsPersistentStorageIOS.mm~~
451	450	UIProcess/ios/SmartMagnificationController.mm
452	451	UIProcess/ios/TextCheckerIOS.mm

trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp

-              r267311
+              r267750
+}
-void WKPreferencesSetIsITPDatabaseEnabled(WKPreferencesRef preferencesRef, bool isITPDatabaseEnabled)
+{
-    toImpl(preferencesRef)->setIsITPDatabaseEnabled(isITPDatabaseEnabled);
+}
-bool WKPreferencesGetIsITPDatabaseEnabled(WKPreferencesRef preferencesRef)
+{
-    return toImpl(preferencesRef)->isITPDatabaseEnabled();
+}
 void WKPreferencesSetOfflineWebApplicationCacheEnabled(WKPreferencesRef preferencesRef, bool offlineWebApplicationCacheEnabled)
+{

trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h

-              r267311
+              r267750
 // Defaults to true.
-WK_EXPORT void WKPreferencesSetIsITPDatabaseEnabled(WKPreferencesRef preferences, bool isITPDatabaseEnabled);
-WK_EXPORT bool WKPreferencesGetIsITPDatabaseEnabled(WKPreferencesRef preferences);
-// Defaults to true.
 WK_EXPORT void WKPreferencesSetOfflineWebApplicationCacheEnabled(WKPreferencesRef preferences, bool offlineWebApplicationCacheEnabled);
 WK_EXPORT bool WKPreferencesGetOfflineWebApplicationCacheEnabled(WKPreferencesRef preferences);

trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp

-              r267618
+              r267750
+}
-void WKWebsiteDataStoreSetUseITPDatabase(WKWebsiteDataStoreRef dataStoreRef, bool value, void* context, WKWebsiteDataStoreSetUseITPDatabaseFunction completionHandler)
+{
-#if ENABLE(RESOURCE_LOAD_STATISTICS)
-    WebKit::toImpl(dataStoreRef)->setUseITPDatabase(value, [context, completionHandler] {
-        completionHandler(context);
-    });
-#else
-    completionHandler(context);
-#endif
+}
 void WKWebsiteDataStoreSetStatisticsSubframeUnderTopFrameOrigin(WKWebsiteDataStoreRef dataStoreRef, WKStringRef host, WKStringRef topFrameHost)
+{
 …
     store.resetParametersToDefaultValues([callbackAggregator] { });
     store.scheduleClearInMemoryAndPersistent(WebKit::ShouldGrandfatherStatistics::No, [callbackAggregator] { });
-    store.setUseITPDatabase(false, [callbackAggregator] { });
 #else
     UNUSED_PARAM(dataStoreRef);

trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h

r267618	r267750
89	89	typedef void (WKWebsiteDataStoreIsStatisticsGrandfatheredFunction)(bool isGrandfathered, void functionContext);
90	90	WK_EXPORT void WKWebsiteDataStoreIsStatisticsGrandfathered(WKWebsiteDataStoreRef dataStoreRef, WKStringRef host, void* context, WKWebsiteDataStoreIsStatisticsGrandfatheredFunction callback);
91		~~typedef void (WKWebsiteDataStoreSetUseITPDatabaseFunction)(void functionContext);~~
92		~~WK_EXPORT void WKWebsiteDataStoreSetUseITPDatabase(WKWebsiteDataStoreRef dataStoreRef, bool value, void* context, WKWebsiteDataStoreSetUseITPDatabaseFunction callback);~~
93	91	WK_EXPORT void WKWebsiteDataStoreSetStatisticsSubframeUnderTopFrameOrigin(WKWebsiteDataStoreRef dataStoreRef, WKStringRef host, WKStringRef topFrameHost);
94	92	WK_EXPORT void WKWebsiteDataStoreSetStatisticsSubresourceUnderTopFrameOrigin(WKWebsiteDataStoreRef dataStoreRef, WKStringRef host, WKStringRef topFrameHost);

trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm

r267188	r267750
919	919	}
920	920
921		~~- (BOOL)_isITPDatabaseEnabled~~
922		{
923		~~return _preferences->isITPDatabaseEnabled();~~
924		}
925
926	921	- (BOOL)_serviceWorkerEntitlementDisabledForTesting
927	922	{

trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h

r267188	r267750
161	161	@property (nonatomic, setter=_setAcceleratedCompositingEnabled:) BOOL _acceleratedCompositingEnabled WK_API_AVAILABLE(macos(10.13.4), ios(WK_IOS_TBA));
162	162	@property (nonatomic, setter=_setRequestAnimationFrameEnabled:) BOOL _requestAnimationFrameEnabled WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
163		~~@property (nonatomic, readonly) BOOL _isITPDatabaseEnabled WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));~~
164	163	@property (nonatomic, setter=_setServiceWorkerEntitlementDisabledForTesting:) BOOL _serviceWorkerEntitlementDisabledForTesting WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
165	164	@property (nonatomic, setter=_setAccessibilityIsolatedTreeEnabled:) BOOL _accessibilityIsolatedTreeEnabled WK_API_AVAILABLE(macos(10.16));

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm

-              r267618
+              r267750
+}
-- (void)_setUseITPDatabase:(BOOL)enabled completionHandler:(void (^)(void))completionHandler
+{
-#if ENABLE(RESOURCE_LOAD_STATISTICS)
-    _websiteDataStore->setUseITPDatabase(enabled, [completionHandler = makeBlockPtr(completionHandler)]() {
-        completionHandler();
-    });
-#else
-    completionHandler();
-#endif
+}
 - (BOOL)_resourceLoadStatisticsDebugMode
+{

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h

r267618	r267750
72	72	- (void)_getIsPrevalentDomain:(NSURL *)domain completionHandler:(void (^)(BOOL))completionHandler WK_API_AVAILABLE(macos(10.15), ios(13.0));
73	73	- (void)_getResourceLoadStatisticsDataSummary:(void (^)(NSArray<_WKResourceLoadStatisticsThirdParty > ))completionHandler WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
74		~~- (void)_setUseITPDatabase:(BOOL)enabled completionHandler:(void (^)(void))completionHandler WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));~~
75	74	- (void)_clearPrevalentDomain:(NSURL *)domain completionHandler:(void (^)(void))completionHandler WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
76	75	- (void)_clearResourceLoadStatistics:(void (^)(void))completionHandler WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));

trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

-              r267618
+              r267750
 #endif
-    NSNumber *databaseEnabledValue = [defaults objectForKey:[NSString stringWithFormat:@"InternalDebug%@", WebPreferencesKey::isITPDatabaseEnabledKey().createCFString().get()]];
-    if (databaseEnabledValue)
-        parameters.shouldEnableITPDatabase = databaseEnabledValue.boolValue;
-    else
-        parameters.shouldEnableITPDatabase = m_defaultPageGroup->preferences().isITPDatabaseEnabled();
     parameters.enableAdClickAttributionDebugMode = [defaults boolForKey:[NSString stringWithFormat:@"Experimental%@", WebPreferencesKey::adClickAttributionDebugModeEnabledKey().createCFString().get()]];

trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp

-              r267618
+              r267750
+}
-void NetworkProcessProxy::setUseITPDatabase(PAL::SessionID sessionID, bool value, CompletionHandler<void()>&& completionHandler)
+{
-    sendWithAsyncReply(Messages::NetworkProcess::SetUseITPDatabase(sessionID, value), [completionHandler = WTFMove(completionHandler)]() mutable {
-        completionHandler();
-    });
+}
 void NetworkProcessProxy::requestStorageAccessConfirm(WebPageProxyIdentifier pageID, FrameIdentifier frameID, const RegistrableDomain& subFrameDomain, const RegistrableDomain& topFrameDomain, CompletionHandler<void(bool)>&& completionHandler)
+{

trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h

r267618	r267750
143	143	void setCacheMaxAgeCap(PAL::SessionID, Seconds, CompletionHandler<void()>&&);
144	144	void setGrandfathered(PAL::SessionID, const RegistrableDomain&, bool isGrandfathered, CompletionHandler<void()>&&);
145		~~void setUseITPDatabase(PAL::SessionID, bool value, CompletionHandler<void()>&&);~~
146	145	void setNotifyPagesWhenDataRecordsWereScanned(PAL::SessionID, bool, CompletionHandler<void()>&&);
147	146	void setIsRunningResourceLoadStatisticsTest(PAL::SessionID, bool, CompletionHandler<void()>&&);

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

-              r267618
+              r267750
+}
-void WebsiteDataStore::setUseITPDatabase(bool value, CompletionHandler<void()>&& completionHandler)
+{
-    ASSERT(RunLoop::isMain());
-    auto callbackAggregator = CallbackAggregator::create(WTFMove(completionHandler));
-    for (auto& processPool : processPools()) {
-        if (auto* process = processPool->networkProcess())
-            process->setUseITPDatabase(m_sessionID, value, [callbackAggregator] { });
+    }
+}
 void WebsiteDataStore::setCrossSiteLoadWithLinkDecorationForTesting(const URL& fromURL, const URL& toURL, CompletionHandler<void()>&& completionHandler)
+{

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h

r267618	r267750
174	174	void setGrandfathered(const URL&, bool, CompletionHandler<void()>&&);
175	175	void isGrandfathered(const URL&, CompletionHandler<void(bool)>&&);
176		~~void setUseITPDatabase(bool, CompletionHandler<void()>&&);~~
177	176	void setGrandfatheringTime(Seconds, CompletionHandler<void()>&&);
178	177	void setLastSeen(const URL&, Seconds, CompletionHandler<void()>&&);

trunk/Source/WebKit/UIProcess/soup/WebProcessPoolSoup.cpp

r267618	r267750
48	48	parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
49	49	parameters.languages = userPreferredLanguages();
50		~~parameters.shouldEnableITPDatabase = true;~~
51	50	}
52	51

trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

-              r267602
+              r267750
 AFBD36321E50F39005DBACB /* WebResourceLoadStatisticsStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFBD36221E50F39005DBACB /* WebResourceLoadStatisticsStore.h */; };
 AFBD36721E51BAB005DBACB /* ResourceLoadStatisticsMemoryStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFBD36521E51BAB005DBACB /* ResourceLoadStatisticsMemoryStore.h */; };
-AFBD36A21E542F1005DBACB /* ResourceLoadStatisticsPersistentStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFBD36821E542E8005DBACB /* ResourceLoadStatisticsPersistentStorage.h */; };
 AFBD36F21E546F8005DBACB /* PersistencyUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFBD36D21E546E3005DBACB /* PersistencyUtils.h */; };
 C065F2C1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C065F2A1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h */; };
 …
 E351C9180F2CCC00E53BE9 /* IDBUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBUtilities.h; sourceTree = "<group>"; };
 E399051D6F54C5009C8831 /* UIGamepadProviderCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIGamepadProviderCocoa.mm; sourceTree = "<group>"; };
-E6C15F1F29355100FD3437 /* ResourceLoadStatisticsPersistentStorageIOS.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = ResourceLoadStatisticsPersistentStorageIOS.mm; path = ios/ResourceLoadStatisticsPersistentStorageIOS.mm; sourceTree = "<group>"; };
 E8B68D1E712873001B7132 /* WebURLSchemeTask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebURLSchemeTask.cpp; sourceTree = "<group>"; };
 E949961D761CC700EC9EB9 /* UIGamepadProviderIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIGamepadProviderIOS.mm; sourceTree = "<group>"; };
 …
 AFBD36421E51BAB005DBACB /* ResourceLoadStatisticsMemoryStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ResourceLoadStatisticsMemoryStore.cpp; path = Classifier/ResourceLoadStatisticsMemoryStore.cpp; sourceTree = "<group>"; };
 AFBD36521E51BAB005DBACB /* ResourceLoadStatisticsMemoryStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResourceLoadStatisticsMemoryStore.h; path = Classifier/ResourceLoadStatisticsMemoryStore.h; sourceTree = "<group>"; };
-AFBD36821E542E8005DBACB /* ResourceLoadStatisticsPersistentStorage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ResourceLoadStatisticsPersistentStorage.h; path = Classifier/ResourceLoadStatisticsPersistentStorage.h; sourceTree = "<group>"; };
-AFBD36921E542E8005DBACB /* ResourceLoadStatisticsPersistentStorage.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ResourceLoadStatisticsPersistentStorage.cpp; path = Classifier/ResourceLoadStatisticsPersistentStorage.cpp; sourceTree = "<group>"; };
 AFBD36B21E54544005DBACB /* WebResourceLoadStatisticsTelemetry.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WebResourceLoadStatisticsTelemetry.h; path = Classifier/WebResourceLoadStatisticsTelemetry.h; sourceTree = "<group>"; };
 AFBD36C21E54544005DBACB /* WebResourceLoadStatisticsTelemetry.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WebResourceLoadStatisticsTelemetry.cpp; path = Classifier/WebResourceLoadStatisticsTelemetry.cpp; sourceTree = "<group>"; };
 …
 A78FF2E224191750096483E /* WKStorageAccessAlert.h */,
 A78FF2F224191760096483E /* WKStorageAccessAlert.mm */,
-DC682519E29D00214EE7 /* WKUserMediaCaptureAccessAlert.h */,
-DC672519E29D00214EE7 /* WKUserMediaCaptureAccessAlert.mm */,
 D7AAFD218C8640600A7ACD4 /* WKWebViewContentProvider.h */,
 DC6D9C118C44A610043BAD4 /* WKWebViewContentProviderRegistry.h */,
 …
 FCB4E3718BBE044000FCFC9 /* PageClientImplIOS.mm */,
 F9536218FF550B001DB2EF /* ProcessAssertionIOS.mm */,
-E6C15F1F29355100FD3437 /* ResourceLoadStatisticsPersistentStorageIOS.mm */,
 DAF06D418BD1A470081CEB1 /* SmartMagnificationController.h */,
 DAF06D818BD23BA0081CEB1 /* SmartMagnificationController.messages.in */,
 …
 AFBD36421E51BAB005DBACB /* ResourceLoadStatisticsMemoryStore.cpp */,
 AFBD36521E51BAB005DBACB /* ResourceLoadStatisticsMemoryStore.h */,
-AFBD36921E542E8005DBACB /* ResourceLoadStatisticsPersistentStorage.cpp */,
-AFBD36821E542E8005DBACB /* ResourceLoadStatisticsPersistentStorage.h */,
 ACE82E8221CAE07000DA94C /* ResourceLoadStatisticsStore.cpp */,
 ACE82E7221CAE06000DA94C /* ResourceLoadStatisticsStore.h */,
 …
 BE969CB1E54D4CF008B7483 /* ResourceLoadStatisticsClassifierCocoa.h in Headers */,
 AFBD36721E51BAB005DBACB /* ResourceLoadStatisticsMemoryStore.h in Headers */,
-AFBD36A21E542F1005DBACB /* ResourceLoadStatisticsPersistentStorage.h in Headers */,
 A30066E1110F4F70031937C /* ResponsivenessTimer.h in Headers */,
 CE1DDD324F00F006D0 /* RTCNetwork.h in Headers */,
 …
 A78FF332241919B0096483E /* WKStorageAccessAlert.mm in Sources */,
                                 CE212160240EE571006ED443 /* WKTextPlaceholder.mm in Sources */,
-DC692519EC3300214EE7 /* WKUserMediaCaptureAccessAlert.mm in Sources */,
                                 C14D306924B79BE000480387 /* XPCEndpoint.mm in Sources */,
                                 C14D306A24B79BE400480387 /* XPCEndpointClient.mm in Sources */,

trunk/Tools/ChangeLog

-              r267743
+              r267750
+-09-29  Alex Christensen  <achristensen@webkit.org>
+        Remove plist-based ResourceLoadStatistics storage, which has been replaced by database-based storage
+        https://bugs.webkit.org/show_bug.cgi?id=217063
+        Reviewed by John Wilander.
+        These three tests API tests have been removed:
+        ResourceLoadStatistics.ChildProcessesNotLaunched
+        ResourceLoadStatistics.GrandfatherCallback
+        ResourceLoadStatistics.ShouldNotGrandfatherOnStartup
+        Each of those tests has a corresponding test that ends with "Database" that tests the database backend,
+        so the only test coverage loss was of the code that was removed.
+        * TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadStatistics.mm:
+        (ensureITPFileIsCreated):
+        (TEST):
+        (isITPDatabaseEnabled): Deleted.
+        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+        (WTR::TestRunner::setUseITPDatabase): Deleted.
+        * WebKitTestRunner/InjectedBundle/TestRunner.h:
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::setUseITPDatabase): Deleted.
+        * WebKitTestRunner/TestController.h:
+        * WebKitTestRunner/TestInvocation.cpp:
+        (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):
 -09-29  Jonathan Bedard  <jbedard@apple.com>

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadStatistics.mm

-              r267618
+              r267750
 @end
-bool isITPDatabaseEnabled()
+{
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
-    auto defaultDatabaseEnabled = [configuration preferences]._isITPDatabaseEnabled;
-    NSNumber *databaseEnabledValue = [defaults objectForKey:@"InternalDebugIsITPDatabaseEnabled"];
-    if (databaseEnabledValue)
-        return databaseEnabledValue.boolValue;
-    return defaultDatabaseEnabled;
+}
 static void ensureITPFileIsCreated()
+{
-    static bool doneFlag;
     auto *dataStore = [WKWebsiteDataStore defaultDataStore];
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
     [dataStore _setResourceLoadStatisticsEnabled:YES];
     [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"about:blank"]]];
-    [dataStore _setUseITPDatabase:true completionHandler: ^(void) {
-        doneFlag = true;
-    }];
-    TestWebKitAPI::Util::run(&doneFlag);
     [dataStore _setResourceLoadStatisticsEnabled:NO];
+}
 TEST(ResourceLoadStatistics, GrandfatherCallback)
+TEST(ResourceLoadStatistics, GrandfatherCallbackDatabase)
+{
     auto *dataStore = [WKWebsiteDataStore defaultDataStore];
     NSURL *statisticsDirectoryURL = [NSURL fileURLWithPath:[@"~/Library/WebKit/com.apple.WebKit.TestWebKitAPI/WebsiteData/ResourceLoadStatistics" stringByExpandingTildeInPath] isDirectory:YES];
     NSURL *fileURL = [statisticsDirectoryURL URLByAppendingPathComponent:@"full_browsing_session_resourceLog.plist"];
+    NSURL *fileURL = [statisticsDirectoryURL URLByAppendingPathComponent:@"observations.db"];
     [[NSFileManager defaultManager] removeItemAtURL:fileURL error:nil];
     [[NSFileManager defaultManager] removeItemAtURL:statisticsDirectoryURL error:nil];
     EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:statisticsDirectoryURL.path]);
+    static bool grandfatheredFlag;
     static bool doneFlag;
-    static bool grandfatheredFlag;
     [dataStore _setResourceLoadStatisticsTestingCallback:^(WKWebsiteDataStore *, NSString *message) {
+        // Only if the database store is not default-enabled do we need to check that this first message is correct.
+        if (!isITPDatabaseEnabled())
+            ASSERT_TRUE([message isEqualToString:@"Grandfathered"]);
+        ASSERT_TRUE([message isEqualToString:@"Grandfathered"]);
         grandfatheredFlag = true;
     }];
-    // We need an active NetworkProcess to perform ResourceLoadStatistics operations.
     auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
     [dataStore _setResourceLoadStatisticsEnabled:YES];
     [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"about:blank"]]];
-    if (isITPDatabaseEnabled()) {
-        TestWebKitAPI::Util::run(&grandfatheredFlag);
-        // Since the database store is enabled, we need to disable it to test this functionality with the plist.
-        // We already have a NetworkProcess up and running with ITP enabled. We now make another call initializing
-        // the memory store and testing grandfathering.
-        grandfatheredFlag = false;
-        [dataStore _setResourceLoadStatisticsTestingCallback:^(WKWebsiteDataStore *, NSString *message) {
-            ASSERT_TRUE([message isEqualToString:@"Grandfathered"]);
-            grandfatheredFlag = true;
-        }];
-        [dataStore _setUseITPDatabase:false completionHandler: ^(void) {
-            doneFlag = true;
-        }];
-        TestWebKitAPI::Util::run(&doneFlag);
+    }
     TestWebKitAPI::Util::run(&grandfatheredFlag);
 …
     // The website data store remove should have completed, but since we removed all of the data types that are monitored by resource load statistics,
     // no grandfathering call should have been made.
+    // no grandfathering call should have been made. Note that the database file will not be deleted like in the persistent storage case, only cleared.
     EXPECT_FALSE(grandfatheredFlag);
-    EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:fileURL.path]);
     doneFlag = false;
 …
     TestWebKitAPI::Util::run(&grandfatheredFlag);
     TestWebKitAPI::Util::run(&doneFlag);
+    // Spin the runloop until the resource load statistics file has written to disk.
+    // If the test enters a spin loop here, it has failed.
+    while (true) {
+        if ([[NSFileManager defaultManager] fileExistsAtPath:fileURL.path])
+            break;
+        TestWebKitAPI::Util::spinRunLoop(1);
+    }
+}
+TEST(ResourceLoadStatistics, GrandfatherCallbackDatabase)
+}
+TEST(ResourceLoadStatistics, ShouldNotGrandfatherOnStartupDatabase)
+{
     auto *dataStore = [WKWebsiteDataStore defaultDataStore];
+    NSURL *statisticsDirectoryURL = [NSURL fileURLWithPath:[@"~/Library/WebKit/com.apple.WebKit.TestWebKitAPI/WebsiteData/ResourceLoadStatistics" stringByExpandingTildeInPath] isDirectory:YES];
+    NSURL *fileURL = [statisticsDirectoryURL URLByAppendingPathComponent:@"observations.db"];
+    [[NSFileManager defaultManager] removeItemAtURL:fileURL error:nil];
+    [[NSFileManager defaultManager] removeItemAtURL:statisticsDirectoryURL error:nil];
+    EXPECT_FALSE([[NSFileManager defaultManager] fileExistsAtPath:statisticsDirectoryURL.path]);
+    static bool grandfatheredFlag;
+    static bool doneFlag;
+    ensureITPFileIsCreated();
+    __block bool callbackFlag = false;
     [dataStore _setResourceLoadStatisticsTestingCallback:^(WKWebsiteDataStore *, NSString *message) {
+        // Only if the database store is default-enabled do we need to check that this first message is correct.
+        if (isITPDatabaseEnabled())
+            ASSERT_TRUE([message isEqualToString:@"Grandfathered"]);
+        grandfatheredFlag = true;
+    }];
+    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
+    [dataStore _setResourceLoadStatisticsEnabled:YES];
+    [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"about:blank"]]];
+    if (!isITPDatabaseEnabled()) {
+        TestWebKitAPI::Util::run(&grandfatheredFlag);
+        // Since the database store is not enabled, we need to update the store to use a database instead of a plist for this test.
+        // We already have a NetworkProcess up and running with ITP enabled. We now make another call initializing
+        // the database store and testing grandfathering.
+        grandfatheredFlag = false;
+        [dataStore _setResourceLoadStatisticsTestingCallback:^(WKWebsiteDataStore *, NSString *message) {
+            ASSERT_TRUE([message isEqualToString:@"Grandfathered"]);
+            grandfatheredFlag = true;
+        }];
+        [dataStore _setUseITPDatabase:true completionHandler: ^(void) {
+            doneFlag = true;
+        }];
+        TestWebKitAPI::Util::run(&doneFlag);
+    }
+    TestWebKitAPI::Util::run(&grandfatheredFlag);
+    // Spin the runloop until the resource load statistics file has written to disk.
+    // If the test enters a spin loop here, it has failed.
+    while (true) {
+        if ([[NSFileManager defaultManager] fileExistsAtPath:fileURL.path])
+            break;
+        TestWebKitAPI::Util::spinRunLoop(1);
+    }
+    grandfatheredFlag = false;
+    doneFlag = false;
+    [dataStore removeDataOfTypes:[WKWebsiteDataStore _allWebsiteDataTypesIncludingPrivate]  modifiedSince:[NSDate distantPast] completionHandler:^ {
+        doneFlag = true;
+    }];
+    TestWebKitAPI::Util::run(&doneFlag);
+    TestWebKitAPI::Util::spinRunLoop(10);
+    // The website data store remove should have completed, but since we removed all of the data types that are monitored by resource load statistics,
+    // no grandfathering call should have been made. Note that the database file will not be deleted like in the persistent storage case, only cleared.
+    EXPECT_FALSE(grandfatheredFlag);
+    doneFlag = false;
+    [dataStore removeDataOfTypes:[NSSet setWithObjects:WKWebsiteDataTypeCookies, _WKWebsiteDataTypeResourceLoadStatistics, nil] modifiedSince:[NSDate distantPast] completionHandler:^ {
+        doneFlag = true;
+    }];
+    // Since we did not remove every data type covered by resource load statistics, we do expect that grandfathering took place again.
+    // If the test hangs waiting on either of these conditions, it has failed.
+    TestWebKitAPI::Util::run(&grandfatheredFlag);
+    TestWebKitAPI::Util::run(&doneFlag);
+}
+TEST(ResourceLoadStatistics, ShouldNotGrandfatherOnStartup)
+{
+    auto *dataStore = [WKWebsiteDataStore defaultDataStore];
+    NSURL *statisticsDirectoryURL = [NSURL fileURLWithPath:[@"~/Library/WebKit/com.apple.WebKit.TestWebKitAPI/WebsiteData/ResourceLoadStatistics" stringByExpandingTildeInPath] isDirectory:YES];
+    NSURL *targetURL = [statisticsDirectoryURL URLByAppendingPathComponent:@"full_browsing_session_resourceLog.plist"];
+    NSURL *testResourceURL = [[NSBundle mainBundle] URLForResource:@"EmptyGrandfatheredResourceLoadStatistics" withExtension:@"plist" subdirectory:@"TestWebKitAPI.resources"];
+    [[NSFileManager defaultManager] createDirectoryAtURL:statisticsDirectoryURL withIntermediateDirectories:YES attributes:nil error:nil];
+    [[NSFileManager defaultManager] copyItemAtURL:testResourceURL toURL:targetURL error:nil];
+    EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:targetURL.path]);
+    static bool callbackFlag;
+    static bool doneFlag;
+    [dataStore _setResourceLoadStatisticsTestingCallback:^(WKWebsiteDataStore *, NSString *message) {
+        // Only if the database store is not default-enabled do we need to check that this first message is correct.
+        if (!isITPDatabaseEnabled())
+            ASSERT_TRUE([message isEqualToString:@"PopulatedWithoutGrandfathering"]);
+        ASSERT_TRUE([message isEqualToString:@"PopulatedWithoutGrandfathering"]);
         callbackFlag = true;
     }];
 …
     [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"about:blank"]]];
-    if (isITPDatabaseEnabled()) {
-        TestWebKitAPI::Util::run(&callbackFlag);
-        // Since the database store is enabled, we need to disable it to test this functionality with the plist.
-        // We already have a NetworkProcess up and running with ITP enabled. We now make another call initializing
-        // the memory store and testing grandfathering.
-        callbackFlag = false;
-        [dataStore _setResourceLoadStatisticsTestingCallback:^(WKWebsiteDataStore *, NSString *message) {
-            ASSERT_TRUE([message isEqualToString:@"PopulatedWithoutGrandfathering"]);
-            callbackFlag = true;
-        }];
-        // Since the ITP Database is enabled, the plist file has been deleted. We need to create it again.
-        [[NSFileManager defaultManager] createDirectoryAtURL:statisticsDirectoryURL withIntermediateDirectories:YES attributes:nil error:nil];
-        [[NSFileManager defaultManager] copyItemAtURL:testResourceURL toURL:targetURL error:nil];
-        EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:targetURL.path]);
-        [dataStore _setUseITPDatabase:false completionHandler: ^(void) {
-            doneFlag = true;
-        }];
-        TestWebKitAPI::Util::run(&doneFlag);
+    }
     TestWebKitAPI::Util::run(&callbackFlag);
+}
+TEST(ResourceLoadStatistics, ShouldNotGrandfatherOnStartupDatabase)
+{
+TEST(ResourceLoadStatistics, ChildProcessesNotLaunchedDatabase)
+{
+    // Ensure the shared process pool exists so the data store operations we're about to do work with it.
+    WKProcessPool *sharedProcessPool = [WKProcessPool _sharedProcessPool];
+    EXPECT_EQ((size_t)0, [sharedProcessPool _pluginProcessCount]);
     auto *dataStore = [WKWebsiteDataStore defaultDataStore];
+    NSURL *statisticsDirectoryURL = [NSURL fileURLWithPath:[@"~/Library/WebKit/com.apple.WebKit.TestWebKitAPI/WebsiteData/ResourceLoadStatistics" stringByExpandingTildeInPath] isDirectory:YES];
+    NSURL *targetURL = [statisticsDirectoryURL URLByAppendingPathComponent:@"observations.db"];
     ensureITPFileIsCreated();
+    static bool callbackFlag;
+    static bool doneFlag;
+    __block bool callbackFlag = false;
     [dataStore _setResourceLoadStatisticsTestingCallback:^(WKWebsiteDataStore *, NSString *message) {
         // Only if the database store is default-enabled do we need to check that this first message is correct.
+        if (isITPDatabaseEnabled())
+            ASSERT_TRUE([message isEqualToString:@"PopulatedWithoutGrandfathering"]);
+        EXPECT_TRUE([message isEqualToString:@"PopulatedWithoutGrandfathering"]);
         callbackFlag = true;
     }];
 …
     [dataStore _setResourceLoadStatisticsEnabled:YES];
     [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"about:blank"]]];
-    if (!isITPDatabaseEnabled()) {
-        TestWebKitAPI::Util::run(&callbackFlag);
-        // Since the database store is not enabled, we need to update the store to use a database instead of a plist for this test.
-        // We already have a NetworkProcess up and running with ITP enabled. We now make another call initializing
-        // the database store and testing grandfathering.
-        callbackFlag = false;
-        [dataStore _setResourceLoadStatisticsTestingCallback:^(WKWebsiteDataStore *, NSString *message) {
-            ASSERT_TRUE([message isEqualToString:@"PopulatedWithoutGrandfathering"]);
-            callbackFlag = true;
-        }];
-        ensureITPFileIsCreated();
-        [dataStore _setUseITPDatabase:true completionHandler: ^(void) {
-            doneFlag = true;
-        }];
-        TestWebKitAPI::Util::run(&doneFlag);
+    }
-    TestWebKitAPI::Util::run(&callbackFlag);
+}
-TEST(ResourceLoadStatistics, ChildProcessesNotLaunched)
+{
-    // Ensure the shared process pool exists so the data store operations we're about to do work with it.
-    WKProcessPool *sharedProcessPool = [WKProcessPool _sharedProcessPool];
-    EXPECT_EQ((size_t)0, [sharedProcessPool _pluginProcessCount]);
-    auto *dataStore = [WKWebsiteDataStore defaultDataStore];
-    NSURL *statisticsDirectoryURL = [NSURL fileURLWithPath:[@"~/Library/WebKit/com.apple.WebKit.TestWebKitAPI/WebsiteData/ResourceLoadStatistics" stringByExpandingTildeInPath] isDirectory:YES];
-    NSURL *targetURL = [statisticsDirectoryURL URLByAppendingPathComponent:@"full_browsing_session_resourceLog.plist"];
-    NSURL *testResourceURL = [[NSBundle mainBundle] URLForResource:@"EmptyGrandfatheredResourceLoadStatistics" withExtension:@"plist" subdirectory:@"TestWebKitAPI.resources"];
-    [[NSFileManager defaultManager] createDirectoryAtURL:statisticsDirectoryURL withIntermediateDirectories:YES attributes:nil error:nil];
-    [[NSFileManager defaultManager] copyItemAtURL:testResourceURL toURL:targetURL error:nil];
-    EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:targetURL.path]);
-    static bool callbackFlag;
-    static bool doneFlag;
-    [dataStore _setResourceLoadStatisticsTestingCallback:^(WKWebsiteDataStore *, NSString *message) {
-        // Only if the database store is not default-enabled do we need to check that this first message is correct.
-        if (!isITPDatabaseEnabled())
-            EXPECT_TRUE([message isEqualToString:@"PopulatedWithoutGrandfathering"]);
-        callbackFlag = true;
-    }];
-    // We need an active NetworkProcess to perform ResourceLoadStatistics operations.
-    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
-    [dataStore _setResourceLoadStatisticsEnabled:YES];
-    [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"about:blank"]]];
-    if (isITPDatabaseEnabled()) {
-        TestWebKitAPI::Util::run(&callbackFlag);
-        // Since the database store is enabled, we need to disable it to test this functionality with the plist.
-        // We already have a NetworkProcess up and running with ITP enabled. We now make another call initializing
-        // the memory store and testing grandfathering.
-        callbackFlag = false;
-        [dataStore _setResourceLoadStatisticsTestingCallback:^(WKWebsiteDataStore *, NSString *message) {
-            ASSERT_TRUE([message isEqualToString:@"PopulatedWithoutGrandfathering"]);
-            callbackFlag = true;
-        }];
-        // Since the ITP Database is enabled, the plist file has been deleted. We need to create it again.
-        [[NSFileManager defaultManager] createDirectoryAtURL:statisticsDirectoryURL withIntermediateDirectories:YES attributes:nil error:nil];
-        [[NSFileManager defaultManager] copyItemAtURL:testResourceURL toURL:targetURL error:nil];
-        EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:targetURL.path]);
-        [dataStore _setUseITPDatabase:false completionHandler: ^(void) {
-            doneFlag = true;
-        }];
-        TestWebKitAPI::Util::run(&doneFlag);
+    }
-    TestWebKitAPI::Util::run(&callbackFlag);
-    EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:targetURL.path]);
-    webView.clear();
-    EXPECT_EQ((size_t)0, [sharedProcessPool _pluginProcessCount]);
+}
-TEST(ResourceLoadStatistics, ChildProcessesNotLaunchedDatabase)
+{
-    // Ensure the shared process pool exists so the data store operations we're about to do work with it.
-    WKProcessPool *sharedProcessPool = [WKProcessPool _sharedProcessPool];
-    EXPECT_EQ((size_t)0, [sharedProcessPool _pluginProcessCount]);
-    auto *dataStore = [WKWebsiteDataStore defaultDataStore];
-    NSURL *statisticsDirectoryURL = [NSURL fileURLWithPath:[@"~/Library/WebKit/com.apple.WebKit.TestWebKitAPI/WebsiteData/ResourceLoadStatistics" stringByExpandingTildeInPath] isDirectory:YES];
-    NSURL *targetURL = [statisticsDirectoryURL URLByAppendingPathComponent:@"observations.db"];
-    ensureITPFileIsCreated();
-    static bool callbackFlag;
-    static bool doneFlag;
-    [dataStore _setResourceLoadStatisticsTestingCallback:^(WKWebsiteDataStore *, NSString *message) {
-        // Only if the database store is default-enabled do we need to check that this first message is correct.
-        if (isITPDatabaseEnabled())
-            EXPECT_TRUE([message isEqualToString:@"PopulatedWithoutGrandfathering"]);
-        callbackFlag = true;
-    }];
-    // We need an active NetworkProcess to perform ResourceLoadStatistics operations.
-    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
-    [dataStore _setResourceLoadStatisticsEnabled:YES];
-    [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"about:blank"]]];
-    if (!isITPDatabaseEnabled()) {
-        TestWebKitAPI::Util::run(&callbackFlag);
-        // Since the database store is not enabled, we need to update the store to use a database instead of a plist for this test.
-        // We already have a NetworkProcess up and running with ITP enabled. We now make another call initializing
-        // the database store and testing grandfathering.
-        callbackFlag = false;
-        [dataStore _setResourceLoadStatisticsTestingCallback:^(WKWebsiteDataStore *, NSString *message) {
-            ASSERT_TRUE([message isEqualToString:@"PopulatedWithoutGrandfathering"]);
-            callbackFlag = true;
-        }];
-        ensureITPFileIsCreated();
-        [dataStore _setUseITPDatabase:true completionHandler: ^(void) {
-            doneFlag = true;
-        }];
-        TestWebKitAPI::Util::run(&doneFlag);
+    }
     TestWebKitAPI::Util::run(&callbackFlag);
 …
     [dataStore _setResourceLoadStatisticsEnabled:YES];
+    static bool doneFlag = false;
+    [dataStore _setUseITPDatabase:false completionHandler: ^(void) {
+        doneFlag = true;
+    }];
+    TestWebKitAPI::Util::run(&doneFlag);
+    doneFlag = false;
+    __block bool doneFlag = false;
     [dataStore _clearResourceLoadStatistics:^(void) {
         doneFlag = true;
 …
     [dataStore _setResourceLoadStatisticsEnabled:YES];
+    static bool doneFlag = false;
+    [dataStore _setUseITPDatabase:true completionHandler: ^(void) {
+        doneFlag = true;
+    }];
+    TestWebKitAPI::Util::run(&doneFlag);
+    doneFlag = false;
+    __block bool doneFlag = false;
     [dataStore _setThirdPartyCookieBlockingMode:true onlyOnSitesWithoutUserInteraction:false completionHandler: ^(void) {
         doneFlag = true;
 …
     [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"about:blank"]]];
+    static bool doneFlag;
+    [dataStore _setUseITPDatabase:true completionHandler: ^(void) {
+        doneFlag = true;
+    }];
+    TestWebKitAPI::Util::run(&doneFlag);
+    __block bool doneFlag = false;
     // Check that the pre-seeded data is in the new database after migrating.
-    doneFlag = false;
     [dataStore _isRegisteredAsSubresourceUnderFirstParty:[NSURL URLWithString:@"http://apple.com"] thirdParty:[NSURL URLWithString:@"http://webkit.org"] completionHandler: ^(BOOL isRegistered) {
         EXPECT_TRUE(isRegistered);
 …
     [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"about:blank"]]];
+    static bool doneFlag;
+    [dataStore _setUseITPDatabase:true completionHandler: ^(void) {
+        doneFlag = true;
+    }];
+    TestWebKitAPI::Util::run(&doneFlag);
+    __block bool doneFlag = false;
     // Since the database should not be deleted, the pre-seeded data should
     // still be there after initializing ITP.
-    doneFlag = false;
     [dataStore _isRegisteredAsSubresourceUnderFirstParty:[NSURL URLWithString:@"http://apple.com"] thirdParty:[NSURL URLWithString:@"http://webkit.org"] completionHandler: ^(BOOL isRegistered) {
         EXPECT_TRUE(isRegistered);
 …
     [dataStore2 _setResourceLoadStatisticsEnabled:YES];
-    static bool doneFlag = false;
-    [dataStore1 _setUseITPDatabase:true completionHandler: ^(void) {
-        doneFlag = true;
-    }];
-    TestWebKitAPI::Util::run(&doneFlag);
-    doneFlag = false;
-    [dataStore2 _setUseITPDatabase:true completionHandler: ^(void) {
-        doneFlag = true;
-    }];
-    TestWebKitAPI::Util::run(&doneFlag);
     auto configuration1 = adoptNS([[WKWebViewConfiguration alloc] init]);
     [configuration1 setProcessPool: sharedProcessPool];
 …
     [webView2 _test_waitForDidFinishNavigation];
     doneFlag = false;
+    __block bool doneFlag = false;
     [sharedProcessPool _sendNetworkProcessPrepareToSuspend:^{
         doneFlag = true;

trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl

r266311	r267750
318	318	undefined setStatisticsGrandfathered(DOMString hostName, boolean value);
319	319	boolean isStatisticsGrandfathered(DOMString hostName);
320		~~undefined setUseITPDatabase(boolean value);~~
321	320	undefined setStatisticsSubframeUnderTopFrameOrigin(DOMString hostName, DOMString topFrameHostName);
322	321	undefined setStatisticsSubresourceUnderTopFrameOrigin(DOMString hostName, DOMString topFrameHostName);

trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp

-              r266228
+              r267750
+}
-void TestRunner::setUseITPDatabase(bool value)
+{
-    WKRetainPtr<WKStringRef> messageName = adoptWK(WKStringCreateWithUTF8CString("SetUseITPDatabase"));
-    WKRetainPtr<WKBooleanRef> messageBody = adoptWK(WKBooleanCreate(value));
-    WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), messageName.get(), messageBody.get(), nullptr);
+}
 bool TestRunner::isStatisticsGrandfathered(JSStringRef hostName)
+{

trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h

r266228	r267750
423	423	void setStatisticsGrandfathered(JSStringRef hostName, bool value);
424	424	bool isStatisticsGrandfathered(JSStringRef hostName);
425		~~void setUseITPDatabase(bool value);~~
426	425	void setStatisticsSubframeUnderTopFrameOrigin(JSStringRef hostName, JSStringRef topFrameHostName);
427	426	void setStatisticsSubresourceUnderTopFrameOrigin(JSStringRef hostName, JSStringRef topFrameHostName);

trunk/Tools/WebKitTestRunner/TestController.cpp

-              r267618
+              r267750
+}
-void TestController::setUseITPDatabase(bool value)
+{
-    ResourceStatisticsCallbackContext context(*this);
-    WKWebsiteDataStoreSetUseITPDatabase(websiteDataStore(), value, &context, resourceStatisticsVoidResultCallback);
-    runUntil(context.done, noTimeout);
+}
 void TestController::setStatisticsSubframeUnderTopFrameOrigin(WKStringRef host, WKStringRef topFrameHost)
+{

trunk/Tools/WebKitTestRunner/TestController.h

r266743	r267750
237	237	void setStatisticsGrandfathered(WKStringRef hostName, bool value);
238	238	bool isStatisticsGrandfathered(WKStringRef hostName);
239		~~void setUseITPDatabase(bool value);~~
240	239	void setStatisticsSubframeUnderTopFrameOrigin(WKStringRef hostName, WKStringRef topFrameHostName);
241	240	void setStatisticsSubresourceUnderTopFrameOrigin(WKStringRef hostName, WKStringRef topFrameHostName);

trunk/Tools/WebKitTestRunner/TestInvocation.cpp

-              r267030
+              r267750
         return result;
+    }
-    if (WKStringIsEqualToUTF8CString(messageName, "SetUseITPDatabase")) {
-        ASSERT(WKGetTypeID(messageBody) == WKBooleanGetTypeID());
-        WKBooleanRef value = static_cast<WKBooleanRef>(messageBody);
-        TestController::singleton().setUseITPDatabase(WKBooleanGetValue(value));
-        return nullptr;
+    }
     if (WKStringIsEqualToUTF8CString(messageName, "SetStatisticsSubframeUnderTopFrameOrigin")) {

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 267750 in webkit

Legend:

Download in other formats: