Commit c9fa962e authored by Gabriel Charette's avatar Gabriel Charette Committed by Commit Bot

Migrate off base::ThreadPool()-as-a-trait in /chrome/browser/extensions

This CL is a logical no-op.

It manually covers the use cases the script
(https://crbug.com/1026641#c22) didn't cover in
https://chromium-review.googlesource.com/c/chromium/src/+/2026350.

A few of the affected files were also migrated to
content::GetUIThreadTaskRunner() whenever surrounding code consistency
was at stake (but the bulk of that migration is staged to happen after
this one so this wasn't a priority in this batch).

Most files intentionally kept base/task/post_task.h as an include. It is
still required because of a cyclical dependency during the migration
preventing base/task/thread_pool.h from implicitly providing
base/task/task_traits.h to its users (callers that explicitly store
TaskTraits and include task_traits.h don't have this problem). The
post_task.h include will be cleaned up in a later phase.

This CL was uploaded by git cl split.

R=reillyg@chromium.org

Bug: 1026641
Change-Id: I781bcf648308b5583f5d85308ee0383b7f69be02
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2078420
Commit-Queue: Gabriel Charette <gab@chromium.org>
Auto-Submit: Gabriel Charette <gab@chromium.org>
Reviewed-by: default avatarReilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#745499}
parent 6390b8bf
...@@ -219,8 +219,8 @@ class ImageWriterUtilityClientTest : public InProcessBrowserTest { ...@@ -219,8 +219,8 @@ class ImageWriterUtilityClientTest : public InProcessBrowserTest {
base::SequencedTaskRunner* CreateTaskRunner() { base::SequencedTaskRunner* CreateTaskRunner() {
DCHECK(!task_runner_.get()); DCHECK(!task_runner_.get());
task_runner_ = task_runner_ = base::ThreadPool::CreateSequencedTaskRunner(
base::CreateSequencedTaskRunner(Operation::blocking_task_traits()); Operation::blocking_task_traits());
return task_runner_.get(); return task_runner_.get();
} }
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/files/file_util.h" #include "base/files/file_util.h"
#include "base/task/post_task.h" #include "base/task/post_task.h"
#include "base/task/thread_pool.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "chrome/browser/extensions/api/image_writer_private/error_messages.h" #include "chrome/browser/extensions/api/image_writer_private/error_messages.h"
#include "chrome/browser/extensions/api/image_writer_private/operation_manager.h" #include "chrome/browser/extensions/api/image_writer_private/operation_manager.h"
...@@ -42,7 +43,8 @@ Operation::Operation(base::WeakPtr<OperationManager> manager, ...@@ -42,7 +43,8 @@ Operation::Operation(base::WeakPtr<OperationManager> manager,
stage_(image_writer_api::STAGE_UNKNOWN), stage_(image_writer_api::STAGE_UNKNOWN),
progress_(0), progress_(0),
download_folder_(download_folder), download_folder_(download_folder),
task_runner_(base::CreateSequencedTaskRunner(blocking_task_traits())) { task_runner_(
base::ThreadPool::CreateSequencedTaskRunner(blocking_task_traits())) {
} }
Operation::~Operation() { Operation::~Operation() {
......
...@@ -229,7 +229,6 @@ class Operation : public base::RefCountedThreadSafe<Operation> { ...@@ -229,7 +229,6 @@ class Operation : public base::RefCountedThreadSafe<Operation> {
static constexpr base::TaskTraits blocking_task_traits() { static constexpr base::TaskTraits blocking_task_traits() {
return { return {
base::ThreadPool(),
// Requires I/O. // Requires I/O.
base::MayBlock(), base::MayBlock(),
// Apps (e.g. Chromebook Recovery Utility) present UI feedback based on // Apps (e.g. Chromebook Recovery Utility) present UI feedback based on
......
...@@ -53,7 +53,6 @@ const char kPageCaptureNotAllowed[] = ...@@ -53,7 +53,6 @@ const char kPageCaptureNotAllowed[] =
const char kUserDenied[] = "User denied request."; const char kUserDenied[] = "User denied request.";
#endif #endif
constexpr base::TaskTraits kCreateTemporaryFileTaskTraits = { constexpr base::TaskTraits kCreateTemporaryFileTaskTraits = {
base::ThreadPool(),
// Requires IO. // Requires IO.
base::MayBlock(), base::MayBlock(),
...@@ -127,7 +126,7 @@ ExtensionFunction::ResponseAction PageCaptureSaveAsMHTMLFunction::Run() { ...@@ -127,7 +126,7 @@ ExtensionFunction::ResponseAction PageCaptureSaveAsMHTMLFunction::Run() {
if (!CanCaptureCurrentPage(&error)) { if (!CanCaptureCurrentPage(&error)) {
return RespondNow(Error(error)); return RespondNow(Error(error));
} }
base::PostTask( base::ThreadPool::PostTask(
FROM_HERE, kCreateTemporaryFileTaskTraits, FROM_HERE, kCreateTemporaryFileTaskTraits,
base::BindOnce(&PageCaptureSaveAsMHTMLFunction::CreateTemporaryFile, base::BindOnce(&PageCaptureSaveAsMHTMLFunction::CreateTemporaryFile,
this)); this));
...@@ -188,7 +187,7 @@ bool PageCaptureSaveAsMHTMLFunction::OnMessageReceived( ...@@ -188,7 +187,7 @@ bool PageCaptureSaveAsMHTMLFunction::OnMessageReceived(
void PageCaptureSaveAsMHTMLFunction::ResolvePermissionRequest( void PageCaptureSaveAsMHTMLFunction::ResolvePermissionRequest(
const PermissionIDSet& allowed_permissions) { const PermissionIDSet& allowed_permissions) {
if (allowed_permissions.ContainsID(APIPermission::kPageCapture)) { if (allowed_permissions.ContainsID(APIPermission::kPageCapture)) {
base::PostTask( base::ThreadPool::PostTask(
FROM_HERE, kCreateTemporaryFileTaskTraits, FROM_HERE, kCreateTemporaryFileTaskTraits,
base::BindOnce(&PageCaptureSaveAsMHTMLFunction::CreateTemporaryFile, base::BindOnce(&PageCaptureSaveAsMHTMLFunction::CreateTemporaryFile,
this)); this));
......
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