[TaskScheduler] Remove temporary forwarding headers and mass migrate users

When this CL is approved I will rebase it on top of tree and mass
migrate all callers in a new patch set (TBR'ed change).

TBR=robliao@chromium.org (for mass migration of existing callers)

Bug: 867421
Change-Id: I41092bbc4824964ee047e0bf53e972c8f6e896a4
Reviewed-on: https://chromium-review.googlesource.com/1161116
Commit-Queue: Gabriel Charette <gab@chromium.org>
Reviewed-by: Gabriel Charette <gab@chromium.org>
Reviewed-by: Sami Kyöstilä <skyostil@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580845}

android_webview/browser/aw_browser_context.cc

@@ -22,7 +22,7 @@
 #include "base/bind.h"
 #include "base/path_service.h"
 #include "base/single_thread_task_runner.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "components/autofill/core/common/autofill_prefs.h"
 #include "components/metrics/metrics_service.h"
 #include "components/policy/core/browser/browser_policy_connector_base.h"

android_webview/browser/aw_browser_terminator.cc

@@ -14,7 +14,7 @@
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/sync_socket.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/child_process_launcher_utils.h"

android_webview/browser/aw_contents_io_thread_client.h

@@ -14,7 +14,7 @@
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 
 namespace content {
 class WebContents;

android_webview/browser/aw_form_database_service.cc

@@ -7,7 +7,7 @@
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/autofill/core/browser/webdata/autofill_table.h"

android_webview/browser/aw_metrics_service_client.cc

@@ -23,7 +23,7 @@
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/strings/string16.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "components/metrics/call_stack_profile_metrics_provider.h"
 #include "components/metrics/enabled_state_provider.h"
 #include "components/metrics/gpu/gpu_metrics_provider.h"

android_webview/browser/net/android_stream_reader_url_request_job.cc

@@ -17,7 +17,7 @@
 #include "base/lazy_instance.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "net/base/io_buffer.h"

android_webview/browser/net/aw_url_request_context_getter.cc

@@ -25,7 +25,7 @@
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/sys_info.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "build/build_config.h"
 #include "components/network_session_configurator/common/network_switches.h"
 #include "components/prefs/pref_registry_simple.h"

android_webview/browser/tracing/aw_tracing_controller.cc

@@ -9,7 +9,7 @@
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/tracing_controller.h"

apps/launcher.cc

@@ -15,8 +15,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task_forward.h"
-#include "base/task/task_traits_forward.h"
+#include "base/task/post_task.h"
+#include "base/task/task_traits.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"

ash/assistant/assistant_screen_context_controller.cc

@@ -16,7 +16,7 @@
 #include "base/bind.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/stl_util.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/compositor/layer_tree_owner.h"
 #include "ui/gfx/codec/jpeg_codec.h"

ash/components/cursor/cursor_view.cc

@@ -4,7 +4,7 @@
 
 #include "ash/components/cursor/cursor_view.h"
 
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/paint/paint_canvas.h"
 #include "ui/aura/window.h"

ash/display/display_color_manager.cc

@@ -14,7 +14,7 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/sequenced_task_runner.h"
 #include "base/stl_util.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "components/quirks/quirks_manager.h"

ash/display/display_color_manager_unittest.cc

@@ -10,7 +10,7 @@
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/pattern.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/test/scoped_path_override.h"
 #include "base/test/scoped_task_environment.h"
 #include "chromeos/chromeos_paths.h"

ash/wallpaper/wallpaper_controller.cc

@@ -37,7 +37,7 @@
 #include "base/path_service.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/task_runner_util.h"
 #include "base/values.h"
 #include "chromeos/chromeos_switches.h"

ash/wallpaper/wallpaper_controller_unittest.cc

@@ -26,8 +26,8 @@
 #include "base/message_loop/message_loop_current.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
-#include "base/task/post_task_forward.h"
-#include "base/task/task_scheduler/task_scheduler_forward.h"
+#include "base/task/post_task.h"
+#include "base/task/task_scheduler/task_scheduler.h"
 #include "base/test/bind_test_util.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/prefs/testing_pref_service.h"

base/BUILD.gn

@@ -821,10 +821,8 @@ jumbo_component("base") {
     "task/cancelable_task_tracker.h",
     "task/lazy_task_runner.cc",
     "task/lazy_task_runner.h",
-    "task/lazy_task_runner_forward.h",
     "task/post_task.cc",
     "task/post_task.h",
-    "task/post_task_forward.h",
     "task/scoped_set_task_priority_for_current_thread.cc",
     "task/scoped_set_task_priority_for_current_thread.h",
     "task/sequence_manager/associated_thread_id.h",
@@ -865,7 +863,6 @@ jumbo_component("base") {
     "task/sequence_manager/work_queue_sets.cc",
     "task/sequence_manager/work_queue_sets.h",
     "task/single_thread_task_runner_thread_mode.h",
-    "task/single_thread_task_runner_thread_mode_forward.h",
     "task/task_scheduler/can_schedule_sequence_observer.h",
     "task/task_scheduler/delayed_task_manager.cc",
     "task/task_scheduler/delayed_task_manager.h",
@@ -873,7 +870,6 @@ jumbo_component("base") {
     "task/task_scheduler/environment_config.h",
     "task/task_scheduler/initialization_util.cc",
     "task/task_scheduler/initialization_util.h",
-    "task/task_scheduler/initialization_util_forward.h",
     "task/task_scheduler/platform_native_worker_pool_win.cc",
     "task/task_scheduler/platform_native_worker_pool_win.h",
     "task/task_scheduler/priority_queue.cc",
@@ -887,14 +883,12 @@ jumbo_component("base") {
     "task/task_scheduler/scheduler_worker.h",
     "task/task_scheduler/scheduler_worker_observer.h",
     "task/task_scheduler/scheduler_worker_params.h",
-    "task/task_scheduler/scheduler_worker_params_forward.h",
     "task/task_scheduler/scheduler_worker_pool.cc",
     "task/task_scheduler/scheduler_worker_pool.h",
     "task/task_scheduler/scheduler_worker_pool_impl.cc",
     "task/task_scheduler/scheduler_worker_pool_impl.h",
     "task/task_scheduler/scheduler_worker_pool_params.cc",
     "task/task_scheduler/scheduler_worker_pool_params.h",
-    "task/task_scheduler/scheduler_worker_pool_params_forward.h",
     "task/task_scheduler/scheduler_worker_stack.cc",
     "task/task_scheduler/scheduler_worker_stack.h",
     "task/task_scheduler/sequence.cc",
@@ -907,7 +901,6 @@ jumbo_component("base") {
     "task/task_scheduler/task.h",
     "task/task_scheduler/task_scheduler.cc",
     "task/task_scheduler/task_scheduler.h",
-    "task/task_scheduler/task_scheduler_forward.h",
     "task/task_scheduler/task_scheduler_impl.cc",
     "task/task_scheduler/task_scheduler_impl.h",
     "task/task_scheduler/task_tracker.cc",
@@ -916,7 +909,6 @@ jumbo_component("base") {
     "task/task_traits.cc",
     "task/task_traits.h",
     "task/task_traits_details.h",
-    "task/task_traits_forward.h",
     "task_runner.cc",
     "task_runner.h",
     "task_runner_util.h",

base/debug/task_annotator_unittest.cc

@@ -17,7 +17,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/test/scoped_task_environment.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"

base/i18n/streaming_utf8_validator_unittest.cc

@@ -32,8 +32,8 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversion_utils.h"
 #include "base/synchronization/lock.h"
-#include "base/task/post_task_forward.h"
-#include "base/task/task_scheduler/task_scheduler_forward.h"
+#include "base/task/post_task.h"
+#include "base/task/task_scheduler/task_scheduler.h"
 #include "third_party/icu/source/common/unicode/utf8.h"
 
 #endif  // BASE_I18N_UTF8_VALIDATOR_THOROUGH_TEST

base/message_loop/message_loop_unittest.cc

@@ -22,7 +22,7 @@
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/task/task_scheduler/task_scheduler_forward.h"
+#include "base/task/task_scheduler/task_scheduler.h"
 #include "base/test/bind_test_util.h"
 #include "base/test/gtest_util.h"
 #include "base/test/metrics/histogram_tester.h"

base/observer_list_unittest.cc

@@ -18,8 +18,8 @@
 #include "base/sequenced_task_runner.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/task/post_task_forward.h"
-#include "base/task/task_scheduler/task_scheduler_forward.h"
+#include "base/task/post_task.h"
+#include "base/task/task_scheduler/task_scheduler.h"
 #include "base/test/gtest_util.h"
 #include "base/test/scoped_task_environment.h"
 #include "base/threading/platform_thread.h"

base/process/kill.cc

@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "base/process/process_iterator.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/time/time.h"
 
 namespace base {

base/process/kill_fuchsia.cc

@@ -7,7 +7,7 @@
 #include <zircon/syscalls.h>
 
 #include "base/process/process_iterator.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/threading/platform_thread.h"
 
 namespace base {

base/process/kill_posix.cc

@@ -16,7 +16,7 @@
 #include "base/macros.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/process/process_iterator.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
 

base/task/lazy_task_runner_forward.h

@@ -1,38 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_TASK_LAZY_TASK_RUNNER_FORWARD_H_
-#define BASE_TASK_LAZY_TASK_RUNNER_FORWARD_H_
-
-// If you are seeing this you synced to a very short-lived state in the task
-// scheduler's header migration. To keep as much git history as possible while
-// avoiding a mass header rename in thousands of file in the main move CL,
-// base/task_scheduler's public headers were moved this way :
-// for each base/task_scheduler/public.h:
-//  A.1) Introduce base/task/public_forward.h and move the world to use it
-//  A.2) Move base/task_scheduler/public.h to base/task/public.h (and update
-//       forwarding headers)
-//  A.3) Delete base/task/public_forward.h (move world to base/task/public.h).
-//
-// An alternative would have been:
-//  B.1) Move base/task_scheduler/public.h to base/task/public.h and leave
-//       a stub fowarding header in base/task_scheduler/public.h
-//  B.2) Migrate world from base/task_scheduler/public.h to base/task/public.h
-//       and delete stub.
-// That approach however results in git not considering base/task/public.h as
-// being a new file rather than a move in (B.1) and losing all history.
-//
-// Another alternative would have been:
-//  C.1) Introduce base/task/public.h as a forwarding header and move the world
-//       to it
-//  C.2) Move base/task_scheduler/public.h over base/task/public.h
-// That approach also results in git not considering (C.2) a file move (per
-// overriding an existing file) and losing all history.
-//
-// As such approach A was preferred : the landing process will wait for all 3
-// CLs to be LGTM'ed in approach A and then land them switfly back-to-back.
-
-#include "base/task/lazy_task_runner.h"
-
-#endif  // BASE_TASK_LAZY_TASK_RUNNER_FORWARD_H_

base/task/post_task_forward.h

@@ -1,38 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_TASK_POST_TASK_FORWARD_H_
-#define BASE_TASK_POST_TASK_FORWARD_H_
-
-// If you are seeing this you synced to a very short-lived state in the task
-// scheduler's header migration. To keep as much git history as possible while
-// avoiding a mass header rename in thousands of file in the main move CL,
-// base/task_scheduler's public headers were moved this way :
-// for each base/task_scheduler/public.h:
-//  A.1) Introduce base/task/public_forward.h and move the world to use it
-//  A.2) Move base/task_scheduler/public.h to base/task/public.h (and update
-//       forwarding headers)
-//  A.3) Delete base/task/public_forward.h (move world to base/task/public.h).
-//
-// An alternative would have been:
-//  B.1) Move base/task_scheduler/public.h to base/task/public.h and leave
-//       a stub fowarding header in base/task_scheduler/public.h
-//  B.2) Migrate world from base/task_scheduler/public.h to base/task/public.h
-//       and delete stub.
-// That approach however results in git not considering base/task/public.h as
-// being a new file rather than a move in (B.1) and losing all history.
-//
-// Another alternative would have been:
-//  C.1) Introduce base/task/public.h as a forwarding header and move the world
-//       to it
-//  C.2) Move base/task_scheduler/public.h over base/task/public.h
-// That approach also results in git not considering (C.2) a file move (per
-// overriding an existing file) and losing all history.
-//
-// As such approach A was preferred : the landing process will wait for all 3
-// CLs to be LGTM'ed in approach A and then land them switfly back-to-back.
-
-#include "base/task/post_task.h"
-
-#endif  // BASE_TASK_POST_TASK_FORWARD_H_

base/task/single_thread_task_runner_thread_mode_forward.h

@@ -1,38 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_TASK_SINGLE_THREAD_TASK_RUNNER_THREAD_MODE_FORWARD_H_
-#define BASE_TASK_SINGLE_THREAD_TASK_RUNNER_THREAD_MODE_FORWARD_H_
-
-// If you are seeing this you synced to a very short-lived state in the task
-// scheduler's header migration. To keep as much git history as possible while
-// avoiding a mass header rename in thousands of file in the main move CL,
-// base/task_scheduler's public headers were moved this way :
-// for each base/task_scheduler/public.h:
-//  A.1) Introduce base/task/public_forward.h and move the world to use it
-//  A.2) Move base/task_scheduler/public.h to base/task/public.h (and update
-//       forwarding headers)
-//  A.3) Delete base/task/public_forward.h (move world to base/task/public.h).
-//
-// An alternative would have been:
-//  B.1) Move base/task_scheduler/public.h to base/task/public.h and leave
-//       a stub fowarding header in base/task_scheduler/public.h
-//  B.2) Migrate world from base/task_scheduler/public.h to base/task/public.h
-//       and delete stub.
-// That approach however results in git not considering base/task/public.h as
-// being a new file rather than a move in (B.1) and losing all history.
-//
-// Another alternative would have been:
-//  C.1) Introduce base/task/public.h as a forwarding header and move the world
-//       to it
-//  C.2) Move base/task_scheduler/public.h over base/task/public.h
-// That approach also results in git not considering (C.2) a file move (per
-// overriding an existing file) and losing all history.
-//
-// As such approach A was preferred : the landing process will wait for all 3
-// CLs to be LGTM'ed in approach A and then land them switfly back-to-back.
-
-#include "base/task/single_thread_task_runner_thread_mode.h"
-
-#endif  // BASE_TASK_SINGLE_THREAD_TASK_RUNNER_THREAD_MODE_FORWARD_H_

base/task/task_scheduler/initialization_util_forward.h

@@ -1,38 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_TASK_TASK_SCHEDULER_INITIALIZATION_UTIL_FORWARD_H_
-#define BASE_TASK_TASK_SCHEDULER_INITIALIZATION_UTIL_FORWARD_H_
-
-// If you are seeing this you synced to a very short-lived state in the task
-// scheduler's header migration. To keep as much git history as possible while
-// avoiding a mass header rename in thousands of file in the main move CL,
-// base/task_scheduler's public headers were moved this way :
-// for each base/task_scheduler/public.h:
-//  A.1) Introduce base/task/public_forward.h and move the world to use it
-//  A.2) Move base/task_scheduler/public.h to base/task/public.h (and update
-//       forwarding headers)
-//  A.3) Delete base/task/public_forward.h (move world to base/task/public.h).
-//
-// An alternative would have been:
-//  B.1) Move base/task_scheduler/public.h to base/task/public.h and leave
-//       a stub fowarding header in base/task_scheduler/public.h
-//  B.2) Migrate world from base/task_scheduler/public.h to base/task/public.h
-//       and delete stub.
-// That approach however results in git not considering base/task/public.h as
-// being a new file rather than a move in (B.1) and losing all history.
-//
-// Another alternative would have been:
-//  C.1) Introduce base/task/public.h as a forwarding header and move the world
-//       to it
-//  C.2) Move base/task_scheduler/public.h over base/task/public.h
-// That approach also results in git not considering (C.2) a file move (per
-// overriding an existing file) and losing all history.
-//
-// As such approach A was preferred : the landing process will wait for all 3
-// CLs to be LGTM'ed in approach A and then land them switfly back-to-back.
-
-#include "base/task/task_scheduler/initialization_util.h"
-
-#endif  // BASE_TASK_TASK_SCHEDULER_INITIALIZATION_UTIL_FORWARD_H_

base/task/task_scheduler/scheduler_worker_params_forward.h

@@ -1,38 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_TASK_TASK_SCHEDULER_SCHEDULER_WORKER_PARAMS_FORWARD_H_
-#define BASE_TASK_TASK_SCHEDULER_SCHEDULER_WORKER_PARAMS_FORWARD_H_
-
-// If you are seeing this you synced to a very short-lived state in the task
-// scheduler's header migration. To keep as much git history as possible while
-// avoiding a mass header rename in thousands of file in the main move CL,
-// base/task_scheduler's public headers were moved this way :
-// for each base/task_scheduler/public.h:
-//  A.1) Introduce base/task/public_forward.h and move the world to use it
-//  A.2) Move base/task_scheduler/public.h to base/task/public.h (and update
-//       forwarding headers)
-//  A.3) Delete base/task/public_forward.h (move world to base/task/public.h).
-//
-// An alternative would have been:
-//  B.1) Move base/task_scheduler/public.h to base/task/public.h and leave
-//       a stub fowarding header in base/task_scheduler/public.h
-//  B.2) Migrate world from base/task_scheduler/public.h to base/task/public.h
-//       and delete stub.
-// That approach however results in git not considering base/task/public.h as
-// being a new file rather than a move in (B.1) and losing all history.
-//
-// Another alternative would have been:
-//  C.1) Introduce base/task/public.h as a forwarding header and move the world
-//       to it
-//  C.2) Move base/task_scheduler/public.h over base/task/public.h
-// That approach also results in git not considering (C.2) a file move (per
-// overriding an existing file) and losing all history.
-//
-// As such approach A was preferred : the landing process will wait for all 3
-// CLs to be LGTM'ed in approach A and then land them switfly back-to-back.
-
-#include "base/task/task_scheduler/scheduler_worker_params_forward.h"
-
-#endif  // BASE_TASK_TASK_SCHEDULER_SCHEDULER_WORKER_PARAMS_FORWARD_H_

base/task/task_scheduler/scheduler_worker_pool_params_forward.h

@@ -1,38 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_TASK_TASK_SCHEDULER_SCHEDULER_WORKER_POOL_PARAMS_FORWARD_H_
-#define BASE_TASK_TASK_SCHEDULER_SCHEDULER_WORKER_POOL_PARAMS_FORWARD_H_
-
-// If you are seeing this you synced to a very short-lived state in the task
-// scheduler's header migration. To keep as much git history as possible while
-// avoiding a mass header rename in thousands of file in the main move CL,
-// base/task_scheduler's public headers were moved this way :
-// for each base/task_scheduler/public.h:
-//  A.1) Introduce base/task/public_forward.h and move the world to use it
-//  A.2) Move base/task_scheduler/public.h to base/task/public.h (and update
-//       forwarding headers)
-//  A.3) Delete base/task/public_forward.h (move world to base/task/public.h).
-//
-// An alternative would have been:
-//  B.1) Move base/task_scheduler/public.h to base/task/public.h and leave
-//       a stub fowarding header in base/task_scheduler/public.h
-//  B.2) Migrate world from base/task_scheduler/public.h to base/task/public.h
-//       and delete stub.
-// That approach however results in git not considering base/task/public.h as
-// being a new file rather than a move in (B.1) and losing all history.
-//
-// Another alternative would have been:
-//  C.1) Introduce base/task/public.h as a forwarding header and move the world
-//       to it
-//  C.2) Move base/task_scheduler/public.h over base/task/public.h
-// That approach also results in git not considering (C.2) a file move (per
-// overriding an existing file) and losing all history.
-//
-// As such approach A was preferred : the landing process will wait for all 3
-// CLs to be LGTM'ed in approach A and then land them switfly back-to-back.
-
-#include "base/task/task_scheduler/scheduler_worker_pool_params_forward.h"
-
-#endif  // BASE_TASK_TASK_SCHEDULER_SCHEDULER_WORKER_POOL_PARAMS_FORWARD_H_

base/task/task_scheduler/task_scheduler_forward.h

@@ -1,38 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_TASK_TASK_SCHEDULER_TASK_SCHEDULER_FORWARD_H_
-#define BASE_TASK_TASK_SCHEDULER_TASK_SCHEDULER_FORWARD_H_
-
-// If you are seeing this you synced to a very short-lived state in the task
-// scheduler's header migration. To keep as much git history as possible while
-// avoiding a mass header rename in thousands of file in the main move CL,
-// base/task_scheduler's public headers were moved this way :
-// for each base/task_scheduler/public.h:
-//  A.1) Introduce base/task/public_forward.h and move the world to use it
-//  A.2) Move base/task_scheduler/public.h to base/task/public.h (and update
-//       forwarding headers)
-//  A.3) Delete base/task/public_forward.h (move world to base/task/public.h).
-//
-// An alternative would have been:
-//  B.1) Move base/task_scheduler/public.h to base/task/public.h and leave
-//       a stub fowarding header in base/task_scheduler/public.h
-//  B.2) Migrate world from base/task_scheduler/public.h to base/task/public.h
-//       and delete stub.
-// That approach however results in git not considering base/task/public.h as
-// being a new file rather than a move in (B.1) and losing all history.
-//
-// Another alternative would have been:
-//  C.1) Introduce base/task/public.h as a forwarding header and move the world
-//       to it
-//  C.2) Move base/task_scheduler/public.h over base/task/public.h
-// That approach also results in git not considering (C.2) a file move (per
-// overriding an existing file) and losing all history.
-//
-// As such approach A was preferred : the landing process will wait for all 3
-// CLs to be LGTM'ed in approach A and then land them switfly back-to-back.
-
-#include "base/task/task_scheduler/task_scheduler.h"
-
-#endif  // BASE_TASK_TASK_SCHEDULER_TASK_SCHEDULER_FORWARD_H_

base/task/task_traits_forward.h

@@ -1,38 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_TASK_TASK_TRAITS_FORWARD_H_
-#define BASE_TASK_TASK_TRAITS_FORWARD_H_
-
-// If you are seeing this you synced to a very short-lived state in the task
-// scheduler's header migration. To keep as much git history as possible while
-// avoiding a mass header rename in thousands of file in the main move CL,
-// base/task_scheduler's public headers were moved this way :
-// for each base/task_scheduler/public.h:
-//  A.1) Introduce base/task/public_forward.h and move the world to use it
-//  A.2) Move base/task_scheduler/public.h to base/task/public.h (and update
-//       forwarding headers)
-//  A.3) Delete base/task/public_forward.h (move world to base/task/public.h).
-//
-// An alternative would have been:
-//  B.1) Move base/task_scheduler/public.h to base/task/public.h and leave
-//       a stub fowarding header in base/task_scheduler/public.h
-//  B.2) Migrate world from base/task_scheduler/public.h to base/task/public.h
-//       and delete stub.
-// That approach however results in git not considering base/task/public.h as
-// being a new file rather than a move in (B.1) and losing all history.
-//
-// Another alternative would have been:
-//  C.1) Introduce base/task/public.h as a forwarding header and move the world
-//       to it
-//  C.2) Move base/task_scheduler/public.h over base/task/public.h
-// That approach also results in git not considering (C.2) a file move (per
-// overriding an existing file) and losing all history.
-//
-// As such approach A was preferred : the landing process will wait for all 3
-// CLs to be LGTM'ed in approach A and then land them switfly back-to-back.
-
-#include "base/task/task_traits.h"
-
-#endif  // BASE_TASK_TASK_TRAITS_FORWARD_H_

base/test/launcher/test_launcher.cc

@@ -39,8 +39,8 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
-#include "base/task/post_task_forward.h"
-#include "base/task/task_scheduler/task_scheduler_forward.h"
+#include "base/task/post_task.h"
+#include "base/task/task_scheduler/task_scheduler.h"
 #include "base/test/gtest_util.h"
 #include "base/test/launcher/test_launcher_tracer.h"
 #include "base/test/launcher/test_results_tracker.h"

base/test/scoped_task_environment.cc

@@ -11,8 +11,8 @@
 #include "base/run_loop.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
-#include "base/task/post_task_forward.h"
-#include "base/task/task_scheduler/task_scheduler_forward.h"
+#include "base/task/post_task.h"
+#include "base/task/task_scheduler/task_scheduler.h"
 #include "base/task/task_scheduler/task_scheduler_impl.h"
 #include "base/test/test_mock_time_task_runner.h"
 #include "base/threading/sequence_local_storage_map.h"

base/test/scoped_task_environment.h

@@ -8,7 +8,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
-#include "base/task/lazy_task_runner_forward.h"
+#include "base/task/lazy_task_runner.h"
 #include "build/build_config.h"
 
 namespace base {

base/test/scoped_task_environment_unittest.cc

@@ -11,7 +11,7 @@
 #include "base/bind_helpers.h"
 #include "base/synchronization/atomic_flag.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/sequence_local_storage_slot.h"

base/threading/sequenced_task_runner_handle_unittest.cc

@@ -15,7 +15,7 @@
 #include "base/sequence_checker_impl.h"
 #include "base/sequenced_task_runner.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/test/scoped_task_environment.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"

base/timer/hi_res_timer_manager_win.cc

@@ -9,7 +9,7 @@
 #include "base/atomicops.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/power_monitor/power_monitor.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/time/time.h"
 
 namespace base {

base/timer/timer_unittest.cc

@@ -18,7 +18,7 @@
 #include "base/run_loop.h"
 #include "base/sequenced_task_runner.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/test/scoped_task_environment.h"
 #include "base/test/test_mock_time_task_runner.h"
 #include "base/threading/platform_thread.h"

base/trace_event/memory_dump_manager_unittest.cc

@@ -20,7 +20,7 @@
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/test/scoped_task_environment.h"
 #include "base/test/test_io_thread.h"
 #include "base/threading/platform_thread.h"

base/trace_event/trace_log.cc

@@ -28,7 +28,7 @@
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "base/threading/thread_id_name_manager.h"

cc/tiles/image_controller.cc

@@ -5,8 +5,8 @@
 #include "cc/tiles/image_controller.h"
 
 #include "base/bind.h"
-#include "base/task/post_task_forward.h"
-#include "base/task/task_traits_forward.h"
+#include "base/task/post_task.h"
+#include "base/task/task_traits.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/base/completion_event.h"

chrome/browser/after_startup_task_utils_unittest.cc

@@ -11,7 +11,7 @@
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/task_runner_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"

chrome/browser/android/download/download_media_parser_bridge.cc

@@ -6,7 +6,7 @@
 
 #include "base/android/jni_string.h"
 #include "base/files/file_path.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "chrome/browser/android/download/download_media_parser.h"
 #include "jni/DownloadMediaParserBridge_jni.h"
 

chrome/browser/android/history_report/delta_file_service.cc

@@ -7,8 +7,8 @@
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/task/post_task_forward.h"
-#include "base/task/task_traits_forward.h"
+#include "base/task/post_task.h"
+#include "base/task/task_traits.h"
 #include "base/trace_event/memory_dump_manager.h"
 #include "chrome/browser/android/history_report/delta_file_backend_leveldb.h"
 #include "chrome/browser/android/history_report/delta_file_commons.h"

chrome/browser/android/history_report/usage_reports_buffer_service.cc

@@ -7,8 +7,8 @@
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/task/post_task_forward.h"
-#include "base/task/task_traits_forward.h"
+#include "base/task/post_task.h"
+#include "base/task/task_traits.h"
 #include "base/trace_event/memory_dump_manager.h"
 #include "chrome/browser/android/history_report/usage_reports_buffer_backend.h"
 #include "chrome/browser/android/proto/delta_file.pb.h"

chrome/browser/android/password_ui_view_android.cc

@@ -18,7 +18,7 @@
 #include "base/metrics/field_trial.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_piece.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/grit/generated_resources.h"

chrome/browser/android/thumbnail/thumbnail_cache.cc

@@ -17,7 +17,7 @@
 #include "base/files/file_util.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "content/public/browser/browser_thread.h"

chrome/browser/android/vr/arcore_device/arcore_device.cc

@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/numerics/math_constants.h"
 #include "base/optional.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/trace_event/trace_event.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/android/vr/arcore_device/arcore_gl.h"

chrome/browser/android/vr/arcore_device/arcore_gl.cc

@@ -13,7 +13,7 @@
 #include "base/containers/queue.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "chrome/browser/android/vr/arcore_device/ar_image_transport.h"

chrome/browser/android/vr/mailbox_to_surface_bridge.cc

@@ -9,7 +9,7 @@
 
 #include "base/logging.h"
 #include "base/sys_info.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "components/viz/common/gpu/context_provider.h"
 #include "content/public/browser/android/compositor.h"

chrome/browser/android/vr/vr_shell_gl.cc

@@ -17,7 +17,7 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/optional.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event_argument.h"

chrome/browser/android/webapk/webapk_installer.cc

@@ -22,7 +22,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/timer/elapsed_timer.h"

chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc

@@ -10,7 +10,7 @@
 #include "base/location.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "chrome/browser/android/shortcut_helper.h"
 #include "chrome/browser/android/webapk/chrome_webapk_host.h"
 #include "chrome/browser/android/webapk/webapk_web_manifest_checker.h"

chrome/browser/app_controller_mac.mm

@@ -25,7 +25,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h"

chrome/browser/apps/app_shim/app_shim_host_manager_mac.mm

@@ -11,7 +11,7 @@
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "chrome/browser/apps/app_shim/app_shim_handler_mac.h"
 #include "chrome/browser/apps/app_shim/app_shim_host_mac.h"
 #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h"

chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm

@@ -18,7 +18,7 @@
 #include "base/process/launch.h"
 #include "base/run_loop.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread_restrictions.h"

chrome/browser/background/background_mode_manager_mac.mm

@@ -6,7 +6,7 @@
 #include "base/command_line.h"
 #include "base/mac/mac_util.h"
 #include "base/sequenced_task_runner.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_process.h"

chrome/browser/background/background_mode_manager_win.cc

@@ -9,7 +9,7 @@
 #include "base/logging.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/win/registry.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/common/chrome_switches.h"

chrome/browser/bookmarks/bookmark_html_writer.h

@@ -14,7 +14,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/task/cancelable_task_tracker.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "components/favicon_base/favicon_types.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"

chrome/browser/browser_process_impl.cc

@@ -25,8 +25,8 @@
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/task/post_task_forward.h"
-#include "base/task/task_traits_forward.h"
+#include "base/task/post_task.h"
+#include "base/task/task_traits.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/thread_task_runner_handle.h"

chrome/browser/browser_process_impl_unittest.cc

@@ -10,7 +10,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/user_metrics.h"
 #include "base/run_loop.h"
-#include "base/task/task_scheduler/task_scheduler_forward.h"
+#include "base/task/task_scheduler/task_scheduler.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile_manager.h"

chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc

@@ -15,7 +15,7 @@
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/metrics/user_metrics.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "build/build_config.h"
 #include "chrome/browser/android/feed/feed_host_service_factory.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"

chrome/browser/browsing_data/site_data_size_collector.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/browsing_data/site_data_size_collector.h"
 
 #include "base/files/file_util.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"

chrome/browser/budget_service/budget_database.cc

@@ -6,7 +6,7 @@
 
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/time/clock.h"
 #include "base/time/default_clock.h"
 #include "chrome/browser/budget_service/budget.pb.h"

chrome/browser/chrome_browser_field_trials.cc

@@ -18,7 +18,7 @@
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/sys_info.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/metrics/chrome_metrics_service_client.h"

chrome/browser/chrome_browser_field_trials_desktop.cc

@@ -21,7 +21,7 @@
 #include "base/metrics/field_trial_params.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/path_service.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/time/time.h"
 #include "chrome/browser/prerender/prerender_field_trial.h"
 #include "chrome/common/chrome_paths.h"

chrome/browser/chrome_browser_main.cc

@@ -40,7 +40,7 @@
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/default_tick_clock.h"

chrome/browser/chrome_browser_main_android.cc

@@ -10,7 +10,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_current.h"
 #include "base/path_service.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/trace_event/trace_event.h"
 #include "chrome/browser/android/mojo/chrome_interface_registrar_android.h"
 #include "chrome/browser/android/preferences/clipboard_android.h"

chrome/browser/chrome_browser_main_linux.cc

@@ -12,7 +12,7 @@
 
 #include "base/files/file_path.h"
 #include "base/single_thread_task_runner.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/grit/chromium_strings.h"

chrome/browser/chrome_browser_main_mac.mm

@@ -15,8 +15,8 @@
 #include "base/mac/scoped_nsobject.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/path_service.h"
-#include "base/task/post_task_forward.h"
-#include "base/task/task_traits_forward.h"
+#include "base/task/post_task.h"
+#include "base/task/task_traits.h"
 #include "base/threading/thread_task_runner_handle.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/apps/app_shim/app_shim_host_manager_mac.h"

chrome/browser/chrome_browser_main_win.cc

@@ -27,7 +27,7 @@
 #include "base/scoped_native_library.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "base/version.h"
 #include "base/win/pe_image.h"

chrome/browser/chromeos/app_mode/kiosk_app_data.cc

@@ -11,7 +11,7 @@
 #include "base/json/json_writer.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted_memory.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_data_delegate.h"

chrome/browser/chromeos/app_mode/kiosk_app_data_base.cc

@@ -7,8 +7,8 @@
 #include <utility>
 
 #include "base/files/file_util.h"
-#include "base/task/post_task_forward.h"
-#include "base/task/task_traits_forward.h"
+#include "base/task/post_task.h"
+#include "base/task/task_traits.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/browser_process.h"
 #include "components/prefs/pref_service.h"

chrome/browser/chromeos/app_mode/kiosk_app_icon_loader.cc

@@ -10,8 +10,8 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/sequenced_task_runner.h"
-#include "base/task/post_task_forward.h"
-#include "base/task/task_traits_forward.h"
+#include "base/task/post_task.h"
+#include "base/task/task_traits.h"
 #include "chrome/browser/image_decoder.h"
 #include "content/public/browser/browser_thread.h"
 

chrome/browser/chromeos/app_mode/kiosk_app_manager.cc

@@ -18,7 +18,7 @@
 #include "base/sequenced_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/app_mode/app_session.h"

chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc

@@ -20,8 +20,8 @@
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/task/post_task_forward.h"
-#include "base/task/task_traits_forward.h"
+#include "base/task/post_task.h"
+#include "base/task/task_traits.h"
 #include "base/test/scoped_path_override.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"

chrome/browser/chromeos/arc/arc_util.cc

@@ -17,7 +17,7 @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/sys_info.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
 #include "chrome/browser/chromeos/arc/policy/arc_policy_util.h"

chrome/browser/chromeos/arc/downloads_watcher/arc_downloads_watcher_service.cc

@@ -18,8 +18,8 @@
 #include "base/memory/singleton.h"
 #include "base/sequence_checker.h"
 #include "base/strings/string_util.h"
-#include "base/task/post_task_forward.h"
-#include "base/task/task_traits_forward.h"
+#include "base/task/post_task.h"
+#include "base/task/task_traits.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "base/time/time.h"
 #include "chrome/browser/download/download_prefs.h"

chrome/browser/chromeos/arc/fileapi/arc_content_file_system_file_stream_reader.cc

@@ -8,7 +8,7 @@
 #include <unistd.h>
 
 #include "base/files/file.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/chromeos/arc/fileapi/arc_file_system_operation_runner_util.h"
 #include "content/public/browser/browser_thread.h"

chrome/browser/chromeos/arc/fileapi/file_stream_forwarder.cc

@@ -8,8 +8,8 @@
 #include <utility>
 
 #include "base/files/file_util.h"
-#include "base/task/task_scheduler/task_scheduler_forward.h"
-#include "base/task/task_traits_forward.h"
+#include "base/task/task_scheduler/task_scheduler.h"
+#include "base/task/task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/net_errors.h"
 

chrome/browser/chromeos/arc/print/arc_print_service.cc

@@ -13,7 +13,7 @@
 #include "base/bind_helpers.h"
 #include "base/memory/singleton.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/printing/cups_print_job.h"
 #include "chrome/browser/chromeos/printing/cups_print_job_manager.h"

chrome/browser/chromeos/arc/process/arc_process_service.cc

@@ -21,8 +21,8 @@
 #include "base/memory/singleton.h"
 #include "base/process/process.h"
 #include "base/process/process_iterator.h"
-#include "base/task/post_task_forward.h"
-#include "base/task/task_traits_forward.h"
+#include "base/task/post_task.h"
+#include "base/task/task_traits.h"
 #include "base/task_runner_util.h"
 #include "base/trace_event/trace_event.h"
 #include "components/arc/arc_bridge_service.h"

chrome/browser/chromeos/arc/voice_interaction/arc_voice_interaction_framework_service.cc

@@ -19,7 +19,7 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/chromeos/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge.h"
 #include "chrome/browser/chromeos/arc/voice_interaction/highlighter_controller_client.h"

chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.cc

@@ -10,7 +10,7 @@
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "chrome/browser/ui/ash/wallpaper_controller_client.h"
 #include "components/account_id/account_id.h"
 #include "components/arc/arc_bridge_service.h"

chrome/browser/chromeos/authpolicy/auth_policy_credentials_manager.cc

@@ -11,7 +11,7 @@
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/lifetime/application_lifetime.h"

chrome/browser/chromeos/base/file_flusher.cc

@@ -12,7 +12,7 @@
 #include "base/files/file_enumerator.h"
 #include "base/logging.h"
 #include "base/synchronization/cancellation_flag.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chromeos {

chrome/browser/chromeos/base/locale_util.cc

@@ -7,7 +7,7 @@
 #include <utility>
 #include <vector>
 
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/profiles/profile.h"

chrome/browser/chromeos/boot_times_recorder.cc

@@ -22,7 +22,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/thread_task_runner_handle.h"

chrome/browser/chromeos/camera_detector.cc

@@ -10,7 +10,7 @@
 #include "base/location.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/task_runner_util.h"
 #include "components/storage_monitor/udev_util_linux.h"
 #include "content/public/browser/browser_thread.h"

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -29,9 +29,9 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/sys_info.h"
-#include "base/task/post_task_forward.h"
-#include "base/task/task_scheduler/task_scheduler_forward.h"
-#include "base/task/task_traits_forward.h"
+#include "base/task/post_task.h"
+#include "base/task/task_scheduler/task_scheduler.h"
+#include "base/task/task_traits.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part_chromeos.h"
 #include "chrome/browser/chrome_notification_types.h"

chrome/browser/chromeos/crostini/crostini_manager.cc

@@ -12,7 +12,7 @@
 #include "base/no_destructor.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/crostini/crostini_remover.h"
 #include "chrome/browser/chromeos/crostini/crostini_util.h"

chrome/browser/chromeos/crostini/crostini_registry_service.cc

@@ -11,7 +11,7 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/time/clock.h"
 #include "base/time/default_clock.h"
 #include "base/time/time.h"

chrome/browser/chromeos/crostini/crostini_util.cc

@@ -9,7 +9,7 @@
 #include "base/files/file_path.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/strings/string_util.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/chromeos/crostini/crostini_app_launch_observer.h"
 #include "chrome/browser/chromeos/crostini/crostini_manager.h"

chrome/browser/chromeos/customization/customization_document.cc

@@ -23,7 +23,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"

chrome/browser/chromeos/customization/customization_wallpaper_downloader.cc

@@ -9,7 +9,7 @@
 #include <utility>
 
 #include "base/files/file_util.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/net/system_network_context_manager.h"
 #include "content/public/browser/browser_thread.h"

chrome/browser/chromeos/customization/customization_wallpaper_util.cc

@@ -8,7 +8,7 @@
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/sequenced_task_runner.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/customization/customization_document.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_loader.h"

chrome/browser/chromeos/drive/download_handler.cc

@@ -14,7 +14,7 @@
 #include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/supports_user_data.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"

chrome/browser/chromeos/drive/drive_integration_service.cc

@@ -14,7 +14,7 @@
 #include "base/md5.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/timer/timer.h"
 #include "base/unguessable_token.h"
 #include "chrome/browser/browser_process.h"

chrome/browser/chromeos/drive/file_system_util.cc

@@ -20,7 +20,7 @@
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"

chrome/browser/chromeos/drive/fileapi/async_file_util.cc

@@ -10,7 +10,7 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
-#include "base/task/post_task_forward.h"
+#include "base/task/post_task.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"