content/browser/service_worker: Always specify thread affinity when posting tasks

*** Note: There is no behavior change from this patch. ***

The PostTask APIs will shortly be changed to require all tasks to explicitly
specify their thread affinity, i.e., whether the task should run on the thread
pool or a specific named thread such as a BrowserThread. This patch updates all
call sites with thread affinity annotation. We also remove the "WithTraits"
suffix to make the call sites more readable.

Before:

    // Thread pool task.
    base::PostTaskWithTraits(FROM_HERE, {...}, ...);

    // UI thread task.
    base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI, ...}, ...);

After:

    // Thread pool task.
    base::PostTask(FROM_HERE, {base::ThreadPool(), ...}, ...);

    // UI thread task.
    base::PostTask(FROM_HERE, {BrowserThread::UI, ...}, ...);

This patch was semi-automatically prepared with these steps:

    1. Patch in https://chromium-review.googlesource.com/c/chromium/src/+/1635827
       to make thread affinity a build-time requirement.
    2. Run an initial pass with a clang rewriter:
       https://chromium-review.googlesource.com/c/chromium/src/+/1635623
    3. ninja -C out/Debug | grep 'requested here' | cut -d: -f1-3 | sort | \
           uniq > errors.txt
    4. while read line; do
         f=$(echo $line | cut -d: -f 1)
         r=$(echo $line | cut -d: -f 2)
         c=$(echo $line | cut -d: -f 3)
         sed -i "${r}s/./&base::ThreadPool(),/$c" $f
       done < errors.txt
    5. GOTO 3 until build succeeds.
    6. Remove the "WithTraits" suffix from task API call sites:

       $ tools/git/mffr.py -i <(cat <<EOF
       [
         ["PostTaskWithTraits",                            "PostTask"],
         ["PostDelayedTaskWithTraits",                     "PostDelayedTask"],
         ["PostTaskWithTraitsAndReply",                    "PostTaskAndReply"],
         ["CreateTaskRunnerWithTraits",                    "CreateTaskRunner"],
         ["CreateSequencedTaskRunnerWithTraits",           "CreateSequencedTaskRunner"],
         ["CreateUpdateableSequencedTaskRunnerWithTraits", "CreateUpdateableSequencedTaskRunner"],
         ["CreateSingleThreadTaskRunnerWithTraits",        "CreateSingleThreadTaskRunner"],
         ["CreateCOMSTATaskRunnerWithTraits",              "CreateCOMSTATaskRunner"]
       ]
       EOF
       )

This CL was uploaded by git cl split.

R=falken@chromium.org

Bug: 968047
Change-Id: Iffe135d54c238ed7be67fe9bc1bdade9d050ee2f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1728666
Commit-Queue: Sami Kyöstilä <skyostil@chromium.org>
Auto-Submit: Sami Kyöstilä <skyostil@chromium.org>
Reviewed-by: Makoto Shimazu <shimazu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#683230}

content/browser/service_worker/embedded_worker_instance.cc

@@ -137,15 +137,15 @@ void SetupOnUIThread(int embedded_worker_id,
       factory_bundle_for_renderer;
 
   if (!process_manager) {
-    base::PostTaskWithTraits(
-        FROM_HERE, {BrowserThread::IO},
-        base::BindOnce(
-            std::move(callback), blink::ServiceWorkerStatusCode::kErrorAbort,
-            std::move(params), std::move(process_info),
-            std::move(devtools_proxy),
-            std::move(factory_bundle_for_new_scripts),
-            std::move(factory_bundle_for_renderer), nullptr /* cache_storage */,
-            thread_hop_time, base::Time::Now()));
+    base::PostTask(FROM_HERE, {BrowserThread::IO},
+                   base::BindOnce(std::move(callback),
+                                  blink::ServiceWorkerStatusCode::kErrorAbort,
+                                  std::move(params), std::move(process_info),
+                                  std::move(devtools_proxy),
+                                  std::move(factory_bundle_for_new_scripts),
+                                  std::move(factory_bundle_for_renderer),
+                                  nullptr /* cache_storage */, thread_hop_time,
+                                  base::Time::Now()));
     return;
   }
 
@@ -155,7 +155,7 @@ void SetupOnUIThread(int embedded_worker_id,
           embedded_worker_id, params->script_url, can_use_existing_process,
           process_info.get());
   if (status != blink::ServiceWorkerStatusCode::kOk) {
-    base::PostTaskWithTraits(
+    base::PostTask(
         FROM_HERE, {BrowserThread::IO},
         base::BindOnce(std::move(callback), status, std::move(params),
                        std::move(process_info), std::move(devtools_proxy),
@@ -245,7 +245,7 @@ void SetupOnUIThread(int embedded_worker_id,
       process_manager->browser_context(), std::move(watcher_ptr));
 
   // Continue to OnSetupCompleted on the IO thread.
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::IO},
       base::BindOnce(std::move(callback), status, std::move(params),
                      std::move(process_info), std::move(devtools_proxy),
@@ -296,8 +296,7 @@ class EmbeddedWorkerInstance::DevToolsProxy {
   DevToolsProxy(int process_id, int agent_route_id)
       : process_id_(process_id),
         agent_route_id_(agent_route_id),
-        ui_task_runner_(
-            base::CreateSequencedTaskRunnerWithTraits({BrowserThread::UI})) {}
+        ui_task_runner_(base::CreateSequencedTaskRunner({BrowserThread::UI})) {}
 
   ~DevToolsProxy() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ -741,8 +740,7 @@ EmbeddedWorkerInstance::EmbeddedWorkerInstance(
       devtools_attached_(false),
       network_accessed_for_script_(false),
       foreground_notified_(false),
-      ui_task_runner_(
-          base::CreateSequencedTaskRunnerWithTraits({BrowserThread::UI})) {
+      ui_task_runner_(base::CreateSequencedTaskRunner({BrowserThread::UI})) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(context_);
 }

content/browser/service_worker/payment_handler_support.cc

@@ -50,7 +50,7 @@ class ShowPaymentHandlerWindowReplier {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     if (response_callback_) {
       DCHECK(fallback_);
-      base::PostTaskWithTraits(
+      base::PostTask(
           FROM_HERE, {BrowserThread::IO},
           base::BindOnce(std::move(fallback_), std::move(response_callback_)));
     }
@@ -58,7 +58,7 @@ class ShowPaymentHandlerWindowReplier {
 
   void Run(bool success, int render_process_id, int render_frame_id) {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
-    base::PostTaskWithTraits(
+    base::PostTask(
         FROM_HERE, {BrowserThread::IO},
         base::BindOnce(std::move(callback_), std::move(response_callback_),
                        success, render_process_id, render_frame_id));
@@ -100,12 +100,11 @@ void PaymentHandlerSupport::ShowPaymentHandlerWindow(
         response_callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(context);
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::UI},
-      base::BindOnce(&ShowPaymentHandlerWindowOnUI,
-                     base::WrapRefCounted(context->wrapper()), url,
-                     std::move(callback), std::move(fallback),
-                     std::move(response_callback)));
+  base::PostTask(FROM_HERE, {BrowserThread::UI},
+                 base::BindOnce(&ShowPaymentHandlerWindowOnUI,
+                                base::WrapRefCounted(context->wrapper()), url,
+                                std::move(callback), std::move(fallback),
+                                std::move(response_callback)));
 }
 
 }  // namespace content

content/browser/service_worker/service_worker_client_utils.cc

@@ -99,10 +99,9 @@ class OpenURLObserver : public WebContentsObserver {
     DCHECK(web_contents());
     DCHECK(callback_);
 
-    base::PostTaskWithTraits(
-        FROM_HERE, {BrowserThread::IO},
-        base::BindOnce(std::move(callback_), render_process_id,
-                       render_frame_id));
+    base::PostTask(FROM_HERE, {BrowserThread::IO},
+                   base::BindOnce(std::move(callback_), render_process_id,
+                                  render_frame_id));
     Observe(nullptr);
     base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
   }
@@ -176,7 +175,7 @@ void DidOpenURLOnUI(WindowType type,
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (!web_contents) {
-    base::PostTaskWithTraits(
+    base::PostTask(
         FROM_HERE, {BrowserThread::IO},
         base::BindOnce(std::move(callback), ChildProcessHost::kInvalidUniqueID,
                        MSG_ROUTING_NONE));
@@ -216,7 +215,7 @@ void OpenWindowOnUI(
   RenderProcessHost* render_process_host =
       RenderProcessHost::FromID(worker_process_id);
   if (render_process_host->IsForGuestsOnly()) {
-    base::PostTaskWithTraits(
+    base::PostTask(
         FROM_HERE, {BrowserThread::IO},
         base::BindOnce(std::move(callback), ChildProcessHost::kInvalidUniqueID,
                        MSG_ROUTING_NONE));
@@ -227,7 +226,7 @@ void OpenWindowOnUI(
       context_wrapper->process_manager()->GetSiteInstanceForWorker(worker_id);
   if (!site_instance) {
     // Worker isn't running anymore. Fail.
-    base::PostTaskWithTraits(
+    base::PostTask(
         FROM_HERE, {BrowserThread::IO},
         base::BindOnce(std::move(callback), ChildProcessHost::kInvalidUniqueID,
                        MSG_ROUTING_NONE));
@@ -277,7 +276,7 @@ void NavigateClientOnUI(const GURL& url,
   WebContents* web_contents = WebContents::FromRenderFrameHost(rfhi);
 
   if (!rfhi || !web_contents) {
-    base::PostTaskWithTraits(
+    base::PostTask(
         FROM_HERE, {BrowserThread::IO},
         base::BindOnce(std::move(callback), ChildProcessHost::kInvalidUniqueID,
                        MSG_ROUTING_NONE));
@@ -291,7 +290,7 @@ void NavigateClientOnUI(const GURL& url,
       rfhi->frame_tree_node()->frame_tree()->root()->navigation_request();
   if (ongoing_navigation_request &&
       ongoing_navigation_request->browser_initiated()) {
-    base::PostTaskWithTraits(
+    base::PostTask(
         FROM_HERE, {BrowserThread::IO},
         base::BindOnce(std::move(callback), ChildProcessHost::kInvalidUniqueID,
                        MSG_ROUTING_NONE));
@@ -378,9 +377,8 @@ void OnGetWindowClientsOnUI(
     out_clients->push_back(std::move(info));
   }
 
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
-      base::BindOnce(std::move(callback), std::move(out_clients)));
+  base::PostTask(FROM_HERE, {BrowserThread::IO},
+                 base::BindOnce(std::move(callback), std::move(out_clients)));
 }
 
 struct ServiceWorkerClientInfoSort {
@@ -478,7 +476,7 @@ void GetWindowClients(const base::WeakPtr<ServiceWorkerVersion>& controller,
     return;
   }
 
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(&OnGetWindowClientsOnUI, clients_info,
                      controller->script_url(),
@@ -512,7 +510,7 @@ void DidGetExecutionReadyClient(
 
   CHECK_EQ(provider_host->url().GetOrigin(), sane_origin);
 
-  base::PostTaskWithTraitsAndReplyWithResult(
+  base::PostTaskAndReplyWithResult(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(&GetWindowClientInfoOnUI, provider_host->process_id(),
                      provider_host->frame_id(), provider_host->create_time(),
@@ -527,7 +525,7 @@ void FocusWindowClient(ServiceWorkerProviderHost* provider_host,
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK_EQ(blink::mojom::ServiceWorkerClientType::kWindow,
             provider_host->client_type());
-  base::PostTaskWithTraitsAndReplyWithResult(
+  base::PostTaskAndReplyWithResult(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(&FocusOnUI, provider_host->process_id(),
                      provider_host->frame_id(), provider_host->create_time(),
@@ -543,7 +541,7 @@ void OpenWindow(const GURL& url,
                 WindowType type,
                 NavigationCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(
           &OpenWindowOnUI, url, script_url, worker_id, worker_process_id,
@@ -559,7 +557,7 @@ void NavigateClient(const GURL& url,
                     const base::WeakPtr<ServiceWorkerContextCore>& context,
                     NavigationCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(
           &NavigateClientOnUI, url, script_url, process_id, frame_id,
@@ -580,7 +578,7 @@ void GetClient(const ServiceWorkerProviderHost* provider_host,
       << client_type;
 
   if (client_type == blink::mojom::ServiceWorkerClientType::kWindow) {
-    base::PostTaskWithTraitsAndReplyWithResult(
+    base::PostTaskAndReplyWithResult(
         FROM_HERE, {BrowserThread::UI},
         base::BindOnce(&GetWindowClientInfoOnUI, provider_host->process_id(),
                        provider_host->frame_id(), provider_host->create_time(),
@@ -594,9 +592,8 @@ void GetClient(const ServiceWorkerProviderHost* provider_host,
       provider_host->client_uuid(), provider_host->client_type(),
       /*page_hidden=*/true,
       /*is_focused=*/false, base::TimeTicks(), provider_host->create_time());
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
-      base::BindOnce(std::move(callback), std::move(client_info)));
+  base::PostTask(FROM_HERE, {BrowserThread::IO},
+                 base::BindOnce(std::move(callback), std::move(client_info)));
 }
 
 void GetClients(const base::WeakPtr<ServiceWorkerVersion>& controller,

content/browser/service_worker/service_worker_clients_api_browsertest.cc

@@ -141,12 +141,11 @@ class ServiceWorkerClientsApiBrowserTest : public ContentBrowserTest {
 
   void DispatchNotificationClickEvent(int64_t version_id) {
     base::RunLoop run_loop;
-    base::PostTaskWithTraits(
-        FROM_HERE, {BrowserThread::IO},
-        base::BindOnce(&ServiceWorkerClientsApiBrowserTest::
-                           DispatchNotificationClickEventOnIOThread,
-                       base::Unretained(this), version_id,
-                       run_loop.QuitClosure()));
+    base::PostTask(FROM_HERE, {BrowserThread::IO},
+                   base::BindOnce(&ServiceWorkerClientsApiBrowserTest::
+                                      DispatchNotificationClickEventOnIOThread,
+                                  base::Unretained(this), version_id,
+                                  run_loop.QuitClosure()));
     run_loop.Run();
   }
 

content/browser/service_worker/service_worker_context_core.cc

@@ -193,8 +193,7 @@ class ClearAllServiceWorkersHelper
   friend class base::RefCounted<ClearAllServiceWorkersHelper>;
   ~ClearAllServiceWorkersHelper() {
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
-    base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
-                             std::move(callback_));
+    base::PostTask(FROM_HERE, {BrowserThread::UI}, std::move(callback_));
   }
 
   base::OnceClosure callback_;
@@ -360,7 +359,7 @@ void ServiceWorkerContextCore::HasMainFrameProviderHost(
     provider_host_iterator.Advance();
   }
 
-  base::PostTaskWithTraitsAndReplyWithResult(
+  base::PostTaskAndReplyWithResult(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(&FrameListContainsMainFrameOnUI, std::move(render_frames)),
       std::move(callback));

content/browser/service_worker/service_worker_context_watcher.cc

@@ -43,7 +43,7 @@ ServiceWorkerContextWatcher::ServiceWorkerContextWatcher(
 
 void ServiceWorkerContextWatcher::Start() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::IO},
       base::BindOnce(
           &ServiceWorkerContextWatcher::GetStoredRegistrationsOnIOThread,
@@ -53,7 +53,7 @@ void ServiceWorkerContextWatcher::Start() {
 void ServiceWorkerContextWatcher::Stop() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   stop_called_ = true;
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::IO},
       base::BindOnce(&ServiceWorkerContextWatcher::StopOnIOThread, this));
 }
@@ -102,12 +102,12 @@ void ServiceWorkerContextWatcher::OnStoredRegistrationsOnIOThread(
       ++version_it;
   }
 
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(
           &ServiceWorkerContextWatcher::RunWorkerRegistrationUpdatedCallback,
           this, std::move(registrations)));
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(
           &ServiceWorkerContextWatcher::RunWorkerVersionUpdatedCallback, this,
@@ -162,7 +162,7 @@ void ServiceWorkerContextWatcher::SendRegistrationInfo(
     registrations->push_back(
         ServiceWorkerRegistrationInfo(scope, registration_id, delete_flag));
   }
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(
           &ServiceWorkerContextWatcher::RunWorkerRegistrationUpdatedCallback,
@@ -175,7 +175,7 @@ void ServiceWorkerContextWatcher::SendVersionInfo(
   std::unique_ptr<std::vector<ServiceWorkerVersionInfo>> versions =
       std::make_unique<std::vector<ServiceWorkerVersionInfo>>();
   versions->push_back(version_info);
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(
           &ServiceWorkerContextWatcher::RunWorkerVersionUpdatedCallback, this,
@@ -307,7 +307,7 @@ void ServiceWorkerContextWatcher::OnErrorReported(int64_t version_id,
   auto it = version_info_map_.find(version_id);
   if (it != version_info_map_.end())
     registration_id = it->second->registration_id;
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(
           &ServiceWorkerContextWatcher::RunWorkerErrorReportedCallback, this,
@@ -325,7 +325,7 @@ void ServiceWorkerContextWatcher::OnReportConsoleMessage(
   if (it != version_info_map_.end())
     registration_id = it->second->registration_id;
 
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(
           &ServiceWorkerContextWatcher::RunWorkerErrorReportedCallback, this,

content/browser/service_worker/service_worker_fetch_dispatcher.cc

@@ -181,10 +181,9 @@ class DelegatingURLLoaderClient final : public network::mojom::URLLoaderClient {
     if (!worker_id_ || !devtools_enabled_)
       return;
     while (!devtools_callbacks.empty()) {
-      base::PostTaskWithTraits(
-          FROM_HERE, {BrowserThread::UI},
-          base::BindOnce(std::move(devtools_callbacks.front()), *worker_id_,
-                         devtools_request_id_));
+      base::PostTask(FROM_HERE, {BrowserThread::UI},
+                     base::BindOnce(std::move(devtools_callbacks.front()),
+                                    *worker_id_, devtools_request_id_));
       devtools_callbacks.pop();
     }
   }
@@ -675,11 +674,10 @@ bool ServiceWorkerFetchDispatcher::MaybeStartNavigationPreload(
   network::mojom::URLLoaderFactoryPtr network_factory;
   auto factory_request = mojo::MakeRequest(&network_factory);
 
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::UI},
-      base::BindOnce(&CreateNetworkFactoryForNavigationPreloadOnUI,
-                     frame_tree_node_id, std::move(context_wrapper),
-                     mojo::MakeRequest(&network_factory)));
+  base::PostTask(FROM_HERE, {BrowserThread::UI},
+                 base::BindOnce(&CreateNetworkFactoryForNavigationPreloadOnUI,
+                                frame_tree_node_id, std::move(context_wrapper),
+                                mojo::MakeRequest(&network_factory)));
   factory = base::MakeRefCounted<network::WrapperSharedURLLoaderFactory>(
       std::move(network_factory));
 

content/browser/service_worker/service_worker_installed_scripts_sender_unittest.cc

@@ -44,10 +44,9 @@ void ReadDataPipeInternal(mojo::DataPipeConsumerHandle handle,
         std::move(quit_closure).Run();
         return;
       case MOJO_RESULT_SHOULD_WAIT:
-        base::PostTaskWithTraits(
-            FROM_HERE, {BrowserThread::IO},
-            base::BindOnce(&ReadDataPipeInternal, handle, result,
-                           std::move(quit_closure)));
+        base::PostTask(FROM_HERE, {BrowserThread::IO},
+                       base::BindOnce(&ReadDataPipeInternal, handle, result,
+                                      std::move(quit_closure)));
         return;
       case MOJO_RESULT_OK:
         EXPECT_NE(nullptr, buffer);

content/browser/service_worker/service_worker_internals_ui.cc

@@ -55,9 +55,9 @@ void OperationCompleteCallback(WeakPtr<ServiceWorkerInternalsUI> internals,
                                int callback_id,
                                blink::ServiceWorkerStatusCode status) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
-                             base::BindOnce(OperationCompleteCallback,
-                                            internals, callback_id, status));
+    base::PostTask(FROM_HERE, {BrowserThread::UI},
+                   base::BindOnce(OperationCompleteCallback, internals,
+                                  callback_id, status));
     return;
   }
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -206,7 +206,7 @@ void DidGetStoredRegistrationsOnIOThread(
     blink::ServiceWorkerStatusCode status,
     const std::vector<ServiceWorkerRegistrationInfo>& stored_registrations) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(std::move(callback), context->GetAllLiveRegistrationInfo(),
                      context->GetAllLiveVersionInfo(), stored_registrations));
@@ -419,7 +419,7 @@ void ServiceWorkerInternalsUI::AddContextFromStoragePartition(
         std::move(new_observer);
   }
 
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::IO},
       base::BindOnce(
           GetRegistrationsOnIOThread, context,
@@ -563,11 +563,10 @@ void ServiceWorkerInternalsUI::StopWorkerWithId(
     int64_t version_id,
     StatusCallback callback) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
-    base::PostTaskWithTraits(
-        FROM_HERE, {BrowserThread::IO},
-        base::BindOnce(&ServiceWorkerInternalsUI::StopWorkerWithId,
-                       base::Unretained(this), context, version_id,
-                       std::move(callback)));
+    base::PostTask(FROM_HERE, {BrowserThread::IO},
+                   base::BindOnce(&ServiceWorkerInternalsUI::StopWorkerWithId,
+                                  base::Unretained(this), context, version_id,
+                                  std::move(callback)));
     return;
   }
 
@@ -589,7 +588,7 @@ void ServiceWorkerInternalsUI::UnregisterWithScope(
     const GURL& scope,
     ServiceWorkerInternalsUI::StatusCallback callback) const {
   if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
-    base::PostTaskWithTraits(
+    base::PostTask(
         FROM_HERE, {BrowserThread::IO},
         base::BindOnce(&ServiceWorkerInternalsUI::UnregisterWithScope,
                        base::Unretained(this), context, scope,

content/browser/service_worker/service_worker_metrics.cc

@@ -319,10 +319,9 @@ void ServiceWorkerMetrics::CountControlledPageLoad(Site site,
   if (ShouldExcludeSiteFromHistogram(site))
     return;
 
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::UI},
-      base::BindOnce(&RecordURLMetricOnUI, "ServiceWorker.ControlledPageUrl",
-                     url));
+  base::PostTask(FROM_HERE, {BrowserThread::UI},
+                 base::BindOnce(&RecordURLMetricOnUI,
+                                "ServiceWorker.ControlledPageUrl", url));
 }
 
 void ServiceWorkerMetrics::RecordStartInstalledWorkerStatus(

content/browser/service_worker/service_worker_navigation_handle.cc

@@ -47,7 +47,7 @@ void ServiceWorkerNavigationHandle::OnBeginNavigationCommit(
   // We may have failed to pre-create the provider host.
   if (!provider_info_)
     return;
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::IO},
       base::BindOnce(
           &ServiceWorkerNavigationHandleCore::OnBeginNavigationCommit,
@@ -57,7 +57,7 @@ void ServiceWorkerNavigationHandle::OnBeginNavigationCommit(
 
 void ServiceWorkerNavigationHandle::OnBeginWorkerCommit() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::IO},
       base::BindOnce(&ServiceWorkerNavigationHandleCore::OnBeginWorkerCommit,
                      base::Unretained(core_)));

content/browser/service_worker/service_worker_navigation_handle_core.cc

@@ -37,7 +37,7 @@ void ServiceWorkerNavigationHandleCore::OnCreatedProviderHost(
 
   DCHECK(provider_info->host_ptr_info.is_valid() &&
          provider_info->client_request.is_pending());
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(&ServiceWorkerNavigationHandle::OnCreatedProviderHost,
                      ui_handle_, std::move(provider_info)));

content/browser/service_worker/service_worker_navigation_loader_interceptor.cc

@@ -41,13 +41,12 @@ void LoaderCallbackWrapperOnIO(
         handle_core->interceptor()->MaybeCreateSubresourceLoaderParams();
   }
 
-  PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::UI},
-      base::BindOnce(
-          &ServiceWorkerNavigationLoaderInterceptor::LoaderCallbackWrapper,
-          interceptor_on_ui, std::move(provider_info),
-          std::move(subresource_loader_params), std::move(loader_callback),
-          std::move(handler)));
+  PostTask(FROM_HERE, {BrowserThread::UI},
+           base::BindOnce(
+               &ServiceWorkerNavigationLoaderInterceptor::LoaderCallbackWrapper,
+               interceptor_on_ui, std::move(provider_info),
+               std::move(subresource_loader_params), std::move(loader_callback),
+               std::move(handler)));
 }
 
 void FallbackCallbackWrapperOnIO(
@@ -55,7 +54,7 @@ void FallbackCallbackWrapperOnIO(
     NavigationLoaderInterceptor::FallbackCallback fallback_callback,
     bool reset_subresource_loader_params) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  PostTaskWithTraits(
+  PostTask(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(
           &ServiceWorkerNavigationLoaderInterceptor::FallbackCallbackWrapper,
@@ -198,7 +197,7 @@ void ServiceWorkerNavigationLoaderInterceptor::MaybeCreateLoader(
 
   // Start the inner interceptor on the IO thread. It will call back to
   // LoaderCallbackWrapper() on the UI thread.
-  base::PostTaskWithTraits(
+  base::PostTask(
       FROM_HERE, {BrowserThread::IO},
       base::BindOnce(&MaybeCreateLoaderOnIO, GetWeakPtr(), handle_->core(),
                      params_, tentative_resource_request, browser_context,
@@ -269,11 +268,10 @@ void ServiceWorkerNavigationLoaderInterceptor::RequestHandlerWrapper(
     network::mojom::URLLoaderRequest request,
     network::mojom::URLLoaderClientPtr client) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
-      base::BindOnce(InvokeRequestHandlerOnIO, std::move(handler_on_io),
-                     resource_request, std::move(request),
-                     client.PassInterface()));
+  base::PostTask(FROM_HERE, {BrowserThread::IO},
+                 base::BindOnce(InvokeRequestHandlerOnIO,
+                                std::move(handler_on_io), resource_request,
+                                std::move(request), client.PassInterface()));
 }
 
 }  // namespace content

content/browser/service_worker/service_worker_provider_host.cc

@@ -1241,11 +1241,11 @@ void ServiceWorkerProviderHost::GetInterface(
     mojo::ScopedMessagePipeHandle interface_pipe) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(IsProviderForServiceWorker());
-  base::PostTaskWithTraits(
-      FROM_HERE, {BrowserThread::UI},
-      base::BindOnce(
-          &GetInterfaceImpl, interface_name, std::move(interface_pipe),
-          running_hosted_version_->script_origin(), render_process_id_));
+  base::PostTask(FROM_HERE, {BrowserThread::UI},
+                 base::BindOnce(&GetInterfaceImpl, interface_name,
+                                std::move(interface_pipe),
+                                running_hosted_version_->script_origin(),
+                                render_process_id_));
 }
 
 blink::mojom::ServiceWorkerRegistrationObjectInfoPtr

content/browser/service_worker/service_worker_register_job.cc

@@ -101,9 +101,9 @@ void ServiceWorkerRegisterJob::Start() {
                     ? base::TaskTraits(BrowserThread::IO)
                     : base::TaskTraits(BrowserThread::IO,
                                        base::TaskPriority::BEST_EFFORT);
-  base::PostTaskWithTraits(FROM_HERE, std::move(traits),
-                           base::BindOnce(&ServiceWorkerRegisterJob::StartImpl,
-                                          weak_factory_.GetWeakPtr()));
+  base::PostTask(FROM_HERE, std::move(traits),
+                 base::BindOnce(&ServiceWorkerRegisterJob::StartImpl,
+                                weak_factory_.GetWeakPtr()));
 }
 
 void ServiceWorkerRegisterJob::StartImpl() {

content/browser/service_worker/service_worker_registration_object_host.cc

@@ -235,11 +235,10 @@ void ServiceWorkerRegistrationObjectHost::DelayUpdate(
     return;
   }
 
-  base::PostDelayedTaskWithTraits(
-      FROM_HERE, {BrowserThread::IO},
-      base::BindOnce(std::move(update_function),
-                     blink::ServiceWorkerStatusCode::kOk),
-      delay);
+  base::PostDelayedTask(FROM_HERE, {BrowserThread::IO},
+                        base::BindOnce(std::move(update_function),
+                                       blink::ServiceWorkerStatusCode::kOk),
+                        delay);
 }
 
 void ServiceWorkerRegistrationObjectHost::Unregister(

content/browser/service_worker/service_worker_request_handler_unittest.cc

@@ -55,7 +55,7 @@ class ServiceWorkerRequestHandlerTest : public testing::Test {
   static std::unique_ptr<ServiceWorkerNavigationHandleCore>
   CreateNavigationHandleCore(ServiceWorkerContextWrapper* context_wrapper) {
     std::unique_ptr<ServiceWorkerNavigationHandleCore> navigation_handle_core;
-    base::PostTaskWithTraitsAndReplyWithResult(
+    base::PostTaskAndReplyWithResult(
         FROM_HERE, {BrowserThread::UI},
         base::BindOnce(
             [](ServiceWorkerContextWrapper* wrapper) {

content/browser/service_worker/service_worker_storage.cc

@@ -2206,8 +2206,10 @@ void ServiceWorkerStorage::DidDeleteDatabase(
   // TODO(nhiroki): What if there is a bunch of files in the cache directory?
   // Deleting the directory could take a long time and restart could be delayed.
   // We should probably rename the directory and delete it later.
-  PostTaskWithTraitsAndReplyWithResult(
-      FROM_HERE, {base::MayBlock(), base::TaskShutdownBehavior::BLOCK_SHUTDOWN},
+  PostTaskAndReplyWithResult(
+      FROM_HERE,
+      {base::ThreadPool(), base::MayBlock(),
+       base::TaskShutdownBehavior::BLOCK_SHUTDOWN},
       base::BindOnce(&base::DeleteFile, GetDiskCachePath(), true),
       base::BindOnce(&ServiceWorkerStorage::DidDeleteDiskCache,
                      weak_factory_.GetWeakPtr(), std::move(callback)));

content/browser/service_worker/service_worker_test_utils.h

@@ -46,7 +46,7 @@ void ReceiveResult(BrowserThread::ID run_quit_thread,
                    Arg actual) {
   *out = actual;
   if (!quit.is_null())
-    base::PostTaskWithTraits(FROM_HERE, {run_quit_thread}, std::move(quit));
+    base::PostTask(FROM_HERE, {run_quit_thread}, std::move(quit));
 }
 
 template <typename Arg>