Commit 9b5472b6 authored by Matt Falkenhagen's avatar Matt Falkenhagen Committed by Commit Bot

service worker: Prepare clear site data test 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 ClearSiteDataHandlerBrowserTest.StorageServiceWorkersIntegrationTest
to pass when ServiceWorkerOnUI is enabled.

Bug: 824858
Change-Id: Icde4c1b6dea04e66a4fe282c80ea74cf824e53e4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1763275Reviewed-by: default avatarChristian Dullweber <dullweber@chromium.org>
Commit-Queue: Matt Falkenhagen <falken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#688915}
parent 2ef9c43e
...@@ -262,8 +262,8 @@ class ClearSiteDataHandlerBrowserTest : public ContentBrowserTest { ...@@ -262,8 +262,8 @@ class ClearSiteDataHandlerBrowserTest : 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,
...@@ -273,8 +273,8 @@ class ClearSiteDataHandlerBrowserTest : public ContentBrowserTest { ...@@ -273,8 +273,8 @@ class ClearSiteDataHandlerBrowserTest : 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()));
...@@ -292,8 +292,8 @@ class ClearSiteDataHandlerBrowserTest : public ContentBrowserTest { ...@@ -292,8 +292,8 @@ class ClearSiteDataHandlerBrowserTest : 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