Always specify thread affinity for lazy task runner initialization

Change all usages of lazy task runners specify the thread affinity for
the task runner, since this will soon become mandatory.

Note that aggregate trait initialization syntax isn't supported by these
macros, because the preprocessor doesn't treat braces specially.

This patch has no functional changes.

TBR=gab@chromium.org

Bug: 968047
Change-Id: I2604c5fd18fb1972ea231a3ccc1f2cfe3a5adc76
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1645311
Commit-Queue: Sami Kyöstilä <skyostil@chromium.org>
Reviewed-by: Gabriel Charette <gab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#669631}

base/task/lazy_task_runner.h

@@ -39,7 +39,7 @@
 // namespace {
 // base::LazySequencedTaskRunner g_sequenced_task_runner =
 //     LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
-//         base::TaskTraits(base::MayBlock(),
+//         base::TaskTraits(base::ThreadPool(), base::MayBlock(),
 //                          base::TaskPriority::USER_VISIBLE));
 // }  // namespace
 //
@@ -53,7 +53,8 @@
 //
 // namespace {
 // base::LazySequencedTaskRunner g_sequenced_task_task_runner =
-//     LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER({base::MayBlock()});
+//     LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
+//         base::TaskTraits(base::ThreadPool(), base::MayBlock()));
 // }  // namespace
 //
 // // Code from different files can access the SequencedTaskRunner via this

base/task/lazy_task_runner_unittest.cc

@@ -22,27 +22,29 @@ namespace base {
 namespace {
 
 LazySequencedTaskRunner g_sequenced_task_runner_user_visible =
-    LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER({TaskPriority::USER_VISIBLE});
+    LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
+        TaskTraits(ThreadPool(), TaskPriority::USER_VISIBLE));
 LazySequencedTaskRunner g_sequenced_task_runner_user_blocking =
-    LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER({TaskPriority::USER_BLOCKING});
+    LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
+        TaskTraits(ThreadPool(), TaskPriority::USER_BLOCKING));
 
 LazySingleThreadTaskRunner g_single_thread_task_runner_user_visible =
     LAZY_SINGLE_THREAD_TASK_RUNNER_INITIALIZER(
-        {TaskPriority::USER_VISIBLE},
+        TaskTraits(ThreadPool(), TaskPriority::USER_VISIBLE),
         SingleThreadTaskRunnerThreadMode::SHARED);
 LazySingleThreadTaskRunner g_single_thread_task_runner_user_blocking =
     LAZY_SINGLE_THREAD_TASK_RUNNER_INITIALIZER(
-        {TaskPriority::USER_BLOCKING},
+        TaskTraits(ThreadPool(), TaskPriority::USER_BLOCKING),
         SingleThreadTaskRunnerThreadMode::SHARED);
 
 #if defined(OS_WIN)
 LazyCOMSTATaskRunner g_com_sta_task_runner_user_visible =
     LAZY_COM_STA_TASK_RUNNER_INITIALIZER(
-        {TaskPriority::USER_VISIBLE},
+        TaskTraits(ThreadPool(), TaskPriority::USER_VISIBLE),
         SingleThreadTaskRunnerThreadMode::SHARED);
 LazyCOMSTATaskRunner g_com_sta_task_runner_user_blocking =
     LAZY_COM_STA_TASK_RUNNER_INITIALIZER(
-        {TaskPriority::USER_BLOCKING},
+        TaskTraits(ThreadPool(), TaskPriority::USER_BLOCKING),
         SingleThreadTaskRunnerThreadMode::SHARED);
 #endif  // defined(OS_WIN)
 

chrome/browser/chromeos/extensions/wallpaper_function_base.cc

@@ -35,12 +35,14 @@ const int kWallpaperLayoutCount = base::size(kWallpaperLayoutArrays);
 
 base::LazySequencedTaskRunner g_blocking_task_runner =
     LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
-        base::TaskTraits(base::MayBlock(),
+        base::TaskTraits(base::ThreadPool(),
+                         base::MayBlock(),
                          base::TaskPriority::USER_BLOCKING,
                          base::TaskShutdownBehavior::BLOCK_SHUTDOWN));
 base::LazySequencedTaskRunner g_non_blocking_task_runner =
     LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
-        base::TaskTraits(base::MayBlock(),
+        base::TaskTraits(base::ThreadPool(),
+                         base::MayBlock(),
                          base::TaskPriority::USER_VISIBLE,
                          base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN));
 

chrome/browser/chromeos/system_logs/debug_log_writer.cc

@@ -36,7 +36,8 @@ const char kTarCommand[] = "/bin/tar";
 
 base::LazySequencedTaskRunner g_sequenced_task_runner =
     LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
-        base::TaskTraits(base::MayBlock(),
+        base::TaskTraits(base::ThreadPool(),
+                         base::MayBlock(),
                          base::TaskPriority::BEST_EFFORT,
                          base::TaskShutdownBehavior::BLOCK_SHUTDOWN));
 

chrome/browser/devtools/devtools_file_system_indexer.cc

@@ -43,7 +43,7 @@ using std::set;
 
 base::SequencedTaskRunner* impl_task_runner() {
   constexpr base::TaskTraits kBlockingTraits = {
-      base::MayBlock(), base::TaskPriority::BEST_EFFORT};
+      base::ThreadPool(), base::MayBlock(), base::TaskPriority::BEST_EFFORT};
   static base::LazySequencedTaskRunner s_sequenced_task_task_runner =
       LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(kBlockingTraits);
   return s_sequenced_task_task_runner.Get().get();

chrome/browser/devtools/devtools_file_watcher.cc

@@ -225,7 +225,7 @@ void DevToolsFileWatcher::SharedFileWatcher::DispatchNotifications() {
 namespace {
 base::SequencedTaskRunner* impl_task_runner() {
   constexpr base::TaskTraits kImplTaskTraits = {
-      base::MayBlock(), base::TaskPriority::BEST_EFFORT};
+      base::ThreadPool(), base::MayBlock(), base::TaskPriority::BEST_EFFORT};
   static base::LazySequencedTaskRunner s_file_task_runner =
       LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(kImplTaskTraits);
   return s_file_task_runner.Get().get();

chrome/browser/extensions/activity_log/activity_log_task_runner.cc

@@ -16,7 +16,9 @@ base::SingleThreadTaskRunner* g_task_runner_for_testing = nullptr;
 
 base::LazySingleThreadTaskRunner g_task_runner =
     LAZY_SINGLE_THREAD_TASK_RUNNER_INITIALIZER(
-        base::TaskTraits({base::MayBlock(), base::TaskPriority::BEST_EFFORT}),
+        base::TaskTraits(base::ThreadPool(),
+                         base::MayBlock(),
+                         base::TaskPriority::BEST_EFFORT),
         base::SingleThreadTaskRunnerThreadMode::SHARED);
 
 }  // namespace

chrome/browser/google/google_update_settings_posix.cc

@@ -22,7 +22,8 @@ namespace {
 
 base::LazySequencedTaskRunner g_collect_stats_consent_task_runner =
     LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
-        base::TaskTraits(base::MayBlock(),
+        base::TaskTraits(base::ThreadPool(),
+                         base::MayBlock(),
                          base::TaskPriority::USER_VISIBLE,
                          base::TaskShutdownBehavior::BLOCK_SHUTDOWN));
 

chrome/browser/media_galleries/fileapi/media_file_system_backend.cc

@@ -60,7 +60,8 @@ const char kMediaGalleryMountPrefix[] = "media_galleries-";
 
 base::LazySequencedTaskRunner g_media_task_runner =
     LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
-        base::TaskTraits(base::MayBlock(),
+        base::TaskTraits(base::ThreadPool(),
+                         base::MayBlock(),
                          base::TaskPriority::USER_VISIBLE,
                          base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN));
 

chrome/browser/shell_integration.cc

@@ -55,11 +55,12 @@ const struct AppModeInfo* gAppModeInfo = nullptr;
 #if defined(OS_WIN)
 base::LazyCOMSTATaskRunner g_sequenced_task_runner =
     LAZY_COM_STA_TASK_RUNNER_INITIALIZER(
-        base::TaskTraits(base::MayBlock()),
+        base::TaskTraits(base::ThreadPool(), base::MayBlock()),
         base::SingleThreadTaskRunnerThreadMode::SHARED);
 #else
 base::LazySequencedTaskRunner g_sequenced_task_runner =
-    LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(base::TaskTraits(base::MayBlock()));
+    LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
+        base::TaskTraits(base::ThreadPool(), base::MayBlock()));
 #endif
 
 }  // namespace

chrome/browser/win/conflicts/module_database.cc

@@ -134,7 +134,7 @@ scoped_refptr<base::SequencedTaskRunner> ModuleDatabase::GetTaskRunner() {
           base::TaskTraits(content::BrowserThread::UI));
   static base::LazySequencedTaskRunner g_distinct_task_runner =
       LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
-          base::TaskTraits(base::TaskPriority::BEST_EFFORT,
+          base::TaskTraits(base::ThreadPool(), base::TaskPriority::BEST_EFFORT,
                            base::TaskShutdownBehavior::BLOCK_SHUTDOWN));
 
   return base::FeatureList::IsEnabled(kDistinctModuleDatabaseSequence)

chrome/installer/util/google_update_settings.cc

@@ -52,7 +52,8 @@ namespace {
 
 base::LazySequencedTaskRunner g_collect_stats_consent_task_runner =
     LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
-        base::TaskTraits(base::TaskPriority::USER_VISIBLE,
+        base::TaskTraits(base::ThreadPool(),
+                         base::TaskPriority::USER_VISIBLE,
                          base::TaskShutdownBehavior::BLOCK_SHUTDOWN));
 
 // Reads the value |name| from the app's ClientState registry key in |root| into

chromeos/process_proxy/process_proxy_registry.cc

@@ -75,8 +75,9 @@ ProcessProxyRegistry* ProcessProxyRegistry::Get() {
 // static
 scoped_refptr<base::SequencedTaskRunner> ProcessProxyRegistry::GetTaskRunner() {
   static base::LazySequencedTaskRunner task_runner =
-      LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(base::TaskTraits(
-          {base::MayBlock(), base::TaskPriority::BEST_EFFORT}));
+      LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
+          base::TaskTraits(base::ThreadPool(), base::MayBlock(),
+                           base::TaskPriority::BEST_EFFORT));
   return task_runner.Get();
 }
 

components/data_reduction_proxy/core/browser/data_reduction_proxy_config.cc

@@ -59,7 +59,8 @@ namespace {
 // id concurrently.
 base::LazySequencedTaskRunner g_get_network_id_task_runner =
     LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
-        base::TaskTraits(base::MayBlock(),
+        base::TaskTraits(base::ThreadPool(),
+                         base::MayBlock(),
                          base::TaskPriority::BEST_EFFORT,
                          base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN));
 #endif

components/dbus/dbus_thread_linux.cc

@@ -17,7 +17,9 @@ namespace {
 // single thread for all tasks.
 base::LazySingleThreadTaskRunner g_dbus_thread_task_runner =
     LAZY_SINGLE_THREAD_TASK_RUNNER_INITIALIZER(
-        base::TaskTraits(base::MayBlock(), base::TaskPriority::USER_BLOCKING),
+        base::TaskTraits(base::ThreadPool(),
+                         base::MayBlock(),
+                         base::TaskPriority::USER_BLOCKING),
         base::SingleThreadTaskRunnerThreadMode::SHARED);
 
 }  // namespace

components/download/internal/common/download_path_reservation_tracker.cc

@@ -61,7 +61,8 @@ const size_t kZoneIdentifierLength = sizeof(":Zone.Identifier") - 1;
 ReservationMap* g_reservation_map = NULL;
 
 base::LazySequencedTaskRunner g_sequenced_task_runner =
-    LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER({base::MayBlock()});
+    LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
+        base::TaskTraits(base::ThreadPool(), base::MayBlock()));
 
 // Observes a DownloadItem for changes to its target path and state. Updates or
 // revokes associated download path reservations as necessary. Created, invoked

components/download/internal/common/download_task_runner.cc

@@ -20,12 +20,16 @@ namespace {
 // necessitating the use of a COM single-threaded apartment sequence.
 base::LazyCOMSTATaskRunner g_download_task_runner =
     LAZY_COM_STA_TASK_RUNNER_INITIALIZER(
-        base::TaskTraits(base::MayBlock(), base::TaskPriority::USER_VISIBLE),
+        base::TaskTraits(base::ThreadPool(),
+                         base::MayBlock(),
+                         base::TaskPriority::USER_VISIBLE),
         base::SingleThreadTaskRunnerThreadMode::SHARED);
 #else
 base::LazySequencedTaskRunner g_download_task_runner =
     LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
-        base::TaskTraits(base::MayBlock(), base::TaskPriority::USER_VISIBLE));
+        base::TaskTraits(base::ThreadPool(),
+                         base::MayBlock(),
+                         base::TaskPriority::USER_VISIBLE));
 #endif
 
 base::LazyInstance<scoped_refptr<base::SingleThreadTaskRunner>>::

components/password_manager/core/browser/export/password_manager_exporter.cc

@@ -28,7 +28,9 @@ namespace {
 // passwords are being exported.
 base::LazySingleThreadTaskRunner g_task_runner =
     LAZY_SINGLE_THREAD_TASK_RUNNER_INITIALIZER(
-        base::TaskTraits(base::MayBlock(), base::TaskPriority::USER_VISIBLE),
+        base::TaskTraits(base::ThreadPool(),
+                         base::MayBlock(),
+                         base::TaskPriority::USER_VISIBLE),
         base::SingleThreadTaskRunnerThreadMode::SHARED);
 
 // A wrapper for |write_function|, which can be bound and keep a copy of its

content/browser/child_process_launcher_helper.cc

@@ -231,8 +231,9 @@ base::SingleThreadTaskRunner* GetProcessLauncherTaskRunner() {
   // SequencedTaskRunner on platforms other than Windows.
   static base::LazySingleThreadTaskRunner launcher_task_runner =
       LAZY_SINGLE_THREAD_TASK_RUNNER_INITIALIZER(
-          base::TaskTraits({base::MayBlock(), base::TaskPriority::USER_BLOCKING,
-                            base::TaskShutdownBehavior::BLOCK_SHUTDOWN}),
+          base::TaskTraits(base::ThreadPool(), base::MayBlock(),
+                           base::TaskPriority::USER_BLOCKING,
+                           base::TaskShutdownBehavior::BLOCK_SHUTDOWN),
           base::SingleThreadTaskRunnerThreadMode::DEDICATED);
   return launcher_task_runner.Get().get();
 #endif  // defined(OS_ANDROID)

content/browser/devtools/devtools_stream_file.cc

@@ -20,7 +20,7 @@ namespace content {
 
 scoped_refptr<base::SequencedTaskRunner> impl_task_runner() {
   constexpr base::TaskTraits kBlockingTraits = {
-      base::MayBlock(), base::TaskPriority::BEST_EFFORT};
+      base::ThreadPool(), base::MayBlock(), base::TaskPriority::BEST_EFFORT};
   static base::LazySequencedTaskRunner s_sequenced_task_unner =
       LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(kBlockingTraits);
   return s_sequenced_task_unner.Get();

content/browser/fileapi/browser_file_system_helper.cc

@@ -51,7 +51,8 @@ namespace {
 // global objects: https://codereview.chromium.org/2883403002#msg14.
 base::LazySequencedTaskRunner g_fileapi_task_runner =
     LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
-        base::TaskTraits(base::MayBlock(),
+        base::TaskTraits(base::ThreadPool(),
+                         base::MayBlock(),
                          base::TaskPriority::USER_VISIBLE,
                          base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN));
 

content/common/font_list.cc

@@ -12,7 +12,9 @@ namespace {
 
 base::LazySequencedTaskRunner g_font_list_task_runner =
     LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
-        base::TaskTraits(base::MayBlock(), base::TaskPriority::USER_VISIBLE));
+        base::TaskTraits(base::ThreadPool(),
+                         base::MayBlock(),
+                         base::TaskPriority::USER_VISIBLE));
 
 }  // namespace
 

extensions/browser/api/networking_private/networking_private_service_client.cc

@@ -36,9 +36,9 @@ void ShutdownWifiServiceOnWorkerThread(
 // Ensure that all calls to WiFiService are called from the same task runner
 // since the implementations do not provide any thread safety gaurantees.
 base::LazySequencedTaskRunner g_sequenced_task_runner =
-    LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
-        base::TaskTraits({base::MayBlock(), base::TaskPriority::USER_VISIBLE,
-                          base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN}));
+    LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(base::TaskTraits(
+        {base::ThreadPool(), base::MayBlock(), base::TaskPriority::USER_VISIBLE,
+         base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN}));
 
 }  // namespace
 

extensions/browser/extension_file_task_runner.cc

@@ -20,7 +20,8 @@ namespace {
 // task posted to a named thread (like the FILE thread) would receive.
 base::LazySequencedTaskRunner g_task_runner =
     LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
-        base::TaskTraits(base::MayBlock(),
+        base::TaskTraits(base::ThreadPool(),
+                         base::MayBlock(),
                          base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN,
                          base::TaskPriority::USER_VISIBLE));
 

net/nqe/network_quality_estimator.cc

@@ -60,7 +60,8 @@ namespace {
 // id concurrently.
 base::LazySequencedTaskRunner g_get_network_id_task_runner =
     LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
-        base::TaskTraits(base::MayBlock(),
+        base::TaskTraits(base::ThreadPool(),
+                         base::MayBlock(),
                          base::TaskPriority::BEST_EFFORT,
                          base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN));
 #endif