Skip to content

GitLab

T
tangled
Commit 4dbac1c9 authored by Sami Kyostila's avatar Sami Kyostila Committed by Commit Bot
Browse files
Options

chrome/browser: Always specify thread affinity when posting tasks (shard 3/3) 

*** 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://crrev.com/c/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.

Bug: 968047
Change-Id: I2d71d797e509699f21e328b99c89543f34afe831
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1748896
Auto-Submit: Sami Kyöstilä <skyostil@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#686090}
parent 6b30d4e5
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 97 deletions
chrome/browser/feedback/feedback_profile_observer.cc
View file @ 4dbac1c9
...@@ -53,10 +53,9 @@ void FeedbackProfileObserver::Observe( ...@@ -53,10 +53,9 @@ void FeedbackProfileObserver::Observe(
void FeedbackProfileObserver::QueueSingleReport( void FeedbackProfileObserver::QueueSingleReport(
feedback::FeedbackUploader* uploader, feedback::FeedbackUploader* uploader,
std::unique_ptr<std::string> data) { std::unique_ptr<std::string> data) {
base::PostTaskWithTraits( base::PostTask(FROM_HERE, {BrowserThread::UI},
FROM_HERE, {BrowserThread::UI}, base::BindOnce(&FeedbackUploaderChrome::QueueReport,
base::BindOnce(&FeedbackUploaderChrome::QueueReport, uploader->AsWeakPtr(), std::move(data)));
uploader->AsWeakPtr(), std::move(data)));
} }
void FeedbackProfileObserver::QueueUnsentReports( void FeedbackProfileObserver::QueueUnsentReports(
......
chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
View file @ 4dbac1c9
...@@ -254,8 +254,10 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) { ...@@ -254,8 +254,10 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
[](std::unique_ptr<SystemLogsResponse> response, [](std::unique_ptr<SystemLogsResponse> response,
SysLogsSourceCallback callback) { SysLogsSourceCallback callback) {
SystemLogsResponse* response_ptr = response.get(); SystemLogsResponse* response_ptr = response.get();
base::PostTaskWithTraitsAndReply( base::PostTaskAndReply(
FROM_HERE, {base::MayBlock(), base::TaskPriority::BEST_EFFORT}, FROM_HERE,
{base::ThreadPool(), base::MayBlock(),
base::TaskPriority::BEST_EFFORT},
base::BindOnce(&PopulateEntriesAsync, response_ptr), base::BindOnce(&PopulateEntriesAsync, response_ptr),
base::BindOnce(std::move(callback), std::move(response))); base::BindOnce(std::move(callback), std::move(response)));
}, },
......
chrome/browser/file_select_helper_contacts_android.cc
View file @ 4dbac1c9
...@@ -20,9 +20,10 @@ void FileSelectHelperContactsAndroid::FileSelectedWithExtraInfo( ...@@ -20,9 +20,10 @@ void FileSelectHelperContactsAndroid::FileSelectedWithExtraInfo(
const ui::SelectedFileInfo& file, const ui::SelectedFileInfo& file,
int index, int index,
void* params) { void* params) {
base::PostTaskWithTraits( base::PostTask(
FROM_HERE, FROM_HERE,
{base::MayBlock(), base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}, {base::ThreadPool(), base::MayBlock(),
base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN},
base::BindOnce( base::BindOnce(
&FileSelectHelperContactsAndroid::ProcessContactsForAndroid, this, &FileSelectHelperContactsAndroid::ProcessContactsForAndroid, this,
(char*)params)); (char*)params));
...@@ -39,7 +40,7 @@ void FileSelectHelperContactsAndroid::ProcessContactsForAndroid( ...@@ -39,7 +40,7 @@ void FileSelectHelperContactsAndroid::ProcessContactsForAndroid(
temp_file = base::FilePath(); temp_file = base::FilePath();
} }
base::PostTaskWithTraits( base::PostTask(
FROM_HERE, {content::BrowserThread::UI}, FROM_HERE, {content::BrowserThread::UI},
base::BindOnce( base::BindOnce(
&FileSelectHelperContactsAndroid::ProcessContactsForAndroidOnUIThread, &FileSelectHelperContactsAndroid::ProcessContactsForAndroidOnUIThread,
......
chrome/browser/file_select_helper_mac.mm
View file @ 4dbac1c9
...@@ -117,7 +117,7 @@ void FileSelectHelper::ProcessSelectedFilesMac( ...@@ -117,7 +117,7 @@ void FileSelectHelper::ProcessSelectedFilesMac(
} }
} }
base::PostTaskWithTraits( base::PostTask(
FROM_HERE, {content::BrowserThread::UI}, FROM_HERE, {content::BrowserThread::UI},
base::BindOnce(&FileSelectHelper::ProcessSelectedFilesMacOnUIThread, base::BindOnce(&FileSelectHelper::ProcessSelectedFilesMacOnUIThread,
base::Unretained(this), files_out, temporary_files)); base::Unretained(this), files_out, temporary_files));
......
chrome/browser/first_run/first_run_internal_win.cc
View file @ 4dbac1c9
...@@ -112,8 +112,9 @@ void DoPostImportPlatformSpecificTasks(Profile* /* profile */) { ...@@ -112,8 +112,9 @@ void DoPostImportPlatformSpecificTasks(Profile* /* profile */) {
if (!InstallUtil::IsPerUserInstall()) { if (!InstallUtil::IsPerUserInstall()) {
content::BrowserThread::PostBestEffortTask( content::BrowserThread::PostBestEffortTask(
FROM_HERE, FROM_HERE,
base::CreateTaskRunnerWithTraits( base::CreateTaskRunner(
{base::MayBlock(), base::TaskPriority::BEST_EFFORT, {base::ThreadPool(), base::MayBlock(),
base::TaskPriority::BEST_EFFORT,
base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN}), base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN}),
base::BindOnce(&InstallUtil::TriggerActiveSetupCommand)); base::BindOnce(&InstallUtil::TriggerActiveSetupCommand));
} }
......
chrome/browser/gcm/gcm_profile_service_factory.cc
View file @ 4dbac1c9
...@@ -62,7 +62,7 @@ void RequestProxyResolvingSocketFactory( ...@@ -62,7 +62,7 @@ void RequestProxyResolvingSocketFactory(
Profile* profile, Profile* profile,
base::WeakPtr<GCMProfileService> service, base::WeakPtr<GCMProfileService> service,
network::mojom::ProxyResolvingSocketFactoryRequest request) { network::mojom::ProxyResolvingSocketFactoryRequest request) {
base::PostTaskWithTraits( base::PostTask(
FROM_HERE, {content::BrowserThread::UI}, FROM_HERE, {content::BrowserThread::UI},
base::BindOnce(&RequestProxyResolvingSocketFactoryOnUIThread, profile, base::BindOnce(&RequestProxyResolvingSocketFactoryOnUIThread, profile,
std::move(service), std::move(request))); std::move(service), std::move(request)));
...@@ -127,8 +127,9 @@ KeyedService* GCMProfileServiceFactory::BuildServiceInstanceFor( ...@@ -127,8 +127,9 @@ KeyedService* GCMProfileServiceFactory::BuildServiceInstanceFor(
return testing_factory.Run(context).release(); return testing_factory.Run(context).release();
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner( scoped_refptr<base::SequencedTaskRunner> blocking_task_runner(
base::CreateSequencedTaskRunnerWithTraits( base::CreateSequencedTaskRunner(
{base::MayBlock(), base::TaskPriority::BEST_EFFORT, {base::ThreadPool(), base::MayBlock(),
base::TaskPriority::BEST_EFFORT,
base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN})); base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}));
std::unique_ptr<GCMProfileService> service = nullptr; std::unique_ptr<GCMProfileService> service = nullptr;
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
...@@ -146,10 +147,8 @@ KeyedService* GCMProfileServiceFactory::BuildServiceInstanceFor( ...@@ -146,10 +147,8 @@ KeyedService* GCMProfileServiceFactory::BuildServiceInstanceFor(
gcm::GetProductCategoryForSubtypes(profile->GetPrefs()), gcm::GetProductCategoryForSubtypes(profile->GetPrefs()),
IdentityManagerFactory::GetForProfile(profile), IdentityManagerFactory::GetForProfile(profile),
std::unique_ptr<GCMClientFactory>(new GCMClientFactory), std::unique_ptr<GCMClientFactory>(new GCMClientFactory),
base::CreateSingleThreadTaskRunnerWithTraits( base::CreateSingleThreadTaskRunner({content::BrowserThread::UI}),
{content::BrowserThread::UI}), base::CreateSingleThreadTaskRunner({content::BrowserThread::IO}),
base::CreateSingleThreadTaskRunnerWithTraits(
{content::BrowserThread::IO}),
blocking_task_runner); blocking_task_runner);
#endif #endif
#if BUILDFLAG(ENABLE_OFFLINE_PAGES) #if BUILDFLAG(ENABLE_OFFLINE_PAGES)
......
chrome/browser/gcm/gcm_profile_service_unittest.cc
View file @ 4dbac1c9
...@@ -60,18 +60,18 @@ void RequestProxyResolvingSocketFactory( ...@@ -60,18 +60,18 @@ void RequestProxyResolvingSocketFactory(
Profile* profile, Profile* profile,
base::WeakPtr<gcm::GCMProfileService> service, base::WeakPtr<gcm::GCMProfileService> service,
network::mojom::ProxyResolvingSocketFactoryRequest request) { network::mojom::ProxyResolvingSocketFactoryRequest request) {
base::PostTaskWithTraits( base::PostTask(FROM_HERE, {content::BrowserThread::UI},
FROM_HERE, {content::BrowserThread::UI}, base::BindOnce(&RequestProxyResolvingSocketFactoryOnUIThread,
base::BindOnce(&RequestProxyResolvingSocketFactoryOnUIThread, profile, profile, service, std::move(request)));
service, std::move(request)));
} }
std::unique_ptr<KeyedService> BuildGCMProfileService( std::unique_ptr<KeyedService> BuildGCMProfileService(
content::BrowserContext* context) { content::BrowserContext* context) {
Profile* profile = Profile::FromBrowserContext(context); Profile* profile = Profile::FromBrowserContext(context);
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner( scoped_refptr<base::SequencedTaskRunner> blocking_task_runner(
base::CreateSequencedTaskRunnerWithTraits( base::CreateSequencedTaskRunner(
{base::MayBlock(), base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN})); {base::ThreadPool(), base::MayBlock(),
base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}));
return std::make_unique<gcm::GCMProfileService>( return std::make_unique<gcm::GCMProfileService>(
profile->GetPrefs(), profile->GetPath(), profile->GetPrefs(), profile->GetPath(),
base::BindRepeating(&RequestProxyResolvingSocketFactory, profile), base::BindRepeating(&RequestProxyResolvingSocketFactory, profile),
...@@ -82,14 +82,10 @@ std::unique_ptr<KeyedService> BuildGCMProfileService( ...@@ -82,14 +82,10 @@ std::unique_ptr<KeyedService> BuildGCMProfileService(
gcm::GetProductCategoryForSubtypes(profile->GetPrefs()), gcm::GetProductCategoryForSubtypes(profile->GetPrefs()),
IdentityManagerFactory::GetForProfile(profile), IdentityManagerFactory::GetForProfile(profile),
std::unique_ptr<gcm::GCMClientFactory>(new gcm::FakeGCMClientFactory( std::unique_ptr<gcm::GCMClientFactory>(new gcm::FakeGCMClientFactory(
base::CreateSingleThreadTaskRunnerWithTraits( base::CreateSingleThreadTaskRunner({content::BrowserThread::UI}),
{content::BrowserThread::UI}), base::CreateSingleThreadTaskRunner({content::BrowserThread::IO}))),
base::CreateSingleThreadTaskRunnerWithTraits( base::CreateSingleThreadTaskRunner({content::BrowserThread::UI}),
{content::BrowserThread::IO}))), base::CreateSingleThreadTaskRunner({content::BrowserThread::IO}),
base::CreateSingleThreadTaskRunnerWithTraits(
{content::BrowserThread::UI}),
base::CreateSingleThreadTaskRunnerWithTraits(
{content::BrowserThread::IO}),
blocking_task_runner); blocking_task_runner);
} }
......
chrome/browser/google/google_brand_chromeos.cc
View file @ 4dbac1c9
...@@ -95,9 +95,9 @@ void InitBrand(const base::Closure& callback) { ...@@ -95,9 +95,9 @@ void InitBrand(const base::Closure& callback) {
return; return;
} }
base::PostTaskWithTraitsAndReplyWithResult( base::PostTaskAndReplyWithResult(
FROM_HERE, FROM_HERE,
{base::MayBlock(), base::TaskPriority::BEST_EFFORT, {base::ThreadPool(), base::MayBlock(), base::TaskPriority::BEST_EFFORT,
base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN}, base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
base::Bind(&ReadBrandFromFile), base::Bind(&SetBrand, callback)); base::Bind(&ReadBrandFromFile), base::Bind(&SetBrand, callback));
} }
......
chrome/browser/google/google_search_domain_mixing_metrics_emitter.cc
View file @ 4dbac1c9
...@@ -55,8 +55,8 @@ GoogleSearchDomainMixingMetricsEmitter::GoogleSearchDomainMixingMetricsEmitter( ...@@ -55,8 +55,8 @@ GoogleSearchDomainMixingMetricsEmitter::GoogleSearchDomainMixingMetricsEmitter(
history::HistoryService* history_service) history::HistoryService* history_service)
: prefs_(prefs), : prefs_(prefs),
history_service_(history_service), history_service_(history_service),
ui_thread_task_runner_(base::CreateSingleThreadTaskRunnerWithTraits( ui_thread_task_runner_(
{content::BrowserThread::UI})) { base::CreateSingleThreadTaskRunner({content::BrowserThread::UI})) {
DCHECK(history_service_); DCHECK(history_service_);
} }
......
chrome/browser/google/google_update_win.cc
View file @ 4dbac1c9
...@@ -390,7 +390,7 @@ UpdateCheckDriver::UpdateCheckDriver( ...@@ -390,7 +390,7 @@ UpdateCheckDriver::UpdateCheckDriver(
: task_runner_( : task_runner_(
g_update_driver_task_runner g_update_driver_task_runner
? g_update_driver_task_runner ? g_update_driver_task_runner
: base::CreateCOMSTATaskRunnerWithTraits( : base::CreateCOMSTATaskRunner(
{base::MayBlock(), base::TaskPriority::USER_VISIBLE})), {base::MayBlock(), base::TaskPriority::USER_VISIBLE})),
result_runner_(base::SequencedTaskRunnerHandle::Get()), result_runner_(base::SequencedTaskRunnerHandle::Get()),
locale_(locale), locale_(locale),
......
chrome/browser/history/android/bookmark_model_sql_handler.cc
View file @ 4dbac1c9
...@@ -111,14 +111,14 @@ bool BookmarkModelSQLHandler::Update(const HistoryAndBookmarkRow& row, ...@@ -111,14 +111,14 @@ bool BookmarkModelSQLHandler::Update(const HistoryAndBookmarkRow& row,
if (!url_database_->GetURLRow(i->url_id, &url_row)) if (!url_database_->GetURLRow(i->url_id, &url_row))
return false; return false;
if (row.is_value_set_explicitly(HistoryAndBookmarkRow::PARENT_ID)) { if (row.is_value_set_explicitly(HistoryAndBookmarkRow::PARENT_ID)) {
base::PostTaskWithTraits( base::PostTask(
FROM_HERE, {BrowserThread::UI}, FROM_HERE, {BrowserThread::UI},
base::BindOnce(&BookmarkModelSQLHandler::Task::AddBookmark, base::BindOnce(&BookmarkModelSQLHandler::Task::AddBookmark,
scoped_refptr<BookmarkModelSQLHandler::Task>( scoped_refptr<BookmarkModelSQLHandler::Task>(
new BookmarkModelSQLHandler::Task()), new BookmarkModelSQLHandler::Task()),
i->url, url_row.title(), row.parent_id())); i->url, url_row.title(), row.parent_id()));
} else { } else {
base::PostTaskWithTraits( base::PostTask(
FROM_HERE, {BrowserThread::UI}, FROM_HERE, {BrowserThread::UI},
base::BindOnce( base::BindOnce(
&BookmarkModelSQLHandler::Task::AddBookmarkToMobileFolder, &BookmarkModelSQLHandler::Task::AddBookmarkToMobileFolder,
...@@ -127,7 +127,7 @@ bool BookmarkModelSQLHandler::Update(const HistoryAndBookmarkRow& row, ...@@ -127,7 +127,7 @@ bool BookmarkModelSQLHandler::Update(const HistoryAndBookmarkRow& row,
i->url, url_row.title())); i->url, url_row.title()));
} }
} else { } else {
base::PostTaskWithTraits( base::PostTask(
FROM_HERE, {BrowserThread::UI}, FROM_HERE, {BrowserThread::UI},
base::BindOnce(&BookmarkModelSQLHandler::Task::RemoveBookmark, base::BindOnce(&BookmarkModelSQLHandler::Task::RemoveBookmark,
scoped_refptr<BookmarkModelSQLHandler::Task>( scoped_refptr<BookmarkModelSQLHandler::Task>(
...@@ -135,7 +135,7 @@ bool BookmarkModelSQLHandler::Update(const HistoryAndBookmarkRow& row, ...@@ -135,7 +135,7 @@ bool BookmarkModelSQLHandler::Update(const HistoryAndBookmarkRow& row,
i->url)); i->url));
} }
} else if (row.is_value_set_explicitly(HistoryAndBookmarkRow::TITLE)) { } else if (row.is_value_set_explicitly(HistoryAndBookmarkRow::TITLE)) {
base::PostTaskWithTraits( base::PostTask(
FROM_HERE, {BrowserThread::UI}, FROM_HERE, {BrowserThread::UI},
base::BindOnce(&BookmarkModelSQLHandler::Task::UpdateBookmarkTitle, base::BindOnce(&BookmarkModelSQLHandler::Task::UpdateBookmarkTitle,
scoped_refptr<BookmarkModelSQLHandler::Task>( scoped_refptr<BookmarkModelSQLHandler::Task>(
...@@ -149,7 +149,7 @@ bool BookmarkModelSQLHandler::Update(const HistoryAndBookmarkRow& row, ...@@ -149,7 +149,7 @@ bool BookmarkModelSQLHandler::Update(const HistoryAndBookmarkRow& row,
bool BookmarkModelSQLHandler::Delete(const TableIDRows& ids_set) { bool BookmarkModelSQLHandler::Delete(const TableIDRows& ids_set) {
for (TableIDRows::const_iterator i = ids_set.begin(); for (TableIDRows::const_iterator i = ids_set.begin();
i != ids_set.end(); ++i) { i != ids_set.end(); ++i) {
base::PostTaskWithTraits( base::PostTask(
FROM_HERE, {BrowserThread::UI}, FROM_HERE, {BrowserThread::UI},
base::BindOnce(&BookmarkModelSQLHandler::Task::RemoveBookmark, base::BindOnce(&BookmarkModelSQLHandler::Task::RemoveBookmark,
scoped_refptr<BookmarkModelSQLHandler::Task>( scoped_refptr<BookmarkModelSQLHandler::Task>(
...@@ -165,14 +165,13 @@ bool BookmarkModelSQLHandler::Insert(HistoryAndBookmarkRow* row) { ...@@ -165,14 +165,13 @@ bool BookmarkModelSQLHandler::Insert(HistoryAndBookmarkRow* row) {
!row->is_bookmark()) !row->is_bookmark())
return true; return true;
if (row->is_value_set_explicitly(HistoryAndBookmarkRow::PARENT_ID)) { if (row->is_value_set_explicitly(HistoryAndBookmarkRow::PARENT_ID)) {
base::PostTaskWithTraits( base::PostTask(FROM_HERE, {BrowserThread::UI},
FROM_HERE, {BrowserThread::UI}, base::BindOnce(&BookmarkModelSQLHandler::Task::AddBookmark,
base::BindOnce(&BookmarkModelSQLHandler::Task::AddBookmark, scoped_refptr<BookmarkModelSQLHandler::Task>(
scoped_refptr<BookmarkModelSQLHandler::Task>( new BookmarkModelSQLHandler::Task()),
new BookmarkModelSQLHandler::Task()), row->url(), row->title(), row->parent_id()));
row->url(), row->title(), row->parent_id()));
} else { } else {
base::PostTaskWithTraits( base::PostTask(
FROM_HERE, {BrowserThread::UI}, FROM_HERE, {BrowserThread::UI},
base::BindOnce( base::BindOnce(
&BookmarkModelSQLHandler::Task::AddBookmarkToMobileFolder, &BookmarkModelSQLHandler::Task::AddBookmarkToMobileFolder,
......
chrome/browser/history/android/sqlite_cursor.cc
View file @ 4dbac1c9
...@@ -126,10 +126,9 @@ jboolean SQLiteCursor::IsNull(JNIEnv* env, ...@@ -126,10 +126,9 @@ jboolean SQLiteCursor::IsNull(JNIEnv* env,
jint SQLiteCursor::MoveTo(JNIEnv* env, jint SQLiteCursor::MoveTo(JNIEnv* env,
const JavaParamRef<jobject>& obj, const JavaParamRef<jobject>& obj,
jint pos) { jint pos) {
base::PostTaskWithTraits( base::PostTask(FROM_HERE, {BrowserThread::UI},
FROM_HERE, {BrowserThread::UI}, base::BindOnce(&SQLiteCursor::RunMoveStatementOnUIThread,
base::BindOnce(&SQLiteCursor::RunMoveStatementOnUIThread, base::Unretained(this), pos));
base::Unretained(this), pos));
if (test_observer_) if (test_observer_)
test_observer_->OnPostMoveToTask(); test_observer_->OnPostMoveToTask();
...@@ -150,10 +149,9 @@ void SQLiteCursor::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) { ...@@ -150,10 +149,9 @@ void SQLiteCursor::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
// objects out there. // objects out there.
if (BrowserThread::CurrentlyOn(BrowserThread::UI)) { if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
DestroyOnUIThread(); DestroyOnUIThread();
} else if (!base::PostTaskWithTraits( } else if (!base::PostTask(FROM_HERE, {BrowserThread::UI},
FROM_HERE, {BrowserThread::UI}, base::BindOnce(&SQLiteCursor::DestroyOnUIThread,
base::BindOnce(&SQLiteCursor::DestroyOnUIThread, base::Unretained(this)))) {
base::Unretained(this)))) {
delete this; delete this;
} }
} }
...@@ -185,12 +183,11 @@ void SQLiteCursor::DestroyOnUIThread() { ...@@ -185,12 +183,11 @@ void SQLiteCursor::DestroyOnUIThread() {
bool SQLiteCursor::GetFavicon(favicon_base::FaviconID id, bool SQLiteCursor::GetFavicon(favicon_base::FaviconID id,
std::vector<unsigned char>* image_data) { std::vector<unsigned char>* image_data) {
if (id) { if (id) {
base::PostTaskWithTraits( base::PostTask(FROM_HERE, {BrowserThread::UI},
FROM_HERE, {BrowserThread::UI}, base::BindOnce(&SQLiteCursor::GetFaviconForIDInUIThread,
base::BindOnce( base::Unretained(this), id,
&SQLiteCursor::GetFaviconForIDInUIThread, base::Unretained(this), base::Bind(&SQLiteCursor::OnFaviconData,
id, base::Unretained(this))));
base::Bind(&SQLiteCursor::OnFaviconData, base::Unretained(this))));
if (test_observer_) if (test_observer_)
test_observer_->OnPostGetFaviconTask(); test_observer_->OnPostGetFaviconTask();
......
chrome/browser/icon_loader_mac.mm
View file @ 4dbac1c9
...@@ -23,7 +23,7 @@ IconLoader::IconGroup IconLoader::GroupForFilepath( ...@@ -23,7 +23,7 @@ IconLoader::IconGroup IconLoader::GroupForFilepath(
// static // static
scoped_refptr<base::TaskRunner> IconLoader::GetReadIconTaskRunner() { scoped_refptr<base::TaskRunner> IconLoader::GetReadIconTaskRunner() {
// NSWorkspace is thread-safe. // NSWorkspace is thread-safe.
return base::CreateTaskRunnerWithTraits(traits()); return base::CreateTaskRunner(traits());
} }
void IconLoader::ReadIcon() { void IconLoader::ReadIcon() {
......
chrome/browser/image_fetcher/image_fetcher_service_factory.cc
View file @ 4dbac1c9
...@@ -68,8 +68,8 @@ ImageFetcherServiceFactory::BuildServiceInstanceFor( ...@@ -68,8 +68,8 @@ ImageFetcherServiceFactory::BuildServiceInstanceFor(
ProfileKey* profile_key = ProfileKey::FromSimpleFactoryKey(key); ProfileKey* profile_key = ProfileKey::FromSimpleFactoryKey(key);
scoped_refptr<base::SequencedTaskRunner> task_runner = scoped_refptr<base::SequencedTaskRunner> task_runner =
base::CreateSequencedTaskRunnerWithTraits( base::CreateSequencedTaskRunner({base::ThreadPool(), base::MayBlock(),
{base::MayBlock(), base::TaskPriority::USER_VISIBLE}); base::TaskPriority::USER_VISIBLE});
base::DefaultClock* clock = base::DefaultClock::GetInstance(); base::DefaultClock* clock = base::DefaultClock::GetInstance();
auto metadata_store = auto metadata_store =
......
chrome/browser/importer/importer_list.cc
View file @ 4dbac1c9
...@@ -181,9 +181,9 @@ void ImporterList::DetectSourceProfiles( ...@@ -181,9 +181,9 @@ void ImporterList::DetectSourceProfiles(
bool include_interactive_profiles, bool include_interactive_profiles,
const base::Closure& profiles_loaded_callback) { const base::Closure& profiles_loaded_callback) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
base::PostTaskWithTraitsAndReplyWithResult( base::PostTaskAndReplyWithResult(
FROM_HERE, FROM_HERE,
{base::MayBlock(), base::TaskPriority::USER_VISIBLE, {base::ThreadPool(), base::MayBlock(), base::TaskPriority::USER_VISIBLE,
base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN}, base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
base::Bind(&DetectSourceProfilesWorker, locale, base::Bind(&DetectSourceProfilesWorker, locale,
include_interactive_profiles), include_interactive_profiles),
......
chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.cc
View file @ 4dbac1c9
...@@ -73,7 +73,7 @@ void RequestProxyResolvingSocketFactory( ...@@ -73,7 +73,7 @@ void RequestProxyResolvingSocketFactory(
Profile* profile, Profile* profile,
base::WeakPtr<TiclInvalidationService> service, base::WeakPtr<TiclInvalidationService> service,
network::mojom::ProxyResolvingSocketFactoryRequest request) { network::mojom::ProxyResolvingSocketFactoryRequest request) {
base::PostTaskWithTraits( base::PostTask(
FROM_HERE, {content::BrowserThread::UI}, FROM_HERE, {content::BrowserThread::UI},
base::BindOnce(&RequestProxyResolvingSocketFactoryOnUIThread, profile, base::BindOnce(&RequestProxyResolvingSocketFactoryOnUIThread, profile,
std::move(service), std::move(request))); std::move(service), std::move(request)));
...@@ -165,8 +165,7 @@ DeprecatedProfileInvalidationProviderFactory::BuildServiceInstanceFor( ...@@ -165,8 +165,7 @@ DeprecatedProfileInvalidationProviderFactory::BuildServiceInstanceFor(
GetUserAgent(), identity_provider.get(), GetUserAgent(), identity_provider.get(),
gcm::GCMProfileServiceFactory::GetForProfile(profile)->driver(), gcm::GCMProfileServiceFactory::GetForProfile(profile)->driver(),
base::BindRepeating(&RequestProxyResolvingSocketFactory, profile), base::BindRepeating(&RequestProxyResolvingSocketFactory, profile),
base::CreateSingleThreadTaskRunnerWithTraits( base::CreateSingleThreadTaskRunner({content::BrowserThread::IO}),
{content::BrowserThread::IO}),
content::BrowserContext::GetDefaultStoragePartition(profile) content::BrowserContext::GetDefaultStoragePartition(profile)
->GetURLLoaderFactoryForBrowserProcess(), ->GetURLLoaderFactoryForBrowserProcess(),
content::GetNetworkConnectionTracker()); content::GetNetworkConnectionTracker());
......
chrome/browser/local_discovery/service_discovery_client_mdns.cc
View file @ 4dbac1c9
...@@ -85,8 +85,7 @@ class ServiceDiscoveryClientMdns::Proxy { ...@@ -85,8 +85,7 @@ class ServiceDiscoveryClientMdns::Proxy {
} }
static bool PostToUIThread(base::OnceClosure task) { static bool PostToUIThread(base::OnceClosure task) {
return base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, return base::PostTask(FROM_HERE, {BrowserThread::UI}, std::move(task));
std::move(task));
} }
ServiceDiscoveryClient* client() { ServiceDiscoveryClient* client() {
...@@ -149,10 +148,9 @@ void InitMdns(MdnsInitCallback on_initialized, ...@@ -149,10 +148,9 @@ void InitMdns(MdnsInitCallback on_initialized,
const net::InterfaceIndexFamilyList& interfaces, const net::InterfaceIndexFamilyList& interfaces,
net::MDnsClient* mdns) { net::MDnsClient* mdns) {
SocketFactory socket_factory(interfaces); SocketFactory socket_factory(interfaces);
base::PostTaskWithTraits( base::PostTask(FROM_HERE, {BrowserThread::UI},
FROM_HERE, {BrowserThread::UI}, base::BindOnce(std::move(on_initialized),
base::BindOnce(std::move(on_initialized), mdns->StartListening(&socket_factory)));
mdns->StartListening(&socket_factory)));
} }
template<class T> template<class T>
...@@ -331,8 +329,7 @@ class LocalDomainResolverProxy : public ProxyBase<LocalDomainResolver> { ...@@ -331,8 +329,7 @@ class LocalDomainResolverProxy : public ProxyBase<LocalDomainResolver> {
} // namespace } // namespace
ServiceDiscoveryClientMdns::ServiceDiscoveryClientMdns() ServiceDiscoveryClientMdns::ServiceDiscoveryClientMdns()
: mdns_runner_( : mdns_runner_(base::CreateSingleThreadTaskRunner({BrowserThread::IO})) {
base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::IO})) {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
content::GetNetworkConnectionTracker()->AddNetworkConnectionObserver(this); content::GetNetworkConnectionTracker()->AddNetworkConnectionObserver(this);
StartNewClient(); StartNewClient();
...@@ -400,8 +397,9 @@ void ServiceDiscoveryClientMdns::StartNewClient() { ...@@ -400,8 +397,9 @@ void ServiceDiscoveryClientMdns::StartNewClient() {
DestroyMdns(); DestroyMdns();
mdns_ = net::MDnsClient::CreateDefault(); mdns_ = net::MDnsClient::CreateDefault();
client_ = std::make_unique<ServiceDiscoveryClientImpl>(mdns_.get()); client_ = std::make_unique<ServiceDiscoveryClientImpl>(mdns_.get());
base::PostTaskWithTraitsAndReplyWithResult( base::PostTaskAndReplyWithResult(
FROM_HERE, {base::TaskPriority::BEST_EFFORT, base::MayBlock()}, FROM_HERE,
{base::ThreadPool(), base::TaskPriority::BEST_EFFORT, base::MayBlock()},
base::BindOnce(&net::GetMDnsInterfacesToBind), base::BindOnce(&net::GetMDnsInterfacesToBind),
base::BindOnce(&ServiceDiscoveryClientMdns::OnInterfaceListReady, base::BindOnce(&ServiceDiscoveryClientMdns::OnInterfaceListReady,
weak_ptr_factory_.GetWeakPtr())); weak_ptr_factory_.GetWeakPtr()));
......
chrome/browser/lookalikes/lookalike_url_service.cc
View file @ 4dbac1c9
...@@ -147,9 +147,9 @@ bool LookalikeUrlService::EngagedSitesNeedUpdating() { ...@@ -147,9 +147,9 @@ bool LookalikeUrlService::EngagedSitesNeedUpdating() {
void LookalikeUrlService::ForceUpdateEngagedSites( void LookalikeUrlService::ForceUpdateEngagedSites(
EngagedSitesCallback callback) { EngagedSitesCallback callback) {
base::PostTaskWithTraitsAndReplyWithResult( base::PostTaskAndReplyWithResult(
FROM_HERE, FROM_HERE,
{base::TaskPriority::USER_BLOCKING, {base::ThreadPool(), base::TaskPriority::USER_BLOCKING,
base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}, base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN},
base::BindOnce( base::BindOnce(
&SiteEngagementService::GetAllDetailsInBackground, clock_->Now(), &SiteEngagementService::GetAllDetailsInBackground, clock_->Now(),
......
chrome/browser/media/android/cdm/media_drm_license_manager.cc
View file @ 4dbac1c9
...@@ -57,8 +57,8 @@ void ClearMediaDrmLicenses( ...@@ -57,8 +57,8 @@ void ClearMediaDrmLicenses(
// Create a single thread task runner for MediaDrmBridge, for posting Java // Create a single thread task runner for MediaDrmBridge, for posting Java
// callbacks immediately to avoid rentrancy issues. // callbacks immediately to avoid rentrancy issues.
// TODO(yucliu): Remove task runner from MediaDrmBridge in this case. // TODO(yucliu): Remove task runner from MediaDrmBridge in this case.
base::CreateSingleThreadTaskRunnerWithTraits( base::CreateSingleThreadTaskRunner(
{base::TaskPriority::USER_VISIBLE, base::MayBlock()}) {base::ThreadPool(), base::TaskPriority::USER_VISIBLE, base::MayBlock()})
->PostTaskAndReply(FROM_HERE, ->PostTaskAndReply(FROM_HERE,
base::BindOnce(&ClearMediaDrmLicensesBlocking, base::BindOnce(&ClearMediaDrmLicensesBlocking,
std::move(no_license_origin_ids)), std::move(no_license_origin_ids)),
......
chrome/browser/memory/swap_thrashing_monitor.h
View file @ 4dbac1c9
...@@ -79,8 +79,9 @@ class SwapThrashingMonitor { ...@@ -79,8 +79,9 @@ class SwapThrashingMonitor {
// The task runner used to run blocking operations. // The task runner used to run blocking operations.
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_ = scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_ =
base::CreateSequencedTaskRunnerWithTraits( base::CreateSequencedTaskRunner(
{base::MayBlock(), base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN}); {base::ThreadPool(), base::MayBlock(),
base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN});
// The delegate responsible for measuring the swap-thrashing activity. This // The delegate responsible for measuring the swap-thrashing activity. This
// task runner is expected to be used and destroyed on // task runner is expected to be used and destroyed on
......
chrome/browser/memory_details_android.cc
View file @ 4dbac1c9
...@@ -145,7 +145,7 @@ void MemoryDetails::CollectProcessData( ...@@ -145,7 +145,7 @@ void MemoryDetails::CollectProcessData(
process_data_.push_back(current_browser); process_data_.push_back(current_browser);
// Finally return to the browser thread. // Finally return to the browser thread.
base::PostTaskWithTraits( base::PostTask(
FROM_HERE, {BrowserThread::UI}, FROM_HERE, {BrowserThread::UI},
base::BindOnce(&MemoryDetails::CollectChildInfoOnUIThread, this)); base::BindOnce(&MemoryDetails::CollectChildInfoOnUIThread, this));
} }
chrome/browser/nacl_host/nacl_browser_delegate_impl.cc
View file @ 4dbac1c9
...@@ -66,9 +66,9 @@ NaClBrowserDelegateImpl::~NaClBrowserDelegateImpl() { ...@@ -66,9 +66,9 @@ NaClBrowserDelegateImpl::~NaClBrowserDelegateImpl() {
void NaClBrowserDelegateImpl::ShowMissingArchInfobar(int render_process_id, void NaClBrowserDelegateImpl::ShowMissingArchInfobar(int render_process_id,
int render_view_id) { int render_view_id) {
base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::UI}, base::PostTask(FROM_HERE, {content::BrowserThread::UI},
base::BindOnce(&CreateInfoBarOnUiThread, base::BindOnce(&CreateInfoBarOnUiThread, render_process_id,
render_process_id, render_view_id)); render_view_id));
} }
bool NaClBrowserDelegateImpl::DialogsAreSuppressed() { bool NaClBrowserDelegateImpl::DialogsAreSuppressed() {
......
chrome/browser/notifications/notification_platform_bridge_message_center.cc
View file @ 4dbac1c9
...@@ -136,7 +136,7 @@ void NotificationPlatformBridgeMessageCenter::GetDisplayed( ...@@ -136,7 +136,7 @@ void NotificationPlatformBridgeMessageCenter::GetDisplayed(
g_browser_process->notification_ui_manager()->GetAllIdsByProfile( g_browser_process->notification_ui_manager()->GetAllIdsByProfile(
NotificationUIManager::GetProfileID(profile_)); NotificationUIManager::GetProfileID(profile_));
base::PostTaskWithTraits( base::PostTask(
FROM_HERE, {content::BrowserThread::UI}, FROM_HERE, {content::BrowserThread::UI},
base::BindOnce(std::move(callback), std::move(displayed_notifications), base::BindOnce(std::move(callback), std::move(displayed_notifications),
true /* supports_synchronization */)); true /* supports_synchronization */));
......
chrome/browser/notifications/notifier_state_tracker.cc
View file @ 4dbac1c9
...@@ -192,9 +192,8 @@ void NotifierStateTracker::FirePermissionLevelChangedEvent( ...@@ -192,9 +192,8 @@ void NotifierStateTracker::FirePermissionLevelChangedEvent(
// has changed. // has changed.
extensions::InfoMap* extension_info_map = extensions::InfoMap* extension_info_map =
extensions::ExtensionSystem::Get(profile_)->info_map(); extensions::ExtensionSystem::Get(profile_)->info_map();
base::PostTaskWithTraits( base::PostTask(FROM_HERE, {content::BrowserThread::IO},
FROM_HERE, {content::BrowserThread::IO}, base::BindOnce(&extensions::InfoMap::SetNotificationsDisabled,
base::BindOnce(&extensions::InfoMap::SetNotificationsDisabled, extension_info_map, notifier_id.id, !enabled));
extension_info_map, notifier_id.id, !enabled));
} }
#endif #endif
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