Commit d32ae215 authored by Matt Falkenhagen's avatar Matt Falkenhagen Committed by Commit Bot

service worker: Prepare more clear site data tests for UI thread core.

The thread ServiceWorkerContextCore lives on (the "core thread")
will move from the IO thread to the UI thread.

This CL enables the following to pass when ServiceWorkerOnUI is enabled:
- SameSiteDataRemoverBrowserTest.TestClearDataWithStorageRemoval
- SameSiteDataRemoverBrowserTest.TestClearDataWithoutStorageRemoval

Bug: 824858
Change-Id: Iaace639ff7425d4c933d18c5662cd67024790fe4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1763351Reviewed-by: default avatarChristian Dullweber <dullweber@chromium.org>
Commit-Queue: Matt Falkenhagen <falken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#688922}
parent 5532614a
...@@ -145,8 +145,8 @@ class SameSiteDataRemoverBrowserTest : public ContentBrowserTest { ...@@ -145,8 +145,8 @@ class SameSiteDataRemoverBrowserTest : public ContentBrowserTest {
blink::mojom::ServiceWorkerRegistrationOptions options( blink::mojom::ServiceWorkerRegistrationOptions options(
scope_url, blink::mojom::ScriptType::kClassic, scope_url, blink::mojom::ScriptType::kClassic,
blink::mojom::ServiceWorkerUpdateViaCache::kImports); blink::mojom::ServiceWorkerUpdateViaCache::kImports);
base::PostTask( RunOrPostTaskOnThread(
FROM_HERE, {BrowserThread::IO}, FROM_HERE, ServiceWorkerContextWrapper::GetCoreThreadId(),
base::BindOnce( base::BindOnce(
&ServiceWorkerContextWrapper::RegisterServiceWorker, &ServiceWorkerContextWrapper::RegisterServiceWorker,
base::Unretained(service_worker_context), js_url, options, base::Unretained(service_worker_context), js_url, options,
...@@ -156,8 +156,8 @@ class SameSiteDataRemoverBrowserTest : public ContentBrowserTest { ...@@ -156,8 +156,8 @@ class SameSiteDataRemoverBrowserTest : public ContentBrowserTest {
// Wait for its activation. // Wait for its activation.
base::RunLoop run_loop; base::RunLoop run_loop;
base::PostTask( RunOrPostTaskOnThread(
FROM_HERE, {BrowserThread::IO}, FROM_HERE, ServiceWorkerContextWrapper::GetCoreThreadId(),
base::BindOnce(&ServiceWorkerActivationObserver::SignalActivation, base::BindOnce(&ServiceWorkerActivationObserver::SignalActivation,
base::Unretained(service_worker_context), base::Unretained(service_worker_context),
run_loop.QuitClosure())); run_loop.QuitClosure()));
...@@ -174,8 +174,8 @@ class SameSiteDataRemoverBrowserTest : public ContentBrowserTest { ...@@ -174,8 +174,8 @@ class SameSiteDataRemoverBrowserTest : public ContentBrowserTest {
std::vector<StorageUsageInfo> service_workers; std::vector<StorageUsageInfo> service_workers;
base::RunLoop run_loop; base::RunLoop run_loop;
base::PostTask( RunOrPostTaskOnThread(
FROM_HERE, {BrowserThread::IO}, FROM_HERE, ServiceWorkerContextWrapper::GetCoreThreadId(),
base::BindOnce( base::BindOnce(
&ServiceWorkerContextWrapper::GetAllOriginsInfo, &ServiceWorkerContextWrapper::GetAllOriginsInfo,
base::Unretained(service_worker_context), base::Unretained(service_worker_context),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment