Prepare BrowsingDataServiceWorkerHelper for UI thread core.

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

This makes BrowsingDataServiceWorkerHelper aware of the core thread
rather than assuming the IO thread. This enables unit_test
"CannedBrowsingDataServiceWorkerHelperTest.*" to pass.

Bug: 824858
Change-Id: I6c7e7db1bb0c5f7b9691fef51947304280ad3143
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1795528Reviewed-by: Martin Šrámek <msramek@chromium.org>
Commit-Queue: Matt Falkenhagen <falken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695141}

chrome/browser/browsing_data/browsing_data_service_worker_helper.cc

@@ -27,7 +27,7 @@ namespace {
 void GetAllOriginsInfoForServiceWorkerCallback(
     BrowsingDataServiceWorkerHelper::FetchCallback callback,
     const std::vector<StorageUsageInfo>& origins) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId());
   DCHECK(!callback.is_null());
 
   std::list<StorageUsageInfo> result;
@@ -37,8 +37,8 @@ void GetAllOriginsInfoForServiceWorkerCallback(
     result.push_back(origin);
   }
 
-  base::PostTask(FROM_HERE, {BrowserThread::UI},
-                 base::BindOnce(std::move(callback), result));
+  content::RunOrPostTaskOnThread(FROM_HERE, BrowserThread::UI,
+                                 base::BindOnce(std::move(callback), result));
 }
 
 }  // namespace
@@ -54,33 +54,34 @@ BrowsingDataServiceWorkerHelper::~BrowsingDataServiceWorkerHelper() {}
 void BrowsingDataServiceWorkerHelper::StartFetching(FetchCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!callback.is_null());
-  base::PostTask(FROM_HERE, {BrowserThread::IO},
-                 base::BindOnce(&BrowsingDataServiceWorkerHelper::
-                                    FetchServiceWorkerUsageInfoOnIOThread,
-                                this, std::move(callback)));
+  content::RunOrPostTaskOnThread(
+      FROM_HERE, ServiceWorkerContext::GetCoreThreadId(),
+      base::BindOnce(&BrowsingDataServiceWorkerHelper::
+                         FetchServiceWorkerUsageInfoOnCoreThread,
+                     this, std::move(callback)));
 }
 
 void BrowsingDataServiceWorkerHelper::DeleteServiceWorkers(const GURL& origin) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  base::PostTask(
-      FROM_HERE, {BrowserThread::IO},
+  content::RunOrPostTaskOnThread(
+      FROM_HERE, ServiceWorkerContext::GetCoreThreadId(),
       base::BindOnce(
-          &BrowsingDataServiceWorkerHelper::DeleteServiceWorkersOnIOThread,
+          &BrowsingDataServiceWorkerHelper::DeleteServiceWorkersOnCoreThread,
           this, origin));
 }
 
-void BrowsingDataServiceWorkerHelper::FetchServiceWorkerUsageInfoOnIOThread(
+void BrowsingDataServiceWorkerHelper::FetchServiceWorkerUsageInfoOnCoreThread(
     FetchCallback callback) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId());
   DCHECK(!callback.is_null());
 
   service_worker_context_->GetAllOriginsInfo(base::BindOnce(
       &GetAllOriginsInfoForServiceWorkerCallback, std::move(callback)));
 }
 
-void BrowsingDataServiceWorkerHelper::DeleteServiceWorkersOnIOThread(
+void BrowsingDataServiceWorkerHelper::DeleteServiceWorkersOnCoreThread(
     const GURL& origin) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId());
   service_worker_context_->DeleteForOrigin(origin, base::DoNothing());
 }
 

chrome/browser/browsing_data/browsing_data_service_worker_helper.h

@@ -54,11 +54,11 @@ class BrowsingDataServiceWorkerHelper
  private:
   friend class base::RefCountedThreadSafe<BrowsingDataServiceWorkerHelper>;
 
-  // Enumerates all Service Worker instances on the IO thread.
-  void FetchServiceWorkerUsageInfoOnIOThread(FetchCallback callback);
+  // Enumerates all Service Worker instances on the service worker core thread.
+  void FetchServiceWorkerUsageInfoOnCoreThread(FetchCallback callback);
 
-  // Deletes Service Workers for an origin the IO thread.
-  void DeleteServiceWorkersOnIOThread(const GURL& origin);
+  // Deletes Service Workers for an origin on the service worker core thread.
+  void DeleteServiceWorkersOnCoreThread(const GURL& origin);
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataServiceWorkerHelper);
 };