Update header includes for /base/functional in /m*
bind.h, callback.h, callback_forward.h, and callback_helpers.h
moved into /base/functional/. Update the include paths to
directly include them in their new location.
Bug: 1364441
Change-Id: Iefb9705393d1f186414448b53e2ff6a3c5f109db
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4158052
Owners-Override: Avi Drissman <avi@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Owners-Override: Daniel Cheng <dcheng@chromium.org>
Auto-Submit: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1091573}
diff --git a/media/audio/aecdump_recording_manager.cc b/media/audio/aecdump_recording_manager.cc
index fb2abc79..86f9232 100644
--- a/media/audio/aecdump_recording_manager.cc
+++ b/media/audio/aecdump_recording_manager.cc
@@ -4,8 +4,8 @@
#include "media/audio/aecdump_recording_manager.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/single_thread_task_runner.h"
#include "base/task/thread_pool.h"
#include "media/audio/audio_manager.h"
diff --git a/media/audio/aecdump_recording_manager.h b/media/audio/aecdump_recording_manager.h
index 8a7b103..a840784 100644
--- a/media/audio/aecdump_recording_manager.h
+++ b/media/audio/aecdump_recording_manager.h
@@ -7,8 +7,8 @@
#include <map>
-#include "base/callback.h"
#include "base/files/file.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "media/base/media_export.h"
diff --git a/media/audio/aecdump_recording_manager_unittest.cc b/media/audio/aecdump_recording_manager_unittest.cc
index 87bb29f..ebb87c9 100644
--- a/media/audio/aecdump_recording_manager_unittest.cc
+++ b/media/audio/aecdump_recording_manager_unittest.cc
@@ -4,10 +4,10 @@
#include "media/audio/aecdump_recording_manager.h"
-#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/functional/bind.h"
#include "base/test/task_environment.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/audio/alive_checker.cc b/media/audio/alive_checker.cc
index eec22fc..a7df61a 100644
--- a/media/audio/alive_checker.cc
+++ b/media/audio/alive_checker.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/single_thread_task_runner.h"
namespace media {
diff --git a/media/audio/alive_checker.h b/media/audio/alive_checker.h
index 2df39711..11c00453 100644
--- a/media/audio/alive_checker.h
+++ b/media/audio/alive_checker.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/audio/alive_checker_unittest.cc b/media/audio/alive_checker_unittest.cc
index 567198e..bab382de 100644
--- a/media/audio/alive_checker_unittest.cc
+++ b/media/audio/alive_checker_unittest.cc
@@ -5,7 +5,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/synchronization/waitable_event.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/audio/alsa/alsa_input.cc b/media/audio/alsa/alsa_input.cc
index ad33463..0507362 100644
--- a/media/audio/alsa/alsa_input.cc
+++ b/media/audio/alsa/alsa_input.cc
@@ -6,7 +6,7 @@
#include <stddef.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/audio/alsa/alsa_output.cc b/media/audio/alsa/alsa_output.cc
index 40fed95d..08e8e8b 100644
--- a/media/audio/alsa/alsa_output.cc
+++ b/media/audio/alsa/alsa_output.cc
@@ -40,7 +40,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/free_deleter.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/audio/android/aaudio_output.cc b/media/audio/android/aaudio_output.cc
index 4ca3bf3b..269aa13 100644
--- a/media/audio/android/aaudio_output.cc
+++ b/media/audio/android/aaudio_output.cc
@@ -5,7 +5,7 @@
#include "media/audio/android/aaudio_output.h"
#include "base/android/build_info.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc
index 31cd9dd..552a900 100644
--- a/media/audio/android/audio_android_unittest.cc
+++ b/media/audio/android/audio_android_unittest.cc
@@ -7,8 +7,8 @@
#include <memory>
#include "base/android/build_info.h"
-#include "base/bind.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/path_service.h"
diff --git a/media/audio/android/audio_manager_android.cc b/media/audio/android/audio_manager_android.cc
index b2f3d2b..974fe55 100644
--- a/media/audio/android/audio_manager_android.cc
+++ b/media/audio/android/audio_manager_android.cc
@@ -10,8 +10,8 @@
#include "base/android/jni_array.h"
#include "base/android/jni_string.h"
#include "base/android/scoped_java_ref.h"
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "media/audio/android/aaudio_output.h"
diff --git a/media/audio/android/audio_track_output_stream.cc b/media/audio/android/audio_track_output_stream.cc
index e3bb633..8d8b320c6 100644
--- a/media/audio/android/audio_track_output_stream.cc
+++ b/media/audio/android/audio_track_output_stream.cc
@@ -6,8 +6,8 @@
#include <cmath>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/default_tick_clock.h"
diff --git a/media/audio/audio_debug_file_writer.cc b/media/audio/audio_debug_file_writer.cc
index 823f3839..21bc740 100644
--- a/media/audio/audio_debug_file_writer.cc
+++ b/media/audio/audio_debug_file_writer.cc
@@ -10,7 +10,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/audio/audio_debug_file_writer_unittest.cc b/media/audio/audio_debug_file_writer_unittest.cc
index 1c5466b..83d3bd81 100644
--- a/media/audio/audio_debug_file_writer_unittest.cc
+++ b/media/audio/audio_debug_file_writer_unittest.cc
@@ -8,8 +8,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/synchronization/waitable_event.h"
diff --git a/media/audio/audio_debug_recording_helper.cc b/media/audio/audio_debug_recording_helper.cc
index 5a284ef..c58521c0 100644
--- a/media/audio/audio_debug_recording_helper.cc
+++ b/media/audio/audio_debug_recording_helper.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/files/file.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/sequence_checker.h"
diff --git a/media/audio/audio_debug_recording_helper.h b/media/audio/audio_debug_recording_helper.h
index 2283a95..5235eaa 100644
--- a/media/audio/audio_debug_recording_helper.h
+++ b/media/audio/audio_debug_recording_helper.h
@@ -6,7 +6,7 @@
#define MEDIA_AUDIO_AUDIO_DEBUG_RECORDING_HELPER_H_
#include "base/atomicops.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/memory/weak_ptr.h"
#include "base/thread_annotations.h"
diff --git a/media/audio/audio_debug_recording_helper_unittest.cc b/media/audio/audio_debug_recording_helper_unittest.cc
index d14c585b..970b03c 100644
--- a/media/audio/audio_debug_recording_helper_unittest.cc
+++ b/media/audio/audio_debug_recording_helper_unittest.cc
@@ -8,12 +8,12 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check_op.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/functional/callback_forward.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/audio/audio_debug_recording_manager.cc b/media/audio/audio_debug_recording_manager.cc
index 9292e2d..1794b7a 100644
--- a/media/audio/audio_debug_recording_manager.cc
+++ b/media/audio/audio_debug_recording_manager.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/threading/thread_checker.h"
diff --git a/media/audio/audio_debug_recording_manager.h b/media/audio/audio_debug_recording_manager.h
index 8cf8a60..ed0c167 100644
--- a/media/audio/audio_debug_recording_manager.h
+++ b/media/audio/audio_debug_recording_manager.h
@@ -9,7 +9,7 @@
#include <memory>
#include <utility>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
diff --git a/media/audio/audio_debug_recording_manager_unittest.cc b/media/audio/audio_debug_recording_manager_unittest.cc
index 2afa476..5b161a58 100644
--- a/media/audio/audio_debug_recording_manager_unittest.cc
+++ b/media/audio/audio_debug_recording_manager_unittest.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/test/task_environment.h"
#include "media/audio/audio_debug_recording_helper.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/audio/audio_device_description.cc b/media/audio/audio_device_description.cc
index 4671aaf..12ed90b 100644
--- a/media/audio/audio_device_description.cc
+++ b/media/audio/audio_device_description.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/notreached.h"
#include "build/build_config.h"
#include "build/chromecast_buildflags.h"
diff --git a/media/audio/audio_encoders_unittest.cc b/media/audio/audio_encoders_unittest.cc
index 1d146dd..849e7ce7 100644
--- a/media/audio/audio_encoders_unittest.cc
+++ b/media/audio/audio_encoders_unittest.cc
@@ -8,7 +8,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "base/test/bind.h"
#include "base/test/task_environment.h"
diff --git a/media/audio/audio_input_device.cc b/media/audio/audio_input_device.cc
index cb8760b..df9cfd27 100644
--- a/media/audio/audio_input_device.cc
+++ b/media/audio/audio_input_device.cc
@@ -8,9 +8,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/audio/audio_input_stream_data_interceptor.h b/media/audio/audio_input_stream_data_interceptor.h
index c406acf..676ceba 100644
--- a/media/audio/audio_input_stream_data_interceptor.h
+++ b/media/audio/audio_input_stream_data_interceptor.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/sequence_checker.h"
#include "media/audio/audio_io.h"
diff --git a/media/audio/audio_input_stream_data_interceptor_unittest.cc b/media/audio/audio_input_stream_data_interceptor_unittest.cc
index 0125660..6b0a928 100644
--- a/media/audio/audio_input_stream_data_interceptor_unittest.cc
+++ b/media/audio/audio_input_stream_data_interceptor_unittest.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
#include "media/audio/audio_debug_recording_helper.h"
#include "media/audio/audio_io.h"
diff --git a/media/audio/audio_input_unittest.cc b/media/audio/audio_input_unittest.cc
index 5602d3d..78dc5b0 100644
--- a/media/audio/audio_input_unittest.cc
+++ b/media/audio/audio_input_unittest.cc
@@ -7,10 +7,10 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/command_line.h"
#include "base/environment.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/message_loop/message_pump_type.h"
#include "base/run_loop.h"
diff --git a/media/audio/audio_low_latency_input_output_unittest.cc b/media/audio/audio_low_latency_input_output_unittest.cc
index 3addbf7..6e2bf000 100644
--- a/media/audio/audio_low_latency_input_output_unittest.cc
+++ b/media/audio/audio_low_latency_input_output_unittest.cc
@@ -8,9 +8,9 @@
#include <algorithm>
#include <memory>
-#include "base/bind.h"
#include "base/environment.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/path_service.h"
diff --git a/media/audio/audio_manager.cc b/media/audio/audio_manager.cc
index 6305a9a..5b1e653 100644
--- a/media/audio/audio_manager.cc
+++ b/media/audio/audio_manager.cc
@@ -9,9 +9,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/power_monitor/power_monitor.h"
diff --git a/media/audio/audio_manager.h b/media/audio/audio_manager.h
index e23ae99..7842a16 100644
--- a/media/audio/audio_manager.h
+++ b/media/audio/audio_manager.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/threading/thread_checker.h"
#include "build/build_config.h"
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index 24d8678..655bc60 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -6,9 +6,9 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_macros.h"
#include "base/observer_list.h"
diff --git a/media/audio/audio_manager_unittest.cc b/media/audio/audio_manager_unittest.cc
index 83248d8..d34c6d8 100644
--- a/media/audio/audio_manager_unittest.cc
+++ b/media/audio/audio_manager_unittest.cc
@@ -9,9 +9,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/environment.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/ranges/algorithm.h"
diff --git a/media/audio/audio_opus_encoder.cc b/media/audio/audio_opus_encoder.cc
index f564885..80cd79f 100644
--- a/media/audio/audio_opus_encoder.cc
+++ b/media/audio/audio_opus_encoder.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/numerics/checked_math.h"
diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc
index 2a0ac29..be6cf5c6 100644
--- a/media/audio/audio_output_device.cc
+++ b/media/audio/audio_output_device.cc
@@ -11,7 +11,7 @@
#include <memory>
#include <utility>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/synchronization/waitable_event.h"
diff --git a/media/audio/audio_output_device.h b/media/audio/audio_output_device.h
index e6178da..abf8432 100644
--- a/media/audio/audio_output_device.h
+++ b/media/audio/audio_output_device.h
@@ -66,7 +66,7 @@
#include <memory>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/unsafe_shared_memory_region.h"
#include "base/synchronization/waitable_event.h"
diff --git a/media/audio/audio_output_device_unittest.cc b/media/audio/audio_output_device_unittest.cc
index 7e008a8..89d675e 100644
--- a/media/audio/audio_output_device_unittest.cc
+++ b/media/audio/audio_output_device_unittest.cc
@@ -9,9 +9,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/shared_memory_mapping.h"
diff --git a/media/audio/audio_output_dispatcher_impl.cc b/media/audio/audio_output_dispatcher_impl.cc
index 231f565..2a93389 100644
--- a/media/audio/audio_output_dispatcher_impl.cc
+++ b/media/audio/audio_output_dispatcher_impl.cc
@@ -7,9 +7,9 @@
#include <algorithm>
#include <utility>
-#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
#include "media/audio/audio_logging.h"
diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc
index 9ba7511..76ffc17 100644
--- a/media/audio/audio_output_proxy_unittest.cc
+++ b/media/audio/audio_output_proxy_unittest.cc
@@ -8,7 +8,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/task_environment.h"
diff --git a/media/audio/audio_output_resampler.cc b/media/audio/audio_output_resampler.cc
index a9117a8..9bc91de 100644
--- a/media/audio/audio_output_resampler.cc
+++ b/media/audio/audio_output_resampler.cc
@@ -11,9 +11,9 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/audio/audio_system.cc b/media/audio/audio_system.cc
index 132cbfb..e014ee6 100644
--- a/media/audio/audio_system.cc
+++ b/media/audio/audio_system.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "media/audio/audio_device_description.h"
namespace media {
diff --git a/media/audio/audio_system.h b/media/audio/audio_system.h
index 0781159..5a58b03 100644
--- a/media/audio/audio_system.h
+++ b/media/audio/audio_system.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/audio/audio_device_description.h"
#include "media/base/audio_parameters.h"
#include "media/base/media_export.h"
diff --git a/media/audio/audio_system_impl.cc b/media/audio/audio_system_impl.cc
index 905b848..ea3d783 100644
--- a/media/audio/audio_system_impl.cc
+++ b/media/audio/audio_system_impl.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/task/single_thread_task_runner.h"
#include "media/audio/audio_device_description.h"
diff --git a/media/audio/audio_system_impl.h b/media/audio/audio_system_impl.h
index 207b327..ba545dc2 100644
--- a/media/audio/audio_system_impl.h
+++ b/media/audio/audio_system_impl.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/threading/thread_checker.h"
#include "media/audio/audio_system.h"
diff --git a/media/audio/audio_system_test_util.cc b/media/audio/audio_system_test_util.cc
index afac0bb..3e14f8a 100644
--- a/media/audio/audio_system_test_util.cc
+++ b/media/audio/audio_system_test_util.cc
@@ -4,7 +4,7 @@
#include "media/audio/audio_system_test_util.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
namespace media {
diff --git a/media/audio/audio_system_test_util.h b/media/audio/audio_system_test_util.h
index 71ebca8..1e30206 100644
--- a/media/audio/audio_system_test_util.h
+++ b/media/audio/audio_system_test_util.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_AUDIO_AUDIO_SYSTEM_TEST_UTIL_H_
#define MEDIA_AUDIO_AUDIO_SYSTEM_TEST_UTIL_H_
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/run_loop.h"
#include "base/threading/thread_checker.h"
diff --git a/media/audio/audio_thread_hang_monitor.cc b/media/audio/audio_thread_hang_monitor.cc
index 4dfa368..6a1ab23 100644
--- a/media/audio/audio_thread_hang_monitor.cc
+++ b/media/audio/audio_thread_hang_monitor.cc
@@ -7,9 +7,9 @@
#include <algorithm>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/debug/dump_without_crashing.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
diff --git a/media/audio/audio_thread_hang_monitor.h b/media/audio/audio_thread_hang_monitor.h
index b6975ac..68831f0 100644
--- a/media/audio/audio_thread_hang_monitor.h
+++ b/media/audio/audio_thread_hang_monitor.h
@@ -11,7 +11,7 @@
#include <atomic>
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
diff --git a/media/audio/audio_thread_hang_monitor_unittest.cc b/media/audio/audio_thread_hang_monitor_unittest.cc
index a55a2fb..71594c41 100644
--- a/media/audio/audio_thread_hang_monitor_unittest.cc
+++ b/media/audio/audio_thread_hang_monitor_unittest.cc
@@ -4,7 +4,7 @@
#include "media/audio/audio_thread_hang_monitor.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/synchronization/waitable_event.h"
#include "base/test/metrics/histogram_tester.h"
diff --git a/media/audio/clockless_audio_sink.cc b/media/audio/clockless_audio_sink.cc
index ad2931c..d0d1311f 100644
--- a/media/audio/clockless_audio_sink.cc
+++ b/media/audio/clockless_audio_sink.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/synchronization/waitable_event.h"
diff --git a/media/audio/cras/audio_manager_cras.cc b/media/audio/cras/audio_manager_cras.cc
index 32718c2..aaccd6f 100644
--- a/media/audio/cras/audio_manager_cras.cc
+++ b/media/audio/cras/audio_manager_cras.cc
@@ -10,10 +10,10 @@
#include <map>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/command_line.h"
#include "base/environment.h"
+#include "base/functional/bind.h"
#include "base/metrics/field_trial_params.h"
#include "base/nix/xdg_util.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/audio/cras/audio_manager_cras_base.cc b/media/audio/cras/audio_manager_cras_base.cc
index 2fa24da..62294a1 100644
--- a/media/audio/cras/audio_manager_cras_base.cc
+++ b/media/audio/cras/audio_manager_cras_base.cc
@@ -10,10 +10,10 @@
#include <map>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/command_line.h"
#include "base/environment.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/field_trial_params.h"
#include "base/nix/xdg_util.h"
diff --git a/media/audio/fake_audio_input_stream.cc b/media/audio/fake_audio_input_stream.cc
index 587fa66..7c0acbcd4 100644
--- a/media/audio/fake_audio_input_stream.cc
+++ b/media/audio/fake_audio_input_stream.cc
@@ -8,10 +8,10 @@
#include <string>
#include "base/atomicops.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h
index d424555..e429eeda 100644
--- a/media/audio/fake_audio_input_stream.h
+++ b/media/audio/fake_audio_input_stream.h
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/threading/thread.h"
diff --git a/media/audio/fake_audio_output_stream.cc b/media/audio/fake_audio_output_stream.cc
index 1276bbf..ce67c601 100644
--- a/media/audio/fake_audio_output_stream.cc
+++ b/media/audio/fake_audio_output_stream.cc
@@ -4,9 +4,9 @@
#include "media/audio/fake_audio_output_stream.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
#include "media/audio/audio_manager_base.h"
diff --git a/media/audio/fuchsia/audio_manager_fuchsia.cc b/media/audio/fuchsia/audio_manager_fuchsia.cc
index d0f9a051..2d4307a 100644
--- a/media/audio/fuchsia/audio_manager_fuchsia.cc
+++ b/media/audio/fuchsia/audio_manager_fuchsia.cc
@@ -8,12 +8,12 @@
#include <memory>
-#include "base/callback.h"
#include "base/command_line.h"
#include "base/containers/contains.h"
#include "base/fuchsia/fuchsia_logging.h"
#include "base/fuchsia/process_context.h"
#include "base/fuchsia/scheduler.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "media/audio/fuchsia/audio_input_stream_fuchsia.h"
#include "media/audio/fuchsia/audio_output_stream_fuchsia.h"
diff --git a/media/audio/fuchsia/audio_output_stream_fuchsia.cc b/media/audio/fuchsia/audio_output_stream_fuchsia.cc
index 6a16f44..ed3c151 100644
--- a/media/audio/fuchsia/audio_output_stream_fuchsia.cc
+++ b/media/audio/fuchsia/audio_output_stream_fuchsia.cc
@@ -8,9 +8,9 @@
#include <lib/sys/cpp/component_context.h>
#include <zircon/syscalls.h>
-#include "base/bind.h"
#include "base/fuchsia/fuchsia_logging.h"
#include "base/fuchsia/process_context.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/writable_shared_memory_region.h"
#include "media/audio/fuchsia/audio_manager_fuchsia.h"
diff --git a/media/audio/mac/audio_auhal_mac.cc b/media/audio/mac/audio_auhal_mac.cc
index 804e1ac..74a4266 100644
--- a/media/audio/mac/audio_auhal_mac.cc
+++ b/media/audio/mac/audio_auhal_mac.cc
@@ -12,8 +12,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/mac/mac_logging.h"
#include "base/metrics/histogram_functions.h"
diff --git a/media/audio/mac/audio_auhal_mac_unittest.cc b/media/audio/mac/audio_auhal_mac_unittest.cc
index ba90bd34..ea5fc10 100644
--- a/media/audio/mac/audio_auhal_mac_unittest.cc
+++ b/media/audio/mac/audio_auhal_mac_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/message_loop/message_pump_type.h"
#include "base/run_loop.h"
#include "base/synchronization/waitable_event.h"
diff --git a/media/audio/mac/audio_device_listener_mac.cc b/media/audio/mac/audio_device_listener_mac.cc
index 6c08f8a7..4c02a4d 100644
--- a/media/audio/mac/audio_device_listener_mac.cc
+++ b/media/audio/mac/audio_device_listener_mac.cc
@@ -6,8 +6,8 @@
#include <vector>
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/mac/mac_logging.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/audio/mac/audio_device_listener_mac.h b/media/audio/mac/audio_device_listener_mac.h
index a1c19b5..67dfd8a 100644
--- a/media/audio/mac/audio_device_listener_mac.h
+++ b/media/audio/mac/audio_device_listener_mac.h
@@ -11,8 +11,8 @@
#include <memory>
#include <utility>
-#include "base/callback.h"
#include "base/containers/flat_map.h"
+#include "base/functional/callback.h"
#include "base/threading/thread_checker.h"
#include "media/base/media_export.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/media/audio/mac/audio_device_listener_mac_unittest.cc b/media/audio/mac/audio_device_listener_mac_unittest.cc
index 509e4b21..3630bd89 100644
--- a/media/audio/mac/audio_device_listener_mac_unittest.cc
+++ b/media/audio/mac/audio_device_listener_mac_unittest.cc
@@ -8,8 +8,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/task_environment.h"
diff --git a/media/audio/mac/audio_input_mac.cc b/media/audio/mac/audio_input_mac.cc
index 852a2b9..3eb0162 100644
--- a/media/audio/mac/audio_input_mac.cc
+++ b/media/audio/mac/audio_input_mac.cc
@@ -8,7 +8,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/mac/mac_logging.h"
#include "base/metrics/histogram_macros.h"
diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc
index fa83b9cd..72b78e9 100644
--- a/media/audio/mac/audio_low_latency_input_mac.cc
+++ b/media/audio/mac/audio_low_latency_input_mac.cc
@@ -9,7 +9,7 @@
#include <memory>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/mac/foundation_util.h"
#include "base/mac/mac_logging.h"
diff --git a/media/audio/mac/audio_low_latency_input_mac_unittest.cc b/media/audio/mac/audio_low_latency_input_mac_unittest.cc
index 58d8676..3c3d1c2f 100644
--- a/media/audio/mac/audio_low_latency_input_mac_unittest.cc
+++ b/media/audio/mac/audio_low_latency_input_mac_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/environment.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc
index b5ad37c..b8e7c10 100644
--- a/media/audio/mac/audio_manager_mac.cc
+++ b/media/audio/mac/audio_manager_mac.cc
@@ -9,9 +9,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/containers/flat_set.h"
+#include "base/functional/bind.h"
#include "base/mac/mac_logging.h"
#include "base/mac/mac_util.h"
#include "base/mac/scoped_cftyperef.h"
diff --git a/media/audio/mock_audio_manager.cc b/media/audio/mock_audio_manager.cc
index daaef3a..23ad900 100644
--- a/media/audio/mock_audio_manager.cc
+++ b/media/audio/mock_audio_manager.cc
@@ -6,9 +6,9 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "media/audio/mock_audio_debug_recording_manager.h"
#include "media/base/audio_parameters.h"
diff --git a/media/audio/mock_audio_manager.h b/media/audio/mock_audio_manager.h
index 2b46355..94e1fee 100644
--- a/media/audio/mock_audio_manager.h
+++ b/media/audio/mock_audio_manager.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "media/audio/audio_debug_recording_manager.h"
#include "media/audio/audio_manager.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/audio/null_audio_sink.cc b/media/audio/null_audio_sink.cc
index a82d045..bd5a1ce 100644
--- a/media/audio/null_audio_sink.cc
+++ b/media/audio/null_audio_sink.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/audio/power_observer_helper.cc b/media/audio/power_observer_helper.cc
index b1efe8cf5..2293be9 100644
--- a/media/audio/power_observer_helper.cc
+++ b/media/audio/power_observer_helper.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/power_monitor/power_monitor.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/audio/power_observer_helper.h b/media/audio/power_observer_helper.h
index 46e1527..21c9a60 100644
--- a/media/audio/power_observer_helper.h
+++ b/media/audio/power_observer_helper.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_AUDIO_POWER_OBSERVER_HELPER_H_
#define MEDIA_AUDIO_POWER_OBSERVER_HELPER_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/gtest_prod_util.h"
#include "base/memory/weak_ptr.h"
#include "base/power_monitor/power_observer.h"
diff --git a/media/audio/power_observer_helper_unittest.cc b/media/audio/power_observer_helper_unittest.cc
index 5ad44287..7aa76abb 100644
--- a/media/audio/power_observer_helper_unittest.cc
+++ b/media/audio/power_observer_helper_unittest.cc
@@ -4,7 +4,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/synchronization/waitable_event.h"
#include "base/test/task_environment.h"
#include "base/threading/thread.h"
diff --git a/media/audio/scoped_task_runner_observer.cc b/media/audio/scoped_task_runner_observer.cc
index ecfa4c6..ffdb56af 100644
--- a/media/audio/scoped_task_runner_observer.cc
+++ b/media/audio/scoped_task_runner_observer.cc
@@ -4,7 +4,7 @@
#include "media/audio/scoped_task_runner_observer.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/synchronization/waitable_event.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/audio/win/audio_device_listener_win.h b/media/audio/win/audio_device_listener_win.h
index f605959..d650574 100644
--- a/media/audio/win/audio_device_listener_win.h
+++ b/media/audio/win/audio_device_listener_win.h
@@ -11,7 +11,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/threading/thread_checker.h"
#include "base/time/time.h"
diff --git a/media/audio/win/audio_device_listener_win_unittest.cc b/media/audio/win/audio_device_listener_win_unittest.cc
index 964e726..739792f6 100644
--- a/media/audio/win/audio_device_listener_win_unittest.cc
+++ b/media/audio/win/audio_device_listener_win_unittest.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <string>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/strings/utf_string_conversions.h"
#include "base/system/system_monitor.h"
#include "base/test/simple_test_tick_clock.h"
diff --git a/media/audio/win/audio_low_latency_input_win_unittest.cc b/media/audio/win/audio_low_latency_input_win_unittest.cc
index a4daa04..4504dedea 100644
--- a/media/audio/win/audio_low_latency_input_win_unittest.cc
+++ b/media/audio/win/audio_low_latency_input_win_unittest.cc
@@ -11,9 +11,9 @@
#include <memory>
-#include "base/bind.h"
#include "base/environment.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/path_service.h"
#include "base/run_loop.h"
diff --git a/media/audio/win/audio_low_latency_output_win.cc b/media/audio/win/audio_low_latency_output_win.cc
index c9d66cb..8eacf9d 100644
--- a/media/audio/win/audio_low_latency_output_win.cc
+++ b/media/audio/win/audio_low_latency_output_win.cc
@@ -12,8 +12,8 @@
#include <climits>
#include <memory>
-#include "base/callback.h"
#include "base/command_line.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/metrics/histogram.h"
#include "base/metrics/histogram_functions.h"
diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc
index ef35a3d..88911a79 100644
--- a/media/audio/win/audio_manager_win.cc
+++ b/media/audio/win/audio_manager_win.cc
@@ -15,9 +15,9 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/strings/string_number_conversions.h"
#include "base/win/windows_version.h"
#include "media/audio/audio_device_description.h"
diff --git a/media/audio/win/audio_session_event_listener_win.h b/media/audio/win/audio_session_event_listener_win.h
index 753ee3d..2591f9c 100644
--- a/media/audio/win/audio_session_event_listener_win.h
+++ b/media/audio/win/audio_session_event_listener_win.h
@@ -8,7 +8,7 @@
#include <audiopolicy.h>
#include <wrl/client.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/base/media_export.h"
namespace media {
diff --git a/media/audio/win/audio_session_event_listener_win_unittest.cc b/media/audio/win/audio_session_event_listener_win_unittest.cc
index 7723fc0..c7338fc 100644
--- a/media/audio/win/audio_session_event_listener_win_unittest.cc
+++ b/media/audio/win/audio_session_event_listener_win_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/win/scoped_com_initializer.h"
#include "media/audio/audio_unittest_util.h"
#include "media/audio/win/core_audio_util_win.h"
diff --git a/media/audio/win/core_audio_util_win.cc b/media/audio/win/core_audio_util_win.cc
index 5c84f4f..d4c94d3c0 100644
--- a/media/audio/win/core_audio_util_win.cc
+++ b/media/audio/win/core_audio_util_win.cc
@@ -11,9 +11,9 @@
#include <stddef.h>
#include <bitset>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/media/base/android/android_cdm_factory.cc b/media/base/android/android_cdm_factory.cc
index a6346151..78d8ff3 100644
--- a/media/base/android/android_cdm_factory.cc
+++ b/media/base/android/android_cdm_factory.cc
@@ -4,8 +4,8 @@
#include "media/base/android/android_cdm_factory.h"
-#include "base/bind.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/base/android/android_overlay.h b/media/base/android/android_overlay.h
index 67c7753..87904a4 100644
--- a/media/base/android/android_overlay.h
+++ b/media/base/android/android_overlay.h
@@ -8,7 +8,7 @@
#include <list>
#include "base/android/scoped_java_ref.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "media/base/android_overlay_config.h"
#include "media/base/media_export.h"
diff --git a/media/base/android/media_codec_bridge_impl.h b/media/base/android/media_codec_bridge_impl.h
index df27b74..fcd4e58 100644
--- a/media/base/android/media_codec_bridge_impl.h
+++ b/media/base/android/media_codec_bridge_impl.h
@@ -11,7 +11,7 @@
#include <string>
#include "base/android/scoped_java_ref.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "media/base/android/media_codec_bridge.h"
#include "media/base/android/media_codec_direction.h"
diff --git a/media/base/android/media_codec_loop.cc b/media/base/android/media_codec_loop.cc
index 010c5056..3a668f41 100644
--- a/media/base/android/media_codec_loop.cc
+++ b/media/base/android/media_codec_loop.cc
@@ -5,8 +5,8 @@
#include "media/base/android/media_codec_loop.h"
#include "base/android/build_info.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/task/single_thread_task_runner.h"
#include "media/base/bind_to_current_loop.h"
diff --git a/media/base/android/media_crypto_context.h b/media/base/android/media_crypto_context.h
index de881085..545aace0 100644
--- a/media/base/android/media_crypto_context.h
+++ b/media/base/android/media_crypto_context.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/base/android/android_util.h"
#include "media/base/media_export.h"
diff --git a/media/base/android/media_drm_bridge.cc b/media/base/android/media_drm_bridge.cc
index f547696..5084f648 100644
--- a/media/base/android/media_drm_bridge.cc
+++ b/media/base/android/media_drm_bridge.cc
@@ -13,9 +13,9 @@
#include "base/android/build_info.h"
#include "base/android/jni_array.h"
#include "base/android/jni_string.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
diff --git a/media/base/android/media_drm_bridge.h b/media/base/android/media_drm_bridge.h
index 9ffac990..b42da25 100644
--- a/media/base/android/media_drm_bridge.h
+++ b/media/base/android/media_drm_bridge.h
@@ -13,7 +13,7 @@
#include <vector>
#include "base/android/scoped_java_ref.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner_helpers.h"
diff --git a/media/base/android/media_drm_bridge_factory.cc b/media/base/android/media_drm_bridge_factory.cc
index 11054d7ce..7c856695 100644
--- a/media/base/android/media_drm_bridge_factory.cc
+++ b/media/base/android/media_drm_bridge_factory.cc
@@ -4,8 +4,8 @@
#include "media/base/android/media_drm_bridge_factory.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "media/base/cdm_config.h"
#include "media/base/content_decryption_module.h"
#include "third_party/widevine/cdm/widevine_cdm_common.h"
diff --git a/media/base/android/media_drm_bridge_unittest.cc b/media/base/android/media_drm_bridge_unittest.cc
index acbf968..45678a8 100644
--- a/media/base/android/media_drm_bridge_unittest.cc
+++ b/media/base/android/media_drm_bridge_unittest.cc
@@ -5,8 +5,8 @@
#include <memory>
#include "base/android/build_info.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/base/android/media_drm_storage_bridge.cc b/media/base/android/media_drm_storage_bridge.cc
index 2349133..b253609 100644
--- a/media/base/android/media_drm_storage_bridge.cc
+++ b/media/base/android/media_drm_storage_bridge.cc
@@ -12,7 +12,7 @@
#include "base/android/callback_android.h"
#include "base/android/jni_array.h"
#include "base/android/jni_string.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/single_thread_task_runner.h"
#include "base/unguessable_token.h"
#include "media/base/android/android_util.h"
diff --git a/media/base/android/media_drm_storage_bridge.h b/media/base/android/media_drm_storage_bridge.h
index 4978359f..2f3b0e3b 100644
--- a/media/base/android/media_drm_storage_bridge.h
+++ b/media/base/android/media_drm_storage_bridge.h
@@ -10,7 +10,7 @@
#include <string>
#include "base/android/scoped_java_ref.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "media/base/android/android_util.h"
diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc
index 3eee39f..ad12dda 100644
--- a/media/base/android/media_player_bridge.cc
+++ b/media/base/android/media_player_bridge.cc
@@ -10,9 +10,9 @@
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
#include "base/android/scoped_java_ref.h"
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/cxx17_backports.h"
+#include "base/functional/bind.h"
#include "base/metrics/histogram_macros.h"
#include "base/notreached.h"
#include "base/strings/string_util.h"
diff --git a/media/base/android/media_player_bridge.h b/media/base/android/media_player_bridge.h
index a6426d49..9d08747c 100644
--- a/media/base/android/media_player_bridge.h
+++ b/media/base/android/media_player_bridge.h
@@ -13,7 +13,7 @@
#include <string>
#include "base/android/scoped_java_ref.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
diff --git a/media/base/android/media_player_bridge_unittest.cc b/media/base/android/media_player_bridge_unittest.cc
index fdd0171..2041e3d 100644
--- a/media/base/android/media_player_bridge_unittest.cc
+++ b/media/base/android/media_player_bridge_unittest.cc
@@ -4,7 +4,7 @@
#include "media/base/android/media_player_bridge.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/test/task_environment.h"
#include "net/cookies/site_for_cookies.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/base/android/media_player_listener.cc b/media/base/android/media_player_listener.cc
index 249a329..9d1cfdfc 100644
--- a/media/base/android/media_player_listener.cc
+++ b/media/base/android/media_player_listener.cc
@@ -6,8 +6,8 @@
#include "base/android/jni_android.h"
#include "base/android/scoped_java_ref.h"
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
#include "media/base/android/media_jni_headers/MediaPlayerListener_jni.h"
diff --git a/media/base/android/media_resource_getter.h b/media/base/android/media_resource_getter.h
index 32712c2..d454657 100644
--- a/media/base/android/media_resource_getter.h
+++ b/media/base/android/media_resource_getter.h
@@ -9,7 +9,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "media/base/media_export.h"
#include "url/gurl.h"
diff --git a/media/base/android/media_server_crash_listener.h b/media/base/android/media_server_crash_listener.h
index 9bdb8471..461bb94 100644
--- a/media/base/android/media_server_crash_listener.h
+++ b/media/base/android/media_server_crash_listener.h
@@ -8,8 +8,8 @@
#include <jni.h>
#include "base/android/scoped_java_ref.h"
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/task/single_thread_task_runner.h"
namespace media {
diff --git a/media/base/android/media_service_throttler.cc b/media/base/android/media_service_throttler.cc
index 8acea0cc..a99807e 100644
--- a/media/base/android/media_service_throttler.cc
+++ b/media/base/android/media_service_throttler.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/default_tick_clock.h"
#include "media/base/android/media_server_crash_listener.h"
diff --git a/media/base/android/media_service_throttler.h b/media/base/android/media_service_throttler.h
index 1bae14a..80d9b80 100644
--- a/media/base/android/media_service_throttler.h
+++ b/media/base/android/media_service_throttler.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback_forward.h"
#include "base/cancelable_callback.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/tick_clock.h"
diff --git a/media/base/android/mock_android_overlay.cc b/media/base/android/mock_android_overlay.cc
index b2155f4..870c402 100644
--- a/media/base/android/mock_android_overlay.cc
+++ b/media/base/android/mock_android_overlay.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace media {
diff --git a/media/base/android/mock_android_overlay.h b/media/base/android/mock_android_overlay.h
index cbfbf2d..1a383ee 100644
--- a/media/base/android/mock_android_overlay.h
+++ b/media/base/android/mock_android_overlay.h
@@ -7,7 +7,7 @@
#include "media/base/android/android_overlay.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "media/base/android/test_destruction_observable.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/base/android/test_destruction_observable.cc b/media/base/android/test_destruction_observable.cc
index 035e441..8c122c1 100644
--- a/media/base/android/test_destruction_observable.cc
+++ b/media/base/android/test_destruction_observable.cc
@@ -4,7 +4,7 @@
#include "media/base/android/test_destruction_observable.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace media {
diff --git a/media/base/android/test_destruction_observable.h b/media/base/android/test_destruction_observable.h
index 5993bf84..4e43417 100644
--- a/media/base/android/test_destruction_observable.h
+++ b/media/base/android/test_destruction_observable.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_ANDROID_TEST_DESTRUCTION_OBSERVABLE_H_
#define MEDIA_BASE_ANDROID_TEST_DESTRUCTION_OBSERVABLE_H_
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/weak_ptr.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/media/base/android_overlay_config.h b/media/base/android_overlay_config.h
index a9c401d..4fe5f878 100644
--- a/media/base/android_overlay_config.h
+++ b/media/base/android_overlay_config.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_ANDROID_OVERLAY_CONFIG_H_
#define MEDIA_BASE_ANDROID_OVERLAY_CONFIG_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/base/media_export.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/media/base/android_overlay_mojo_factory.h b/media/base/android_overlay_mojo_factory.h
index ecfd70b1..1118068 100644
--- a/media/base/android_overlay_mojo_factory.h
+++ b/media/base/android_overlay_mojo_factory.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_ANDROID_OVERLAY_MOJO_FACTORY_H_
#define MEDIA_BASE_ANDROID_OVERLAY_MOJO_FACTORY_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/unguessable_token.h"
#include "media/base/android_overlay_config.h"
diff --git a/media/base/audio_buffer.cc b/media/base/audio_buffer.cc
index accf351..26b036b 100644
--- a/media/base/audio_buffer.cc
+++ b/media/base/audio_buffer.cc
@@ -6,7 +6,7 @@
#include <cmath>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/notreached.h"
#include "media/base/audio_bus.h"
diff --git a/media/base/audio_bus.h b/media/base/audio_bus.h
index 62ab56d..a8b619e 100644
--- a/media/base/audio_bus.h
+++ b/media/base/audio_bus.h
@@ -10,7 +10,7 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/aligned_memory.h"
#include "media/base/audio_sample_types.h"
#include "media/base/media_shmem_export.h"
diff --git a/media/base/audio_converter.cc b/media/base/audio_converter.cc
index df839f13..c8a1befd 100644
--- a/media/base/audio_converter.cc
+++ b/media/base/audio_converter.cc
@@ -12,9 +12,9 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/trace_event/trace_event.h"
#include "media/base/audio_bus.h"
diff --git a/media/base/audio_converter.h b/media/base/audio_converter.h
index 26bd7ec..b1cf18a 100644
--- a/media/base/audio_converter.h
+++ b/media/base/audio_converter.h
@@ -21,7 +21,7 @@
#include <list>
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/base/audio_glitch_info.h"
#include "media/base/audio_parameters.h"
#include "media/base/media_export.h"
diff --git a/media/base/audio_decoder.h b/media/base/audio_decoder.h
index 0cfc33b..76805417 100644
--- a/media/base/audio_decoder.h
+++ b/media/base/audio_decoder.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_AUDIO_DECODER_H_
#define MEDIA_BASE_AUDIO_DECODER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/channel_layout.h"
diff --git a/media/base/audio_encoder.h b/media/base/audio_encoder.h
index 1426266..f60affa 100644
--- a/media/base/audio_encoder.h
+++ b/media/base/audio_encoder.h
@@ -8,7 +8,7 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/sequence_checker.h"
#include "base/time/time.h"
#include "media/base/audio_bus.h"
diff --git a/media/base/audio_processor_controls.h b/media/base/audio_processor_controls.h
index b7c870a..305bb70 100644
--- a/media/base/audio_processor_controls.h
+++ b/media/base/audio_processor_controls.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_AUDIO_PROCESSOR_CONTROLS_H_
#define MEDIA_BASE_AUDIO_PROCESSOR_CONTROLS_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/base/media_export.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/media/base/audio_pull_fifo.h b/media/base/audio_pull_fifo.h
index d46cb70..7abc0dd 100644
--- a/media/base/audio_pull_fifo.h
+++ b/media/base/audio_pull_fifo.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/base/media_export.h"
namespace media {
diff --git a/media/base/audio_pull_fifo_unittest.cc b/media/base/audio_pull_fifo_unittest.cc
index 382161c5..36db55c 100644
--- a/media/base/audio_pull_fifo_unittest.cc
+++ b/media/base/audio_pull_fifo_unittest.cc
@@ -4,8 +4,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/strings/stringprintf.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_pull_fifo.h"
diff --git a/media/base/audio_push_fifo.h b/media/base/audio_push_fifo.h
index f0c56af..21e8586f 100644
--- a/media/base/audio_push_fifo.h
+++ b/media/base/audio_push_fifo.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/base/audio_bus.h"
#include "media/base/media_export.h"
diff --git a/media/base/audio_push_fifo_unittest.cc b/media/base/audio_push_fifo_unittest.cc
index 4fd4a861..52a137e 100644
--- a/media/base/audio_push_fifo_unittest.cc
+++ b/media/base/audio_push_fifo_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_push_fifo.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/base/audio_renderer.h b/media/base/audio_renderer.h
index 173380d..7a1123e 100644
--- a/media/base/audio_renderer.h
+++ b/media/base/audio_renderer.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_AUDIO_RENDERER_H_
#define MEDIA_BASE_AUDIO_RENDERER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "media/base/buffering_state.h"
#include "media/base/media_export.h"
diff --git a/media/base/audio_renderer_mixer_input.cc b/media/base/audio_renderer_mixer_input.cc
index 14519b0..78723dd 100644
--- a/media/base/audio_renderer_mixer_input.cc
+++ b/media/base/audio_renderer_mixer_input.cc
@@ -6,8 +6,8 @@
#include <cmath>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/sequenced_task_runner.h"
#include "base/trace_event/trace_event.h"
#include "media/base/audio_renderer_mixer.h"
diff --git a/media/base/audio_renderer_mixer_input.h b/media/base/audio_renderer_mixer_input.h
index 46639bd0..9c2ed5a7ff 100644
--- a/media/base/audio_renderer_mixer_input.h
+++ b/media/base/audio_renderer_mixer_input.h
@@ -18,7 +18,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/synchronization/lock.h"
#include "base/thread_annotations.h"
diff --git a/media/base/audio_renderer_mixer_input_unittest.cc b/media/base/audio_renderer_mixer_input_unittest.cc
index 9ac03f44..b609425 100644
--- a/media/base/audio_renderer_mixer_input_unittest.cc
+++ b/media/base/audio_renderer_mixer_input_unittest.cc
@@ -5,8 +5,8 @@
#include <stddef.h>
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "media/base/audio_latency.h"
diff --git a/media/base/audio_renderer_mixer_unittest.cc b/media/base/audio_renderer_mixer_unittest.cc
index cda235c..d2d49bc 100644
--- a/media/base/audio_renderer_mixer_unittest.cc
+++ b/media/base/audio_renderer_mixer_unittest.cc
@@ -12,8 +12,8 @@
#include <tuple>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/synchronization/waitable_event.h"
#include "base/test/task_environment.h"
diff --git a/media/base/audio_renderer_sink.h b/media/base/audio_renderer_sink.h
index d2336388..1ece071 100644
--- a/media/base/audio_renderer_sink.h
+++ b/media/base/audio_renderer_sink.h
@@ -9,7 +9,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_parameters.h"
diff --git a/media/base/audio_shifter.cc b/media/base/audio_shifter.cc
index bbb2785..fdc94b9 100644
--- a/media/base/audio_shifter.cc
+++ b/media/base/audio_shifter.cc
@@ -8,9 +8,9 @@
#include <cmath>
#include <utility>
-#include "base/bind.h"
#include "base/containers/circular_deque.h"
#include "base/cxx17_backports.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/trace_event/trace_event.h"
#include "media/base/audio_bus.h"
diff --git a/media/base/bind_to_current_loop.h b/media/base/bind_to_current_loop.h
index 746136e8..42d16df 100644
--- a/media/base/bind_to_current_loop.h
+++ b/media/base/bind_to_current_loop.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_BIND_TO_CURRENT_LOOP_H_
#define MEDIA_BASE_BIND_TO_CURRENT_LOOP_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/task/bind_post_task.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/base/buffering_state.h b/media/base/buffering_state.h
index 134d685..317bfb2c 100644
--- a/media/base/buffering_state.h
+++ b/media/base/buffering_state.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
namespace media {
diff --git a/media/base/callback_holder.h b/media/base/callback_holder.h
index 3144f1de..b1cc2d41 100644
--- a/media/base/callback_holder.h
+++ b/media/base/callback_holder.h
@@ -5,9 +5,9 @@
#ifndef MEDIA_BASE_CALLBACK_HOLDER_H_
#define MEDIA_BASE_CALLBACK_HOLDER_H_
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
namespace media {
diff --git a/media/base/callback_holder_unittest.cc b/media/base/callback_holder_unittest.cc
index c9f13bcf..25ef13b 100644
--- a/media/base/callback_holder_unittest.cc
+++ b/media/base/callback_holder_unittest.cc
@@ -4,7 +4,7 @@
#include "media/base/callback_holder.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace media {
diff --git a/media/base/callback_registry.h b/media/base/callback_registry.h
index 85252739..878d9f5 100644
--- a/media/base/callback_registry.h
+++ b/media/base/callback_registry.h
@@ -10,7 +10,7 @@
#include <map>
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/synchronization/lock.h"
diff --git a/media/base/callback_registry_unittest.cc b/media/base/callback_registry_unittest.cc
index bbeb084..7db7e64 100644
--- a/media/base/callback_registry_unittest.cc
+++ b/media/base/callback_registry_unittest.cc
@@ -4,7 +4,7 @@
#include "media/base/callback_registry.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/test/mock_callback.h"
#include "base/test/task_environment.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/base/callback_timeout_helpers.h b/media/base/callback_timeout_helpers.h
index 9568d9df..3da3122 100644
--- a/media/base/callback_timeout_helpers.h
+++ b/media/base/callback_timeout_helpers.h
@@ -8,8 +8,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
diff --git a/media/base/cdm_callback_promise.cc b/media/base/cdm_callback_promise.cc
index 243cfa88..d3fa70a 100644
--- a/media/base/cdm_callback_promise.cc
+++ b/media/base/cdm_callback_promise.cc
@@ -4,8 +4,8 @@
#include "media/base/cdm_callback_promise.h"
-#include "base/callback_helpers.h"
#include "base/check.h"
+#include "base/functional/callback_helpers.h"
namespace media {
diff --git a/media/base/cdm_callback_promise.h b/media/base/cdm_callback_promise.h
index cee0a35..1cbb6c8e9 100644
--- a/media/base/cdm_callback_promise.h
+++ b/media/base/cdm_callback_promise.h
@@ -9,7 +9,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/base/cdm_promise.h"
#include "media/base/media_export.h"
diff --git a/media/base/cdm_context.h b/media/base/cdm_context.h
index 94df106..260251b 100644
--- a/media/base/cdm_context.h
+++ b/media/base/cdm_context.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_CDM_CONTEXT_H_
#define MEDIA_BASE_CDM_CONTEXT_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/unguessable_token.h"
#include "build/build_config.h"
diff --git a/media/base/cdm_initialized_promise.h b/media/base/cdm_initialized_promise.h
index 2d82fff..0120652 100644
--- a/media/base/cdm_initialized_promise.h
+++ b/media/base/cdm_initialized_promise.h
@@ -7,7 +7,7 @@
#include <stdint.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "media/base/cdm_factory.h"
#include "media/base/cdm_promise.h"
diff --git a/media/base/cdm_session_tracker.cc b/media/base/cdm_session_tracker.cc
index a21dc78..ace6e50d 100644
--- a/media/base/cdm_session_tracker.cc
+++ b/media/base/cdm_session_tracker.cc
@@ -4,7 +4,7 @@
#include "media/base/cdm_session_tracker.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
namespace media {
diff --git a/media/base/content_decryption_module.h b/media/base/content_decryption_module.h
index 531b065..99bb2b8 100644
--- a/media/base/content_decryption_module.h
+++ b/media/base/content_decryption_module.h
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/ref_counted.h"
#include "media/base/cdm_key_information.h"
#include "media/base/eme_constants.h"
diff --git a/media/base/converting_audio_fifo.h b/media/base/converting_audio_fifo.h
index 10eec98f..731b75a 100644
--- a/media/base/converting_audio_fifo.h
+++ b/media/base/converting_audio_fifo.h
@@ -5,8 +5,8 @@
#ifndef MEDIA_BASE_CONVERTING_AUDIO_FIFO_H_
#define MEDIA_BASE_CONVERTING_AUDIO_FIFO_H_
-#include "base/callback.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/callback.h"
#include "base/sequence_checker.h"
#include "media/base/audio_converter.h"
#include "media/base/audio_parameters.h"
diff --git a/media/base/converting_audio_fifo_unittest.cc b/media/base/converting_audio_fifo_unittest.cc
index 04643aa3..0813ae4 100644
--- a/media/base/converting_audio_fifo_unittest.cc
+++ b/media/base/converting_audio_fifo_unittest.cc
@@ -9,7 +9,7 @@
#include "base/logging.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/test/bind.h"
#include "base/time/time.h"
diff --git a/media/base/data_source.h b/media/base/data_source.h
index a261bb2..b86e422f 100644
--- a/media/base/data_source.h
+++ b/media/base/data_source.h
@@ -7,7 +7,7 @@
#include <stdint.h>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "media/base/media_export.h"
#include "url/gurl.h"
diff --git a/media/base/decryptor.h b/media/base/decryptor.h
index de72e07d..5e67e624 100644
--- a/media/base/decryptor.h
+++ b/media/base/decryptor.h
@@ -7,7 +7,7 @@
#include <list>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "media/base/audio_buffer.h"
#include "media/base/media_export.h"
diff --git a/media/base/demuxer_stream.h b/media/base/demuxer_stream.h
index f0a0a6d..d01e266 100644
--- a/media/base/demuxer_stream.h
+++ b/media/base/demuxer_stream.h
@@ -7,7 +7,7 @@
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "media/base/media_export.h"
#include "media/base/video_transformation.h"
diff --git a/media/base/fake_audio_renderer_sink.cc b/media/base/fake_audio_renderer_sink.cc
index ba33af0..68f4a1c 100644
--- a/media/base/fake_audio_renderer_sink.cc
+++ b/media/base/fake_audio_renderer_sink.cc
@@ -4,7 +4,7 @@
#include "media/base/fake_audio_renderer_sink.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/base/fake_audio_worker.cc b/media/base/fake_audio_worker.cc
index 000a5e0..109924d 100644
--- a/media/base/fake_audio_worker.cc
+++ b/media/base/fake_audio_worker.cc
@@ -6,10 +6,10 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/cancelable_callback.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/synchronization/lock.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/base/fake_audio_worker.h b/media/base/fake_audio_worker.h
index c94be72..ea1afe7 100644
--- a/media/base/fake_audio_worker.h
+++ b/media/base/fake_audio_worker.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_FAKE_AUDIO_WORKER_H_
#define MEDIA_BASE_FAKE_AUDIO_WORKER_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/task/sequenced_task_runner.h"
#include "media/base/media_export.h"
diff --git a/media/base/fake_audio_worker_unittest.cc b/media/base/fake_audio_worker_unittest.cc
index f46bdeb1..7c7ceb6 100644
--- a/media/base/fake_audio_worker_unittest.cc
+++ b/media/base/fake_audio_worker_unittest.cc
@@ -9,7 +9,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/scoped_refptr.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/task_environment.h"
diff --git a/media/base/fake_demuxer_stream.cc b/media/base/fake_demuxer_stream.cc
index 2f0f4d3..9151013 100644
--- a/media/base/fake_demuxer_stream.cc
+++ b/media/base/fake_demuxer_stream.cc
@@ -9,9 +9,9 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/notreached.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/base/fake_demuxer_stream_unittest.cc b/media/base/fake_demuxer_stream_unittest.cc
index 27ecf6c..02206943 100644
--- a/media/base/fake_demuxer_stream_unittest.cc
+++ b/media/base/fake_demuxer_stream_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "media/base/decoder_buffer.h"
diff --git a/media/base/fake_single_thread_task_runner.h b/media/base/fake_single_thread_task_runner.h
index 275bcbaa..2765cae 100644
--- a/media/base/fake_single_thread_task_runner.h
+++ b/media/base/fake_single_thread_task_runner.h
@@ -7,7 +7,7 @@
#include <map>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/simple_test_tick_clock.h"
diff --git a/media/base/fake_text_track_stream.cc b/media/base/fake_text_track_stream.cc
index fac4d15..0058058 100644
--- a/media/base/fake_text_track_stream.cc
+++ b/media/base/fake_text_track_stream.cc
@@ -6,8 +6,8 @@
#include <stdint.h>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/single_thread_task_runner.h"
#include "media/base/decoder_buffer.h"
#include "media/base/webvtt_util.h"
diff --git a/media/base/key_system_info.h b/media/base/key_system_info.h
index 416fe45..529ece2 100644
--- a/media/base/key_system_info.h
+++ b/media/base/key_system_info.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "build/build_config.h"
#include "media/base/decrypt_config.h"
#include "media/base/eme_constants.h"
diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc
index bf7c68ba..7d0d480 100644
--- a/media/base/key_systems.cc
+++ b/media/base/key_systems.cc
@@ -9,9 +9,9 @@
#include <memory>
#include <unordered_map>
-#include "base/callback_helpers.h"
#include "base/callback_list.h"
#include "base/cxx17_backports.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/weak_ptr.h"
#include "base/no_destructor.h"
diff --git a/media/base/key_systems.h b/media/base/key_systems.h
index 2edc4d2..6965b8e 100644
--- a/media/base/key_systems.h
+++ b/media/base/key_systems.h
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/base/decrypt_config.h"
#include "media/base/eme_constants.h"
#include "media/base/media_export.h"
diff --git a/media/base/mac/video_frame_mac_unittests.cc b/media/base/mac/video_frame_mac_unittests.cc
index 8ccb45e1..622bd51e 100644
--- a/media/base/mac/video_frame_mac_unittests.cc
+++ b/media/base/mac/video_frame_mac_unittests.cc
@@ -8,8 +8,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "media/base/video_frame.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/base/media_drm_storage.h b/media/base/media_drm_storage.h
index f3c7f68..7d1f5de 100644
--- a/media/base/media_drm_storage.h
+++ b/media/base/media_drm_storage.h
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "media/base/media_drm_key_type.h"
#include "media/base/media_export.h"
diff --git a/media/base/media_permission.h b/media/base/media_permission.h
index 99df419..42b30ca 100644
--- a/media/base/media_permission.h
+++ b/media/base/media_permission.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_MEDIA_PERMISSION_H_
#define MEDIA_BASE_MEDIA_PERMISSION_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "media/base/media_export.h"
namespace media {
diff --git a/media/base/media_status.h b/media/base/media_status.h
index 06129048..4335116c 100644
--- a/media/base/media_status.h
+++ b/media/base/media_status.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_MEDIA_STATUS_H_
#define MEDIA_BASE_MEDIA_STATUS_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "media/base/media_export.h"
diff --git a/media/base/media_tracks.cc b/media/base/media_tracks.cc
index 2576361..a7b1bcc 100644
--- a/media/base/media_tracks.cc
+++ b/media/base/media_tracks.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/no_destructor.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/video_decoder_config.h"
diff --git a/media/base/media_url_demuxer.cc b/media/base/media_url_demuxer.cc
index cdb46e1..94ff74f 100644
--- a/media/base/media_url_demuxer.cc
+++ b/media/base/media_url_demuxer.cc
@@ -4,7 +4,7 @@
#include "media/base/media_url_demuxer.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/base/media_url_demuxer.h b/media/base/media_url_demuxer.h
index 8a7b0f4..97e3740 100644
--- a/media/base/media_url_demuxer.h
+++ b/media/base/media_url_demuxer.h
@@ -7,7 +7,7 @@
#include <stddef.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/base/media_url_demuxer_unittest.cc b/media/base/media_url_demuxer_unittest.cc
index 16be246..514d6ebd 100644
--- a/media/base/media_url_demuxer_unittest.cc
+++ b/media/base/media_url_demuxer_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/task_environment.h"
diff --git a/media/base/mock_audio_renderer_sink.cc b/media/base/mock_audio_renderer_sink.cc
index e0efaab..29fc0cf 100644
--- a/media/base/mock_audio_renderer_sink.cc
+++ b/media/base/mock_audio_renderer_sink.cc
@@ -4,7 +4,7 @@
#include "media/base/mock_audio_renderer_sink.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
namespace media {
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index 04afce8..43bc904 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/task/sequenced_task_runner.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
diff --git a/media/base/multi_channel_resampler.cc b/media/base/multi_channel_resampler.cc
index d7ce47b..8610b08 100644
--- a/media/base/multi_channel_resampler.cc
+++ b/media/base/multi_channel_resampler.cc
@@ -7,9 +7,9 @@
#include <algorithm>
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "media/base/audio_bus.h"
namespace media {
diff --git a/media/base/multi_channel_resampler.h b/media/base/multi_channel_resampler.h
index 9d3c4bd..8527d84 100644
--- a/media/base/multi_channel_resampler.h
+++ b/media/base/multi_channel_resampler.h
@@ -10,7 +10,7 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/base/sinc_resampler.h"
namespace media {
diff --git a/media/base/multi_channel_resampler_unittest.cc b/media/base/multi_channel_resampler_unittest.cc
index b106375d..8411e71 100644
--- a/media/base/multi_channel_resampler_unittest.cc
+++ b/media/base/multi_channel_resampler_unittest.cc
@@ -7,8 +7,8 @@
#include <cmath>
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "media/base/audio_bus.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/base/null_video_sink.cc b/media/base/null_video_sink.cc
index d1b0f86c..1f69f9d 100644
--- a/media/base/null_video_sink.cc
+++ b/media/base/null_video_sink.cc
@@ -4,8 +4,8 @@
#include "media/base/null_video_sink.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/base/null_video_sink_unittest.cc b/media/base/null_video_sink_unittest.cc
index 47a301b..0b8218c3 100644
--- a/media/base/null_video_sink_unittest.cc
+++ b/media/base/null_video_sink_unittest.cc
@@ -4,8 +4,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/test/gmock_callback_support.h"
#include "base/test/simple_test_tick_clock.h"
#include "base/test/task_environment.h"
diff --git a/media/base/offloading_audio_encoder_unittest.cc b/media/base/offloading_audio_encoder_unittest.cc
index 243bf97..4c10cd9 100644
--- a/media/base/offloading_audio_encoder_unittest.cc
+++ b/media/base/offloading_audio_encoder_unittest.cc
@@ -5,8 +5,8 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/base/output_device_info.h b/media/base/output_device_info.h
index 7387896..09cb94c6 100644
--- a/media/base/output_device_info.h
+++ b/media/base/output_device_info.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/base/audio_parameters.h"
#include "media/base/media_export.h"
diff --git a/media/base/overlay_info.h b/media/base/overlay_info.h
index 88b0b22..00f4e345 100644
--- a/media/base/overlay_info.h
+++ b/media/base/overlay_info.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_OVERLAY_INFO_H_
#define MEDIA_BASE_OVERLAY_INFO_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/unguessable_token.h"
#include "media/base/media_export.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc
index 8d8b6e95..ec1895ec 100644
--- a/media/base/pipeline_impl.cc
+++ b/media/base/pipeline_impl.cc
@@ -8,10 +8,10 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_macros.h"
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc
index 002f2bb..56e5aba 100644
--- a/media/base/pipeline_impl_unittest.cc
+++ b/media/base/pipeline_impl_unittest.cc
@@ -9,7 +9,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/media/base/pipeline_status.h b/media/base/pipeline_status.h
index b9858492..cd3097f 100644
--- a/media/base/pipeline_status.h
+++ b/media/base/pipeline_status.h
@@ -9,7 +9,7 @@
#include <iosfwd>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "media/base/decoder.h"
#include "media/base/media_export.h"
diff --git a/media/base/provision_fetcher.h b/media/base/provision_fetcher.h
index 9a073997..db2a480 100644
--- a/media/base/provision_fetcher.h
+++ b/media/base/provision_fetcher.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "url/gurl.h"
namespace media {
diff --git a/media/base/renderer.h b/media/base/renderer.h
index 75276fc..65d3036f 100644
--- a/media/base/renderer.h
+++ b/media/base/renderer.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_RENDERER_H_
#define MEDIA_BASE_RENDERER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "media/base/buffering_state.h"
#include "media/base/demuxer_stream.h"
diff --git a/media/base/renderer_factory_selector.h b/media/base/renderer_factory_selector.h
index 7ca640a..5ab0db1 100644
--- a/media/base/renderer_factory_selector.h
+++ b/media/base/renderer_factory_selector.h
@@ -7,7 +7,7 @@
#include <map>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "build/build_config.h"
#include "media/base/media_export.h"
#include "media/base/media_status.h"
diff --git a/media/base/renderer_factory_selector_unittest.cc b/media/base/renderer_factory_selector_unittest.cc
index 719c836..69a4a8b8 100644
--- a/media/base/renderer_factory_selector_unittest.cc
+++ b/media/base/renderer_factory_selector_unittest.cc
@@ -4,7 +4,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "media/base/overlay_info.h"
#include "media/base/renderer_factory_selector.h"
diff --git a/media/base/routing_token_callback.h b/media/base/routing_token_callback.h
index 6603260..2630d69 100644
--- a/media/base/routing_token_callback.h
+++ b/media/base/routing_token_callback.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_ROUTING_TOKEN_CALLBACK_H_
#define MEDIA_BASE_ROUTING_TOKEN_CALLBACK_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/unguessable_token.h"
namespace media {
diff --git a/media/base/run_all_perftests.cc b/media/base/run_all_perftests.cc
index ba1663f..39aee4a7 100644
--- a/media/base/run_all_perftests.cc
+++ b/media/base/run_all_perftests.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
#include "build/build_config.h"
diff --git a/media/base/serial_runner.cc b/media/base/serial_runner.cc
index 80106a8..207ed09 100644
--- a/media/base/serial_runner.cc
+++ b/media/base/serial_runner.cc
@@ -4,8 +4,8 @@
#include "media/base/serial_runner.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/base/serial_runner.h b/media/base/serial_runner.h
index d1c9487..d288f597 100644
--- a/media/base/serial_runner.h
+++ b/media/base/serial_runner.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/base/serial_runner_unittest.cc b/media/base/serial_runner_unittest.cc
index e3e4a40d..eaff6be1 100644
--- a/media/base/serial_runner_unittest.cc
+++ b/media/base/serial_runner_unittest.cc
@@ -5,8 +5,8 @@
#include <stddef.h>
#include <memory>
-#include "base/bind.h"
#include "base/debug/stack_trace.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/task_environment.h"
diff --git a/media/base/silent_sink_suspender.cc b/media/base/silent_sink_suspender.cc
index 2f74573..bfb76d89 100644
--- a/media/base/silent_sink_suspender.cc
+++ b/media/base/silent_sink_suspender.cc
@@ -4,7 +4,7 @@
#include "media/base/silent_sink_suspender.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/single_thread_task_runner.h"
#include "media/base/audio_glitch_info.h"
diff --git a/media/base/simple_watch_timer.h b/media/base/simple_watch_timer.h
index 152ff7d..7be8a4b 100644
--- a/media/base/simple_watch_timer.h
+++ b/media/base/simple_watch_timer.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_SIMPLE_WATCH_TIMER_H_
#define MEDIA_BASE_SIMPLE_WATCH_TIMER_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
#include "media/base/media_export.h"
diff --git a/media/base/sinc_resampler.h b/media/base/sinc_resampler.h
index 5ba1ada..88774a9 100644
--- a/media/base/sinc_resampler.h
+++ b/media/base/sinc_resampler.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/memory/aligned_memory.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/base/sinc_resampler_perftest.cc b/media/base/sinc_resampler_perftest.cc
index 122e696..da43f55 100644
--- a/media/base/sinc_resampler_perftest.cc
+++ b/media/base/sinc_resampler_perftest.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/cpu.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/time/time.h"
#include "build/build_config.h"
#include "media/base/sinc_resampler.h"
diff --git a/media/base/sinc_resampler_unittest.cc b/media/base/sinc_resampler_unittest.cc
index f77053c..fdcb12c 100644
--- a/media/base/sinc_resampler_unittest.cc
+++ b/media/base/sinc_resampler_unittest.cc
@@ -4,8 +4,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/numerics/math_constants.h"
#include "base/strings/string_number_conversions.h"
#include "base/time/time.h"
diff --git a/media/base/speech_recognition_client.h b/media/base/speech_recognition_client.h
index 6182c2e..d433ef4 100644
--- a/media/base/speech_recognition_client.h
+++ b/media/base/speech_recognition_client.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/base/audio_buffer.h"
#include "media/base/audio_bus.h"
#include "media/base/media_export.h"
diff --git a/media/base/stream_parser.h b/media/base/stream_parser.h
index e582b9a4..81b867d 100644
--- a/media/base/stream_parser.h
+++ b/media/base/stream_parser.h
@@ -12,8 +12,8 @@
#include <memory>
#include <vector>
-#include "base/callback_forward.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/time/time.h"
#include "media/base/demuxer_stream.h"
diff --git a/media/base/test_helpers.cc b/media/base/test_helpers.cc
index bb991588..871d6df 100644
--- a/media/base/test_helpers.cc
+++ b/media/base/test_helpers.cc
@@ -8,8 +8,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/notreached.h"
#include "base/pickle.h"
#include "base/run_loop.h"
diff --git a/media/base/test_helpers.h b/media/base/test_helpers.h
index 6c8e95b..1f05c20 100644
--- a/media/base/test_helpers.h
+++ b/media/base/test_helpers.h
@@ -8,7 +8,7 @@
#include <stddef.h>
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/sequence_checker.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/base/text_renderer.cc b/media/base/text_renderer.cc
index e970f5ba..f2d6ac8 100644
--- a/media/base/text_renderer.cc
+++ b/media/base/text_renderer.cc
@@ -8,9 +8,9 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/notreached.h"
#include "base/task/single_thread_task_runner.h"
#include "media/base/bind_to_current_loop.h"
diff --git a/media/base/text_renderer.h b/media/base/text_renderer.h
index b1fd5bd..99942ce 100644
--- a/media/base/text_renderer.h
+++ b/media/base/text_renderer.h
@@ -9,7 +9,7 @@
#include <memory>
#include <set>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "media/base/demuxer_stream.h"
#include "media/base/media_export.h"
diff --git a/media/base/text_renderer_unittest.cc b/media/base/text_renderer_unittest.cc
index 294f4253..f326c16 100644
--- a/media/base/text_renderer_unittest.cc
+++ b/media/base/text_renderer_unittest.cc
@@ -9,8 +9,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "base/time/time.h"
diff --git a/media/base/text_track.h b/media/base/text_track.h
index abe4970..9e712f6 100644
--- a/media/base/text_track.h
+++ b/media/base/text_track.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
namespace media {
diff --git a/media/base/time_source.h b/media/base/time_source.h
index 3dc2b8a..b5a429dd 100644
--- a/media/base/time_source.h
+++ b/media/base/time_source.h
@@ -7,7 +7,7 @@
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "media/base/media_export.h"
diff --git a/media/base/user_input_monitor_linux.cc b/media/base/user_input_monitor_linux.cc
index 3fc7a43f..5320828 100644
--- a/media/base/user_input_monitor_linux.cc
+++ b/media/base/user_input_monitor_linux.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/task/single_thread_task_runner.h"
#include "ui/ozone/public/ozone_platform.h"
diff --git a/media/base/user_input_monitor_win.cc b/media/base/user_input_monitor_win.cc
index 56c9f5e..957818c 100644
--- a/media/base/user_input_monitor_win.cc
+++ b/media/base/user_input_monitor_win.cc
@@ -8,7 +8,7 @@
#include <stdint.h>
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/base/video_encoder.h b/media/base/video_encoder.h
index 83456ee..5abc201 100644
--- a/media/base/video_encoder.h
+++ b/media/base/video_encoder.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_VIDEO_ENCODER_H_
#define MEDIA_BASE_VIDEO_ENCODER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "media/base/bind_to_current_loop.h"
#include "media/base/bitrate.h"
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
index 56dca1c..e8c3e2b0 100644
--- a/media/base/video_frame.cc
+++ b/media/base/video_frame.cc
@@ -13,9 +13,9 @@
#include <numeric>
#include <utility>
-#include "base/bind.h"
#include "base/bits.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/process/memory.h"
#include "base/strings/string_piece.h"
diff --git a/media/base/video_frame.h b/media/base/video_frame.h
index bba57d6..9e8ff2a 100644
--- a/media/base/video_frame.h
+++ b/media/base/video_frame.h
@@ -13,8 +13,8 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
#include "base/check_op.h"
+#include "base/functional/callback.h"
#include "base/hash/md5.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/read_only_shared_memory_region.h"
diff --git a/media/base/video_frame_pool.cc b/media/base/video_frame_pool.cc
index ec53bad..b1a42377 100644
--- a/media/base/video_frame_pool.cc
+++ b/media/base/video_frame_pool.cc
@@ -4,8 +4,8 @@
#include "media/base/video_frame_pool.h"
-#include "base/bind.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
diff --git a/media/base/video_frame_unittest.cc b/media/base/video_frame_unittest.cc
index 2b8b48e..c34c439 100644
--- a/media/base/video_frame_unittest.cc
+++ b/media/base/video_frame_unittest.cc
@@ -9,9 +9,9 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/aligned_memory.h"
#include "base/memory/read_only_shared_memory_region.h"
#include "base/strings/stringprintf.h"
diff --git a/media/base/video_renderer.h b/media/base/video_renderer.h
index 1a5a9fa..d4a84a4 100644
--- a/media/base/video_renderer.h
+++ b/media/base/video_renderer.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_VIDEO_RENDERER_H_
#define MEDIA_BASE_VIDEO_RENDERER_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "media/base/media_export.h"
#include "media/base/pipeline_status.h"
#include "media/base/time_source.h"
diff --git a/media/base/video_thumbnail_decoder.cc b/media/base/video_thumbnail_decoder.cc
index a6d8e096..ff18d6b 100644
--- a/media/base/video_thumbnail_decoder.cc
+++ b/media/base/video_thumbnail_decoder.cc
@@ -4,8 +4,8 @@
#include "media/base/video_thumbnail_decoder.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "media/base/decoder_buffer.h"
#include "media/base/video_frame.h"
diff --git a/media/base/video_thumbnail_decoder.h b/media/base/video_thumbnail_decoder.h
index f7eec96..612b8bb 100644
--- a/media/base/video_thumbnail_decoder.h
+++ b/media/base/video_thumbnail_decoder.h
@@ -8,7 +8,7 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "media/base/media_export.h"
diff --git a/media/base/video_thumbnail_decoder_unittest.cc b/media/base/video_thumbnail_decoder_unittest.cc
index e6856860..549c8de 100644
--- a/media/base/video_thumbnail_decoder_unittest.cc
+++ b/media/base/video_thumbnail_decoder_unittest.cc
@@ -5,8 +5,8 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/test/gmock_callback_support.h"
diff --git a/media/base/video_util.cc b/media/base/video_util.cc
index 835b0ef..c9e47e7 100644
--- a/media/base/video_util.cc
+++ b/media/base/video_util.cc
@@ -6,10 +6,10 @@
#include <cmath>
-#include "base/bind.h"
#include "base/bits.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/notreached.h"
#include "base/numerics/safe_conversions.h"
diff --git a/media/base/waiting.h b/media/base/waiting.h
index ec09d828..9ea0df4 100644
--- a/media/base/waiting.h
+++ b/media/base/waiting.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_WAITING_H_
#define MEDIA_BASE_WAITING_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
namespace media {
diff --git a/media/base/win/dcomp_texture_wrapper.h b/media/base/win/dcomp_texture_wrapper.h
index 511621c..44aee4b 100644
--- a/media/base/win/dcomp_texture_wrapper.h
+++ b/media/base/win/dcomp_texture_wrapper.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_WIN_DCOMP_TEXTURE_WRAPPER_H_
#define MEDIA_BASE_WIN_DCOMP_TEXTURE_WRAPPER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/unguessable_token.h"
#include "ui/gfx/gpu_memory_buffer.h"
diff --git a/media/base/win/overlay_state_observer_subscription.h b/media/base/win/overlay_state_observer_subscription.h
index 2a9ce8d..bcec257 100644
--- a/media/base/win/overlay_state_observer_subscription.h
+++ b/media/base/win/overlay_state_observer_subscription.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_WIN_OVERLAY_STATE_OBSERVER_SUBSCRIPTION_H_
#define MEDIA_BASE_WIN_OVERLAY_STATE_OBSERVER_SUBSCRIPTION_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
namespace gpu {
struct Mailbox;
diff --git a/media/capabilities/in_memory_video_decode_stats_db_impl.cc b/media/capabilities/in_memory_video_decode_stats_db_impl.cc
index 6ba99b5a..7f2534f8 100644
--- a/media/capabilities/in_memory_video_decode_stats_db_impl.cc
+++ b/media/capabilities/in_memory_video_decode_stats_db_impl.cc
@@ -7,9 +7,9 @@
#include <memory>
#include <tuple>
-#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/sequence_checker.h"
diff --git a/media/capabilities/in_memory_video_decode_stats_db_unittest.cc b/media/capabilities/in_memory_video_decode_stats_db_unittest.cc
index 745863e..822ce7b 100644
--- a/media/capabilities/in_memory_video_decode_stats_db_unittest.cc
+++ b/media/capabilities/in_memory_video_decode_stats_db_unittest.cc
@@ -4,9 +4,9 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/test/gtest_util.h"
#include "base/test/task_environment.h"
diff --git a/media/capabilities/pending_operations.cc b/media/capabilities/pending_operations.cc
index 0cd8066..99fa130 100644
--- a/media/capabilities/pending_operations.cc
+++ b/media/capabilities/pending_operations.cc
@@ -6,7 +6,7 @@
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/capabilities/pending_operations_unittest.cc b/media/capabilities/pending_operations_unittest.cc
index 2af3fdb..05cbadf 100644
--- a/media/capabilities/pending_operations_unittest.cc
+++ b/media/capabilities/pending_operations_unittest.cc
@@ -4,7 +4,7 @@
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/test/task_environment.h"
#include "base/time/time.h"
diff --git a/media/capabilities/video_decode_stats_db.h b/media/capabilities/video_decode_stats_db.h
index 5df12e6d..f58b6ca 100644
--- a/media/capabilities/video_decode_stats_db.h
+++ b/media/capabilities/video_decode_stats_db.h
@@ -8,8 +8,8 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
#include "base/check.h"
+#include "base/functional/callback_forward.h"
#include "media/base/media_export.h"
#include "media/base/video_codecs.h"
#include "ui/gfx/geometry/size.h"
diff --git a/media/capabilities/video_decode_stats_db_impl.cc b/media/capabilities/video_decode_stats_db_impl.cc
index 0638f60..b498ea7f7 100644
--- a/media/capabilities/video_decode_stats_db_impl.cc
+++ b/media/capabilities/video_decode_stats_db_impl.cc
@@ -8,9 +8,9 @@
#include <string>
#include <tuple>
-#include "base/bind.h"
#include "base/debug/alias.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/field_trial_params.h"
diff --git a/media/capabilities/video_decode_stats_db_impl_unittest.cc b/media/capabilities/video_decode_stats_db_impl_unittest.cc
index cd33fcff..2d374b0 100644
--- a/media/capabilities/video_decode_stats_db_impl_unittest.cc
+++ b/media/capabilities/video_decode_stats_db_impl_unittest.cc
@@ -5,11 +5,11 @@
#include <map>
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/check.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/media/capabilities/video_decode_stats_db_provider.h b/media/capabilities/video_decode_stats_db_provider.h
index 649541bc..3940281 100644
--- a/media/capabilities/video_decode_stats_db_provider.h
+++ b/media/capabilities/video_decode_stats_db_provider.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_CAPABILITIES_VIDEO_DECODE_STATS_DB_PROVIDER_H_
#define MEDIA_CAPABILITIES_VIDEO_DECODE_STATS_DB_PROVIDER_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "media/base/media_export.h"
namespace media {
diff --git a/media/capabilities/webrtc_video_stats_db.h b/media/capabilities/webrtc_video_stats_db.h
index e9687cf..3305521 100644
--- a/media/capabilities/webrtc_video_stats_db.h
+++ b/media/capabilities/webrtc_video_stats_db.h
@@ -9,9 +9,9 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
#include "base/check.h"
#include "base/containers/flat_map.h"
+#include "base/functional/callback_forward.h"
#include "base/time/time.h"
#include "media/base/media_export.h"
#include "media/base/video_codecs.h"
diff --git a/media/capabilities/webrtc_video_stats_db_impl.cc b/media/capabilities/webrtc_video_stats_db_impl.cc
index 2fd1b7d..d976461 100644
--- a/media/capabilities/webrtc_video_stats_db_impl.cc
+++ b/media/capabilities/webrtc_video_stats_db_impl.cc
@@ -8,9 +8,9 @@
#include <string>
#include <tuple>
-#include "base/bind.h"
#include "base/debug/alias.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/field_trial_params.h"
diff --git a/media/capabilities/webrtc_video_stats_db_impl_unittest.cc b/media/capabilities/webrtc_video_stats_db_impl_unittest.cc
index babb4b03..064139c 100644
--- a/media/capabilities/webrtc_video_stats_db_impl_unittest.cc
+++ b/media/capabilities/webrtc_video_stats_db_impl_unittest.cc
@@ -5,11 +5,11 @@
#include <map>
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/check.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/media/capabilities/webrtc_video_stats_db_provider.h b/media/capabilities/webrtc_video_stats_db_provider.h
index d1927d5..94a30bb 100644
--- a/media/capabilities/webrtc_video_stats_db_provider.h
+++ b/media/capabilities/webrtc_video_stats_db_provider.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_CAPABILITIES_WEBRTC_VIDEO_STATS_DB_PROVIDER_H_
#define MEDIA_CAPABILITIES_WEBRTC_VIDEO_STATS_DB_PROVIDER_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "media/base/media_export.h"
namespace media {
diff --git a/media/capture/content/android/thread_safe_capture_oracle.cc b/media/capture/content/android/thread_safe_capture_oracle.cc
index cbbbd36..5d76242 100644
--- a/media/capture/content/android/thread_safe_capture_oracle.cc
+++ b/media/capture/content/android/thread_safe_capture_oracle.cc
@@ -9,8 +9,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/bits.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "base/time/time.h"
diff --git a/media/capture/content/screen_enumerator.h b/media/capture/content/screen_enumerator.h
index a28dd48b..5f41b14 100644
--- a/media/capture/content/screen_enumerator.h
+++ b/media/capture/content/screen_enumerator.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_CAPTURE_CONTENT_SCREEN_ENUMERATOR_H_
#define MEDIA_CAPTURE_CONTENT_SCREEN_ENUMERATOR_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
namespace blink::mojom {
class StreamDevicesSet;
diff --git a/media/capture/content/video_capture_oracle.cc b/media/capture/content/video_capture_oracle.cc
index 1e9cd2de..7160b29 100644
--- a/media/capture/content/video_capture_oracle.cc
+++ b/media/capture/content/video_capture_oracle.cc
@@ -8,9 +8,9 @@
#include <limits>
#include <utility>
-#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/format_macros.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/stringprintf.h"
diff --git a/media/capture/content/video_capture_oracle.h b/media/capture/content/video_capture_oracle.h
index 78d87014..ecd42fc 100644
--- a/media/capture/content/video_capture_oracle.h
+++ b/media/capture/content/video_capture_oracle.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "media/base/feedback_signal_accumulator.h"
#include "media/capture/capture_export.h"
diff --git a/media/capture/run_all_unittests.cc b/media/capture/run_all_unittests.cc
index 1a09d26..9b32da1 100644
--- a/media/capture/run_all_unittests.cc
+++ b/media/capture/run_all_unittests.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/message_loop/message_pump_type.h"
#include "base/test/launcher/unit_test_launcher.h"
diff --git a/media/capture/video/android/video_capture_device_android.cc b/media/capture/video/android/video_capture_device_android.cc
index cefadded..cd22cf36 100644
--- a/media/capture/video/android/video_capture_device_android.cc
+++ b/media/capture/video/android/video_capture_device_android.cc
@@ -10,7 +10,7 @@
#include "base/android/jni_android.h"
#include "base/android/jni_array.h"
#include "base/android/jni_string.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/numerics/safe_conversions.h"
#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/capture/video/chromeos/camera_3a_controller.cc b/media/capture/video/chromeos/camera_3a_controller.cc
index b497c42..53dfdc3 100644
--- a/media/capture/video/chromeos/camera_3a_controller.cc
+++ b/media/capture/video/chromeos/camera_3a_controller.cc
@@ -6,9 +6,9 @@
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/cxx17_backports.h"
+#include "base/functional/bind.h"
#include "base/task/single_thread_task_runner.h"
#include "base/trace_event/typed_macros.h"
#include "media/capture/video/chromeos/camera_metadata_utils.h"
diff --git a/media/capture/video/chromeos/camera_3a_controller_unittest.cc b/media/capture/video/chromeos/camera_3a_controller_unittest.cc
index ccc5b7b..3a71663 100644
--- a/media/capture/video/chromeos/camera_3a_controller_unittest.cc
+++ b/media/capture/video/chromeos/camera_3a_controller_unittest.cc
@@ -7,7 +7,7 @@
#include <functional>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
#include "base/time/time.h"
diff --git a/media/capture/video/chromeos/camera_app_device_bridge_impl.cc b/media/capture/video/chromeos/camera_app_device_bridge_impl.cc
index 90e6035f..cacf35d 100644
--- a/media/capture/video/chromeos/camera_app_device_bridge_impl.cc
+++ b/media/capture/video/chromeos/camera_app_device_bridge_impl.cc
@@ -6,8 +6,8 @@
#include <string>
-#include "base/callback_helpers.h"
#include "base/command_line.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/single_thread_task_runner.h"
#include "media/base/bind_to_current_loop.h"
#include "media/base/media_switches.h"
diff --git a/media/capture/video/chromeos/camera_device_delegate.cc b/media/capture/video/chromeos/camera_device_delegate.cc
index 826d00a..935824d9a0 100644
--- a/media/capture/video/chromeos/camera_device_delegate.cc
+++ b/media/capture/video/chromeos/camera_device_delegate.cc
@@ -12,11 +12,10 @@
#include <vector>
#include "ash/constants/ash_features.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
#include "base/cxx17_backports.h"
#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/no_destructor.h"
#include "base/posix/safe_strerror.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/capture/video/chromeos/camera_device_delegate_unittest.cc b/media/capture/video/chromeos/camera_device_delegate_unittest.cc
index 49d4bde..b27840f 100644
--- a/media/capture/video/chromeos/camera_device_delegate_unittest.cc
+++ b/media/capture/video/chromeos/camera_device_delegate_unittest.cc
@@ -10,8 +10,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/task/thread_pool.h"
#include "base/test/bind.h"
diff --git a/media/capture/video/chromeos/camera_hal_delegate.cc b/media/capture/video/chromeos/camera_hal_delegate.cc
index a017e90e..ff478bf 100644
--- a/media/capture/video/chromeos/camera_hal_delegate.cc
+++ b/media/capture/video/chromeos/camera_hal_delegate.cc
@@ -9,9 +9,9 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/flat_set.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/posix/safe_strerror.h"
#include "base/process/launch.h"
#include "base/ranges/algorithm.h"
diff --git a/media/capture/video/chromeos/camera_hal_dispatcher_impl.cc b/media/capture/video/chromeos/camera_hal_dispatcher_impl.cc
index 06a9d3f..cd93acf 100644
--- a/media/capture/video/chromeos/camera_hal_dispatcher_impl.cc
+++ b/media/capture/video/chromeos/camera_hal_dispatcher_impl.cc
@@ -13,11 +13,11 @@
#include <vector>
#include "ash/constants/ash_features.h"
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/notreached.h"
#include "base/posix/eintr_wrapper.h"
diff --git a/media/capture/video/chromeos/camera_hal_dispatcher_impl_unittest.cc b/media/capture/video/chromeos/camera_hal_dispatcher_impl_unittest.cc
index 52c85db..6c3e77f 100644
--- a/media/capture/video/chromeos/camera_hal_dispatcher_impl_unittest.cc
+++ b/media/capture/video/chromeos/camera_hal_dispatcher_impl_unittest.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/posix/safe_strerror.h"
#include "base/run_loop.h"
#include "base/synchronization/waitable_event.h"
diff --git a/media/capture/video/chromeos/display_rotation_observer.cc b/media/capture/video/chromeos/display_rotation_observer.cc
index 9f38432..b2de6b8 100644
--- a/media/capture/video/chromeos/display_rotation_observer.cc
+++ b/media/capture/video/chromeos/display_rotation_observer.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/single_thread_task_runner.h"
namespace media {
diff --git a/media/capture/video/chromeos/mock_camera_module.cc b/media/capture/video/chromeos/mock_camera_module.cc
index c22a7ce..450e569e 100644
--- a/media/capture/video/chromeos/mock_camera_module.cc
+++ b/media/capture/video/chromeos/mock_camera_module.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
namespace media {
namespace unittest_internal {
diff --git a/media/capture/video/chromeos/mock_vendor_tag_ops.cc b/media/capture/video/chromeos/mock_vendor_tag_ops.cc
index 0a74d16..49451d931 100644
--- a/media/capture/video/chromeos/mock_vendor_tag_ops.cc
+++ b/media/capture/video/chromeos/mock_vendor_tag_ops.cc
@@ -4,8 +4,8 @@
#include "media/capture/video/chromeos/mock_vendor_tag_ops.h"
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/synchronization/waitable_event.h"
namespace media {
diff --git a/media/capture/video/chromeos/request_manager.cc b/media/capture/video/chromeos/request_manager.cc
index e56ba96..28e340f 100644
--- a/media/capture/video/chromeos/request_manager.cc
+++ b/media/capture/video/chromeos/request_manager.cc
@@ -12,9 +12,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/functional/callback_helpers.h"
#include "base/posix/safe_strerror.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/capture/video/chromeos/request_manager_unittest.cc b/media/capture/video/chromeos/request_manager_unittest.cc
index 27c639f..3f0a0161 100644
--- a/media/capture/video/chromeos/request_manager_unittest.cc
+++ b/media/capture/video/chromeos/request_manager_unittest.cc
@@ -9,7 +9,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/task_environment.h"
diff --git a/media/capture/video/chromeos/stream_buffer_manager.cc b/media/capture/video/chromeos/stream_buffer_manager.cc
index 4a6a004..5cef5d4 100644
--- a/media/capture/video/chromeos/stream_buffer_manager.cc
+++ b/media/capture/video/chromeos/stream_buffer_manager.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <string>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/posix/safe_strerror.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
diff --git a/media/capture/video/chromeos/vendor_tag_ops_delegate.cc b/media/capture/video/chromeos/vendor_tag_ops_delegate.cc
index 1bc025c..3bcb91f 100644
--- a/media/capture/video/chromeos/vendor_tag_ops_delegate.cc
+++ b/media/capture/video/chromeos/vendor_tag_ops_delegate.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/strcat.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/capture/video/chromeos/video_capture_device_chromeos_delegate.cc b/media/capture/video/chromeos/video_capture_device_chromeos_delegate.cc
index 356ab28..d19d3cf5 100644
--- a/media/capture/video/chromeos/video_capture_device_chromeos_delegate.cc
+++ b/media/capture/video/chromeos/video_capture_device_chromeos_delegate.cc
@@ -8,7 +8,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/synchronization/waitable_event.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/capture/video/chromeos/video_capture_jpeg_decoder.h b/media/capture/video/chromeos/video_capture_jpeg_decoder.h
index f5948d4..ade6f34 100644
--- a/media/capture/video/chromeos/video_capture_jpeg_decoder.h
+++ b/media/capture/video/chromeos/video_capture_jpeg_decoder.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_CAPTURE_VIDEO_CHROMEOS_VIDEO_CAPTURE_JPEG_DECODER_H_
#define MEDIA_CAPTURE_VIDEO_CHROMEOS_VIDEO_CAPTURE_JPEG_DECODER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/capture/capture_export.h"
#include "media/capture/video/video_capture_device.h"
#include "media/capture/video/video_frame_receiver.h"
diff --git a/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.cc b/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.cc
index 17a4700..ef4f76a 100644
--- a/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.cc
+++ b/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/metrics/histogram_macros.h"
#include "base/task/sequenced_task_runner.h"
#include "base/trace_event/typed_macros.h"
diff --git a/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.h b/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.h
index 82659238..64f3375 100644
--- a/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.h
+++ b/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.h
@@ -11,7 +11,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/unsafe_shared_memory_region.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
diff --git a/media/capture/video/fake_video_capture_device.cc b/media/capture/video/fake_video_capture_device.cc
index e0ed905..201db586 100644
--- a/media/capture/video/fake_video_capture_device.cc
+++ b/media/capture/video/fake_video_capture_device.cc
@@ -8,8 +8,8 @@
#include <algorithm>
#include <utility>
-#include "base/bind.h"
#include "base/cxx17_backports.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/media/capture/video/fake_video_capture_device_unittest.cc b/media/capture/video/fake_video_capture_device_unittest.cc
index 6ba66336..7241055 100644
--- a/media/capture/video/fake_video_capture_device_unittest.cc
+++ b/media/capture/video/fake_video_capture_device_unittest.cc
@@ -10,8 +10,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
#include "base/test/bind.h"
diff --git a/media/capture/video/file_video_capture_device.cc b/media/capture/video/file_video_capture_device.cc
index 96a1fd4..6061afc 100644
--- a/media/capture/video/file_video_capture_device.cc
+++ b/media/capture/video/file_video_capture_device.cc
@@ -9,8 +9,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/cxx17_backports.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/capture/video/file_video_capture_device_unittest.cc b/media/capture/video/file_video_capture_device_unittest.cc
index 9a8c848..94d042c 100644
--- a/media/capture/video/file_video_capture_device_unittest.cc
+++ b/media/capture/video/file_video_capture_device_unittest.cc
@@ -8,7 +8,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/synchronization/waitable_event.h"
#include "base/test/task_environment.h"
#include "media/base/bind_to_current_loop.h"
diff --git a/media/capture/video/gpu_memory_buffer_utils.cc b/media/capture/video/gpu_memory_buffer_utils.cc
index 2328ed7..4aa7c97 100644
--- a/media/capture/video/gpu_memory_buffer_utils.cc
+++ b/media/capture/video/gpu_memory_buffer_utils.cc
@@ -4,7 +4,7 @@
#include "media/capture/video/gpu_memory_buffer_utils.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "gpu/ipc/common/gpu_memory_buffer_support.h"
#include "ui/gfx/gpu_memory_buffer.h"
diff --git a/media/capture/video/linux/fake_v4l2_impl.cc b/media/capture/video/linux/fake_v4l2_impl.cc
index 80d38e76..a7b1689 100644
--- a/media/capture/video/linux/fake_v4l2_impl.cc
+++ b/media/capture/video/linux/fake_v4l2_impl.cc
@@ -11,8 +11,8 @@
#include <queue>
-#include "base/bind.h"
#include "base/bits.h"
+#include "base/functional/bind.h"
#include "base/ranges/algorithm.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
diff --git a/media/capture/video/linux/v4l2_capture_delegate.cc b/media/capture/video/linux/v4l2_capture_delegate.cc
index 5c23595be..c447d607 100644
--- a/media/capture/video/linux/v4l2_capture_delegate.cc
+++ b/media/capture/video/linux/v4l2_capture_delegate.cc
@@ -14,7 +14,7 @@
#include <algorithm>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/posix/eintr_wrapper.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/capture/video/linux/video_capture_device_linux.cc b/media/capture/video/linux/video_capture_device_linux.cc
index 234dc74..819d417 100644
--- a/media/capture/video/linux/video_capture_device_linux.cc
+++ b/media/capture/video/linux/video_capture_device_linux.cc
@@ -8,7 +8,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/synchronization/waitable_event.h"
#include "base/task/single_thread_task_runner.h"
#include "base/task/thread_pool.h"
diff --git a/media/capture/video/mac/pixel_buffer_pool_mac_unittest.mm b/media/capture/video/mac/pixel_buffer_pool_mac_unittest.mm
index 7e2e8a1..06a36ca 100644
--- a/media/capture/video/mac/pixel_buffer_pool_mac_unittest.mm
+++ b/media/capture/video/mac/pixel_buffer_pool_mac_unittest.mm
@@ -4,7 +4,7 @@
#include "media/capture/video/mac/pixel_buffer_pool_mac.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/mac/scoped_nsobject.h"
#import "media/capture/video/mac/test/video_capture_test_utils_mac.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/capture/video/mac/test/video_capture_test_utils_mac.h b/media/capture/video/mac/test/video_capture_test_utils_mac.h
index cd0295a..e5785fa7 100644
--- a/media/capture/video/mac/test/video_capture_test_utils_mac.h
+++ b/media/capture/video/mac/test/video_capture_test_utils_mac.h
@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "media/capture/video/mac/video_capture_device_factory_mac.h"
namespace media {
diff --git a/media/capture/video/mac/video_capture_device_avfoundation_mac.h b/media/capture/video/mac/video_capture_device_avfoundation_mac.h
index e631435..a430689 100644
--- a/media/capture/video/mac/video_capture_device_avfoundation_mac.h
+++ b/media/capture/video/mac/video_capture_device_avfoundation_mac.h
@@ -9,7 +9,7 @@
#import <AVFoundation/AVFoundation.h>
#import <Foundation/Foundation.h>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/task/single_thread_task_runner.h"
#include "base/mac/scoped_dispatch_object.h"
diff --git a/media/capture/video/mac/video_capture_device_avfoundation_mac_unittest.mm b/media/capture/video/mac/video_capture_device_avfoundation_mac_unittest.mm
index 98286d3a..18cf1b1 100644
--- a/media/capture/video/mac/video_capture_device_avfoundation_mac_unittest.mm
+++ b/media/capture/video/mac/video_capture_device_avfoundation_mac_unittest.mm
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/mac/scoped_nsobject.h"
#include "base/run_loop.h"
#include "base/strings/sys_string_conversions.h"
diff --git a/media/capture/video/mac/video_capture_device_factory_mac.mm b/media/capture/video/mac/video_capture_device_factory_mac.mm
index a5b015ae..31e63ae 100644
--- a/media/capture/video/mac/video_capture_device_factory_mac.mm
+++ b/media/capture/video/mac/video_capture_device_factory_mac.mm
@@ -10,7 +10,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/strings/string_util.h"
#include "base/strings/sys_string_conversions.h"
diff --git a/media/capture/video/mac/video_capture_device_factory_mac_unittest.mm b/media/capture/video/mac/video_capture_device_factory_mac_unittest.mm
index b8fc999..e660436 100644
--- a/media/capture/video/mac/video_capture_device_factory_mac_unittest.mm
+++ b/media/capture/video/mac/video_capture_device_factory_mac_unittest.mm
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "media/capture/video/mac/video_capture_device_factory_mac.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/bind.h"
#include "base/test/task_environment.h"
diff --git a/media/capture/video/mac/video_capture_device_mac.mm b/media/capture/video/mac/video_capture_device_mac.mm
index 5c9a17c4..7a29cb8 100644
--- a/media/capture/video/mac/video_capture_device_mac.mm
+++ b/media/capture/video/mac/video_capture_device_mac.mm
@@ -13,7 +13,7 @@
#include <limits>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/mac/foundation_util.h"
diff --git a/media/capture/video/video_capture_device.cc b/media/capture/video/video_capture_device.cc
index b26304b..4910027 100644
--- a/media/capture/video/video_capture_device.cc
+++ b/media/capture/video/video_capture_device.cc
@@ -4,9 +4,9 @@
#include "media/capture/video/video_capture_device.h"
-#include "base/callback.h"
#include "base/command_line.h"
#include "base/containers/contains.h"
+#include "base/functional/callback.h"
#include "base/i18n/timezone.h"
#include "base/strings/string_util.h"
#include "base/token.h"
diff --git a/media/capture/video/video_capture_device.h b/media/capture/video/video_capture_device.h
index f0ed8e81..94f6e8e 100644
--- a/media/capture/video/video_capture_device.h
+++ b/media/capture/video/video_capture_device.h
@@ -18,8 +18,8 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/files/file.h"
+#include "base/functional/callback.h"
#include "base/memory/unsafe_shared_memory_region.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
diff --git a/media/capture/video/video_capture_device_client.cc b/media/capture/video/video_capture_device_client.cc
index 6f52d1f..284a61a 100644
--- a/media/capture/video/video_capture_device_client.cc
+++ b/media/capture/video/video_capture_device_client.cc
@@ -7,9 +7,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/ranges/algorithm.h"
diff --git a/media/capture/video/video_capture_device_client_unittest.cc b/media/capture/video/video_capture_device_client_unittest.cc
index 8cca1ac5..b4c217b 100644
--- a/media/capture/video/video_capture_device_client_unittest.cc
+++ b/media/capture/video/video_capture_device_client_unittest.cc
@@ -8,8 +8,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
diff --git a/media/capture/video/video_capture_device_unittest.cc b/media/capture/video/video_capture_device_unittest.cc
index fbf191e..30a6f26 100644
--- a/media/capture/video/video_capture_device_unittest.cc
+++ b/media/capture/video/video_capture_device_unittest.cc
@@ -10,9 +10,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/capture/video/video_capture_feedback.h b/media/capture/video/video_capture_feedback.h
index 511bdb1..ac534e11 100644
--- a/media/capture/video/video_capture_feedback.h
+++ b/media/capture/video/video_capture_feedback.h
@@ -8,7 +8,7 @@
#include <limits>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/capture/capture_export.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "ui/gfx/geometry/size.h"
diff --git a/media/capture/video/video_capture_system_impl.cc b/media/capture/video/video_capture_system_impl.cc
index 5ceae503..d6e1383 100644
--- a/media/capture/video/video_capture_system_impl.cc
+++ b/media/capture/video/video_capture_system_impl.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/ranges/algorithm.h"
#include "base/trace_event/trace_event.h"
#include "build/build_config.h"
diff --git a/media/capture/video/video_frame_receiver.h b/media/capture/video/video_frame_receiver.h
index 993bc9b..79025ae 100644
--- a/media/capture/video/video_frame_receiver.h
+++ b/media/capture/video/video_frame_receiver.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_CAPTURE_VIDEO_VIDEO_FRAME_RECEIVER_H_
#define MEDIA_CAPTURE_VIDEO_VIDEO_FRAME_RECEIVER_H_
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "media/capture/capture_export.h"
#include "media/capture/mojom/video_capture_buffer.mojom.h"
#include "media/capture/mojom/video_capture_types.mojom.h"
diff --git a/media/capture/video/video_frame_receiver_on_task_runner.cc b/media/capture/video/video_frame_receiver_on_task_runner.cc
index 8f0fe8f..adf0879 100644
--- a/media/capture/video/video_frame_receiver_on_task_runner.cc
+++ b/media/capture/video/video_frame_receiver_on_task_runner.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/single_thread_task_runner.h"
namespace media {
diff --git a/media/capture/video/win/video_capture_device_factory_win.cc b/media/capture/video/win/video_capture_device_factory_win.cc
index b881e2f0..d2a7e74 100644
--- a/media/capture/video/win/video_capture_device_factory_win.cc
+++ b/media/capture/video/win/video_capture_device_factory_win.cc
@@ -19,10 +19,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/containers/contains.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/metrics/histogram_macros.h"
#include "base/no_destructor.h"
#include "base/ranges/algorithm.h"
diff --git a/media/capture/video/win/video_capture_device_factory_win_unittest.cc b/media/capture/video/win/video_capture_device_factory_win_unittest.cc
index c4d6a833..766b11fe 100644
--- a/media/capture/video/win/video_capture_device_factory_win_unittest.cc
+++ b/media/capture/video/win/video_capture_device_factory_win_unittest.cc
@@ -19,7 +19,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/scoped_refptr.h"
#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
diff --git a/media/capture/video/win/video_capture_device_mf_win.cc b/media/capture/video/win/video_capture_device_mf_win.cc
index c35686dc..3c4f7015 100644
--- a/media/capture/video/win/video_capture_device_mf_win.cc
+++ b/media/capture/video/win/video_capture_device_mf_win.cc
@@ -16,7 +16,7 @@
#include <thread>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/capture/video/win/video_capture_device_mf_win.h b/media/capture/video/win/video_capture_device_mf_win.h
index 7b04de6f..f3d70075 100644
--- a/media/capture/video/win/video_capture_device_mf_win.h
+++ b/media/capture/video/win/video_capture_device_mf_win.h
@@ -18,8 +18,8 @@
#include <vector>
-#include "base/callback_forward.h"
#include "base/containers/queue.h"
+#include "base/functional/callback_forward.h"
#include "base/sequence_checker.h"
#include "base/synchronization/waitable_event.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/capture/video/win/video_capture_device_mf_win_unittest.cc b/media/capture/video/win/video_capture_device_mf_win_unittest.cc
index 9e0c3e6c..c114098 100644
--- a/media/capture/video/win/video_capture_device_mf_win_unittest.cc
+++ b/media/capture/video/win/video_capture_device_mf_win_unittest.cc
@@ -15,8 +15,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/ranges/algorithm.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/thread_pool.h"
diff --git a/media/cast/cast_callbacks.h b/media/cast/cast_callbacks.h
index 0fa4637..d36b3ff 100644
--- a/media/cast/cast_callbacks.h
+++ b/media/cast/cast_callbacks.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_CAST_CAST_CALLBACKS_H_
#define MEDIA_CAST_CAST_CALLBACKS_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "media/cast/constants.h"
namespace media {
diff --git a/media/cast/cast_config.h b/media/cast/cast_config.h
index 13b4533c9..38f35258 100644
--- a/media/cast/cast_config.h
+++ b/media/cast/cast_config.h
@@ -10,7 +10,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/unsafe_shared_memory_region.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/cast/cast_environment.cc b/media/cast/cast_environment.cc
index cb9b04e..189b439 100644
--- a/media/cast/cast_environment.cc
+++ b/media/cast/cast_environment.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/notreached.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/cast/cast_sender.h b/media/cast/cast_sender.h
index cb68645..8fe46874 100644
--- a/media/cast/cast_sender.h
+++ b/media/cast/cast_sender.h
@@ -12,7 +12,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "base/time/tick_clock.h"
#include "base/time/time.h"
diff --git a/media/cast/cast_sender_impl.cc b/media/cast/cast_sender_impl.cc
index f8a9c4b..3d2d5297 100644
--- a/media/cast/cast_sender_impl.cc
+++ b/media/cast/cast_sender_impl.cc
@@ -6,9 +6,9 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "media/base/video_frame.h"
#include "media/cast/common/video_frame_factory.h"
diff --git a/media/cast/encoding/audio_encoder.cc b/media/cast/encoding/audio_encoder.cc
index 280f59a0..e724ae6f 100644
--- a/media/cast/encoding/audio_encoder.cc
+++ b/media/cast/encoding/audio_encoder.cc
@@ -11,8 +11,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/cast/encoding/audio_encoder_unittest.cc b/media/cast/encoding/audio_encoder_unittest.cc
index 5ef7e35..2bd5f832 100644
--- a/media/cast/encoding/audio_encoder_unittest.cc
+++ b/media/cast/encoding/audio_encoder_unittest.cc
@@ -11,8 +11,8 @@
#include <sstream>
#include <string>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/time/time.h"
diff --git a/media/cast/encoding/external_video_encoder.cc b/media/cast/encoding/external_video_encoder.cc
index 89dd54a..fd866f99 100644
--- a/media/cast/encoding/external_video_encoder.cc
+++ b/media/cast/encoding/external_video_encoder.cc
@@ -10,9 +10,9 @@
#include <sstream>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/read_only_shared_memory_region.h"
#include "base/memory/shared_memory_mapping.h"
diff --git a/media/cast/encoding/h264_vt_encoder.cc b/media/cast/encoding/h264_vt_encoder.cc
index 2faffd8..f71a0c5 100644
--- a/media/cast/encoding/h264_vt_encoder.cc
+++ b/media/cast/encoding/h264_vt_encoder.cc
@@ -11,8 +11,8 @@
#include <vector>
#include "base/big_endian.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/media/cast/encoding/h264_vt_encoder_unittest.cc b/media/cast/encoding/h264_vt_encoder_unittest.cc
index 8e08af0..cd19b22 100644
--- a/media/cast/encoding/h264_vt_encoder_unittest.cc
+++ b/media/cast/encoding/h264_vt_encoder_unittest.cc
@@ -4,9 +4,9 @@
#include <stdint.h>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/queue.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/power_monitor/power_monitor.h"
diff --git a/media/cast/encoding/size_adaptable_video_encoder_base.cc b/media/cast/encoding/size_adaptable_video_encoder_base.cc
index 0f05aef..aa748bd 100644
--- a/media/cast/encoding/size_adaptable_video_encoder_base.cc
+++ b/media/cast/encoding/size_adaptable_video_encoder_base.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "media/base/video_frame.h"
diff --git a/media/cast/encoding/video_encoder.h b/media/cast/encoding/video_encoder.h
index dfcb4d4..865d21b 100644
--- a/media/cast/encoding/video_encoder.h
+++ b/media/cast/encoding/video_encoder.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/time/time.h"
#include "media/base/video_frame.h"
diff --git a/media/cast/encoding/video_encoder_impl.cc b/media/cast/encoding/video_encoder_impl.cc
index f3662e3..ccb7c43 100644
--- a/media/cast/encoding/video_encoder_impl.cc
+++ b/media/cast/encoding/video_encoder_impl.cc
@@ -7,10 +7,10 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/check.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "media/base/video_frame.h"
#if BUILDFLAG(ENABLE_LIBAOM)
#include "media/cast/encoding/av1_encoder.h"
diff --git a/media/cast/encoding/video_encoder_unittest.cc b/media/cast/encoding/video_encoder_unittest.cc
index ffc61eb..17bc331fb 100644
--- a/media/cast/encoding/video_encoder_unittest.cc
+++ b/media/cast/encoding/video_encoder_unittest.cc
@@ -10,8 +10,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
diff --git a/media/cast/logging/log_event_dispatcher.cc b/media/cast/logging/log_event_dispatcher.cc
index 418b55f7..2d05a16c 100644
--- a/media/cast/logging/log_event_dispatcher.cc
+++ b/media/cast/logging/log_event_dispatcher.cc
@@ -6,9 +6,9 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/ranges/algorithm.h"
#include "base/synchronization/waitable_event.h"
diff --git a/media/cast/net/cast_transport.h b/media/cast/net/cast_transport.h
index 8a912d6f..d34ff03 100644
--- a/media/cast/net/cast_transport.h
+++ b/media/cast/net/cast_transport.h
@@ -22,7 +22,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/tick_clock.h"
#include "base/values.h"
diff --git a/media/cast/net/cast_transport_config.h b/media/cast/net/cast_transport_config.h
index 99860922..fc70e0c 100644
--- a/media/cast/net/cast_transport_config.h
+++ b/media/cast/net/cast_transport_config.h
@@ -11,7 +11,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "media/cast/cast_config.h"
#include "media/cast/common/rtp_time.h"
diff --git a/media/cast/net/cast_transport_impl.cc b/media/cast/net/cast_transport_impl.cc
index 70136aad..d7c26b25 100644
--- a/media/cast/net/cast_transport_impl.cc
+++ b/media/cast/net/cast_transport_impl.cc
@@ -11,8 +11,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/task/single_thread_task_runner.h"
#include "build/build_config.h"
diff --git a/media/cast/net/cast_transport_impl.h b/media/cast/net/cast_transport_impl.h
index 1fd4a0b..f263511d 100644
--- a/media/cast/net/cast_transport_impl.h
+++ b/media/cast/net/cast_transport_impl.h
@@ -30,7 +30,7 @@
#include <set>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
diff --git a/media/cast/net/cast_transport_impl_unittest.cc b/media/cast/net/cast_transport_impl_unittest.cc
index 6e9df49..de556b2 100644
--- a/media/cast/net/cast_transport_impl_unittest.cc
+++ b/media/cast/net/cast_transport_impl_unittest.cc
@@ -10,9 +10,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/test/simple_test_tick_clock.h"
diff --git a/media/cast/net/pacing/paced_sender.cc b/media/cast/net/pacing/paced_sender.cc
index 103b9bd..6459bcdc 100644
--- a/media/cast/net/pacing/paced_sender.cc
+++ b/media/cast/net/pacing/paced_sender.cc
@@ -5,8 +5,8 @@
#include "media/cast/net/pacing/paced_sender.h"
#include "base/big_endian.h"
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/cast/net/rtcp/rtcp_unittest.cc b/media/cast/net/rtcp/rtcp_unittest.cc
index fe8d09b..e3d4d1ef 100644
--- a/media/cast/net/rtcp/rtcp_unittest.cc
+++ b/media/cast/net/rtcp/rtcp_unittest.cc
@@ -7,7 +7,7 @@
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/ranges/algorithm.h"
#include "base/test/simple_test_tick_clock.h"
diff --git a/media/cast/net/udp_packet_pipe.cc b/media/cast/net/udp_packet_pipe.cc
index 7cf6bd5..8211da4 100644
--- a/media/cast/net/udp_packet_pipe.cc
+++ b/media/cast/net/udp_packet_pipe.cc
@@ -6,8 +6,8 @@
#include <cstring>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/media/cast/net/udp_packet_pipe_unittest.cc b/media/cast/net/udp_packet_pipe_unittest.cc
index fd8e2f47..14e4e17 100644
--- a/media/cast/net/udp_packet_pipe_unittest.cc
+++ b/media/cast/net/udp_packet_pipe_unittest.cc
@@ -8,9 +8,9 @@
#include <memory>
#include <string>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/test/mock_callback.h"
#include "base/test/task_environment.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/cast/net/udp_transport_impl.cc b/media/cast/net/udp_transport_impl.cc
index c400a94..63f4fbc 100644
--- a/media/cast/net/udp_transport_impl.cc
+++ b/media/cast/net/udp_transport_impl.cc
@@ -9,8 +9,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/cast/net/udp_transport_unittest.cc b/media/cast/net/udp_transport_unittest.cc
index a0b51e7..54e83ed1 100644
--- a/media/cast/net/udp_transport_unittest.cc
+++ b/media/cast/net/udp_transport_unittest.cc
@@ -8,8 +8,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
#include "base/test/mock_callback.h"
diff --git a/media/cast/sender/audio_sender.cc b/media/cast/sender/audio_sender.cc
index e04b4b5..ca650dd62 100644
--- a/media/cast/sender/audio_sender.cc
+++ b/media/cast/sender/audio_sender.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/notreached.h"
#include "base/trace_event/trace_event.h"
#include "media/base/media_switches.h"
diff --git a/media/cast/sender/audio_sender.h b/media/cast/sender/audio_sender.h
index 5f3d61b..d6a300b 100644
--- a/media/cast/sender/audio_sender.h
+++ b/media/cast/sender/audio_sender.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time/tick_clock.h"
diff --git a/media/cast/sender/audio_sender_unittest.cc b/media/cast/sender/audio_sender_unittest.cc
index 551c0b1a..bb08d45 100644
--- a/media/cast/sender/audio_sender_unittest.cc
+++ b/media/cast/sender/audio_sender_unittest.cc
@@ -9,8 +9,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/cast/sender/congestion_control_unittest.cc b/media/cast/sender/congestion_control_unittest.cc
index 7840fc56..661e06c6 100644
--- a/media/cast/sender/congestion_control_unittest.cc
+++ b/media/cast/sender/congestion_control_unittest.cc
@@ -6,7 +6,7 @@
#include <stdint.h>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/test/simple_test_tick_clock.h"
#include "media/base/fake_single_thread_task_runner.h"
diff --git a/media/cast/sender/frame_sender_impl.cc b/media/cast/sender/frame_sender_impl.cc
index b6b9ac9..8c4a537a 100644
--- a/media/cast/sender/frame_sender_impl.cc
+++ b/media/cast/sender/frame_sender_impl.cc
@@ -10,8 +10,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "base/trace_event/trace_event.h"
diff --git a/media/cast/sender/openscreen_frame_sender.cc b/media/cast/sender/openscreen_frame_sender.cc
index 8922a4b1..06115e43 100644
--- a/media/cast/sender/openscreen_frame_sender.cc
+++ b/media/cast/sender/openscreen_frame_sender.cc
@@ -10,9 +10,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/cxx17_backports.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "base/trace_event/trace_event.h"
diff --git a/media/cast/sender/performance_metrics_overlay.cc b/media/cast/sender/performance_metrics_overlay.cc
index 097ebce..c36eb65 100644
--- a/media/cast/sender/performance_metrics_overlay.cc
+++ b/media/cast/sender/performance_metrics_overlay.cc
@@ -10,7 +10,7 @@
#include <algorithm>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/stringprintf.h"
diff --git a/media/cast/sender/video_sender.cc b/media/cast/sender/video_sender.cc
index d634127..4fe138e 100644
--- a/media/cast/sender/video_sender.cc
+++ b/media/cast/sender/video_sender.cc
@@ -10,7 +10,7 @@
#include <cstring>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/trace_event/trace_event.h"
#include "media/base/media_switches.h"
diff --git a/media/cast/sender/video_sender.h b/media/cast/sender/video_sender.h
index e029281..4c85f28 100644
--- a/media/cast/sender/video_sender.h
+++ b/media/cast/sender/video_sender.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time/tick_clock.h"
diff --git a/media/cast/sender/video_sender_unittest.cc b/media/cast/sender/video_sender_unittest.cc
index 2c3c845..a4a9a5f9 100644
--- a/media/cast/sender/video_sender_unittest.cc
+++ b/media/cast/sender/video_sender_unittest.cc
@@ -10,9 +10,9 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/cast/test/cast_benchmarks.cc b/media/cast/test/cast_benchmarks.cc
index 3d544326..92b0b3d 100644
--- a/media/cast/test/cast_benchmarks.cc
+++ b/media/cast/test/cast_benchmarks.cc
@@ -31,10 +31,10 @@
#include <vector>
#include "base/at_exit.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/debug/profiler.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc
index 94e80c9..2d458371 100644
--- a/media/cast/test/end2end_unittest.cc
+++ b/media/cast/test/end2end_unittest.cc
@@ -13,8 +13,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/cast/test/fake_media_source.cc b/media/cast/test/fake_media_source.cc
index fd1eaf5..94c3f6d 100644
--- a/media/cast/test/fake_media_source.cc
+++ b/media/cast/test/fake_media_source.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/files/scoped_file.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/rand_util.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/cast/test/fake_video_encode_accelerator_factory.cc b/media/cast/test/fake_video_encode_accelerator_factory.cc
index fcbb40c..19019c13 100644
--- a/media/cast/test/fake_video_encode_accelerator_factory.cc
+++ b/media/cast/test/fake_video_encode_accelerator_factory.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/single_thread_task_runner.h"
namespace media {
diff --git a/media/cast/test/fake_video_encode_accelerator_factory.h b/media/cast/test/fake_video_encode_accelerator_factory.h
index 00ad42a..e506100 100644
--- a/media/cast/test/fake_video_encode_accelerator_factory.h
+++ b/media/cast/test/fake_video_encode_accelerator_factory.h
@@ -9,7 +9,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/unsafe_shared_memory_region.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/cast/test/receiver/audio_decoder.cc b/media/cast/test/receiver/audio_decoder.cc
index 2b951a6..39a6d3f 100644
--- a/media/cast/test/receiver/audio_decoder.cc
+++ b/media/cast/test/receiver/audio_decoder.cc
@@ -8,8 +8,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/media/cast/test/receiver/audio_decoder.h b/media/cast/test/receiver/audio_decoder.h
index 3d5d0100..556562d 100644
--- a/media/cast/test/receiver/audio_decoder.h
+++ b/media/cast/test/receiver/audio_decoder.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_CAST_TEST_RECEIVER_AUDIO_DECODER_H_
#define MEDIA_CAST_TEST_RECEIVER_AUDIO_DECODER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "media/base/audio_bus.h"
#include "media/cast/cast_config.h"
diff --git a/media/cast/test/receiver/audio_decoder_unittest.cc b/media/cast/test/receiver/audio_decoder_unittest.cc
index 122a386..f0831ce 100644
--- a/media/cast/test/receiver/audio_decoder_unittest.cc
+++ b/media/cast/test/receiver/audio_decoder_unittest.cc
@@ -9,8 +9,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/synchronization/condition_variable.h"
#include "base/synchronization/lock.h"
#include "base/sys_byteorder.h"
diff --git a/media/cast/test/receiver/cast_receiver.h b/media/cast/test/receiver/cast_receiver.h
index cf4229f0..3e25436 100644
--- a/media/cast/test/receiver/cast_receiver.h
+++ b/media/cast/test/receiver/cast_receiver.h
@@ -10,7 +10,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/time/time.h"
#include "media/base/audio_bus.h"
diff --git a/media/cast/test/receiver/cast_receiver_impl.cc b/media/cast/test/receiver/cast_receiver_impl.cc
index 58078a5..e80c743 100644
--- a/media/cast/test/receiver/cast_receiver_impl.cc
+++ b/media/cast/test/receiver/cast_receiver_impl.cc
@@ -8,9 +8,9 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/time/time.h"
diff --git a/media/cast/test/receiver/frame_receiver.cc b/media/cast/test/receiver/frame_receiver.cc
index febaaca8..81bc6cf 100644
--- a/media/cast/test/receiver/frame_receiver.cc
+++ b/media/cast/test/receiver/frame_receiver.cc
@@ -9,7 +9,7 @@
#include <utility>
#include "base/big_endian.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "media/cast/cast_config.h"
diff --git a/media/cast/test/receiver/frame_receiver_unittest.cc b/media/cast/test/receiver/frame_receiver_unittest.cc
index 024a070..0c278fa9 100644
--- a/media/cast/test/receiver/frame_receiver_unittest.cc
+++ b/media/cast/test/receiver/frame_receiver_unittest.cc
@@ -10,8 +10,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted.h"
#include "base/test/simple_test_tick_clock.h"
#include "base/time/time.h"
diff --git a/media/cast/test/receiver/video_decoder.cc b/media/cast/test/receiver/video_decoder.cc
index 6d3b05c..3ac8cf3 100644
--- a/media/cast/test/receiver/video_decoder.cc
+++ b/media/cast/test/receiver/video_decoder.cc
@@ -7,8 +7,8 @@
#include <stdint.h>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/json/json_reader.h"
#include "base/location.h"
#include "base/logging.h"
diff --git a/media/cast/test/receiver/video_decoder.h b/media/cast/test/receiver/video_decoder.h
index 79a2073..499310e 100644
--- a/media/cast/test/receiver/video_decoder.h
+++ b/media/cast/test/receiver/video_decoder.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "media/base/video_frame.h"
#include "media/cast/cast_config.h"
diff --git a/media/cast/test/receiver/video_decoder_unittest.cc b/media/cast/test/receiver/video_decoder_unittest.cc
index 2502a69..0ffe737 100644
--- a/media/cast/test/receiver/video_decoder_unittest.cc
+++ b/media/cast/test/receiver/video_decoder_unittest.cc
@@ -9,8 +9,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/synchronization/condition_variable.h"
#include "base/synchronization/lock.h"
#include "base/time/time.h"
diff --git a/media/cast/test/sender.cc b/media/cast/test/sender.cc
index 81b49841..24c4fa97 100644
--- a/media/cast/test/sender.cc
+++ b/media/cast/test/sender.cc
@@ -12,10 +12,10 @@
#include "base/at_exit.h"
#include "base/base_paths.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/json/json_writer.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/cast/test/simulator.cc b/media/cast/test/simulator.cc
index 0925d31..36e8dbc 100644
--- a/media/cast/test/simulator.cc
+++ b/media/cast/test/simulator.cc
@@ -42,8 +42,6 @@
#include "base/at_exit.h"
#include "base/base_paths.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/containers/queue.h"
#include "base/containers/span.h"
@@ -51,6 +49,8 @@
#include "base/files/file_util.h"
#include "base/files/memory_mapped_file.h"
#include "base/files/scoped_file.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/json/json_writer.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/media/cast/test/skewed_single_thread_task_runner.h b/media/cast/test/skewed_single_thread_task_runner.h
index add2c568..961531a 100644
--- a/media/cast/test/skewed_single_thread_task_runner.h
+++ b/media/cast/test/skewed_single_thread_task_runner.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_CAST_TEST_SKEWED_SINGLE_THREAD_TASK_RUNNER_H_
#define MEDIA_CAST_TEST_SKEWED_SINGLE_THREAD_TASK_RUNNER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/simple_test_tick_clock.h"
#include "base/test/test_pending_task.h"
diff --git a/media/cast/test/utility/default_config.cc b/media/cast/test/utility/default_config.cc
index ffb03ae1..995396e 100644
--- a/media/cast/test/utility/default_config.cc
+++ b/media/cast/test/utility/default_config.cc
@@ -6,7 +6,7 @@
#include <stddef.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "media/cast/cast_config.h"
#include "media/cast/constants.h"
#include "media/cast/net/cast_transport_config.h"
diff --git a/media/cast/test/utility/in_process_receiver.cc b/media/cast/test/utility/in_process_receiver.cc
index 469fa8f..981ad30b 100644
--- a/media/cast/test/utility/in_process_receiver.cc
+++ b/media/cast/test/utility/in_process_receiver.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/synchronization/waitable_event.h"
diff --git a/media/cast/test/utility/tap_proxy.cc b/media/cast/test/utility/tap_proxy.cc
index aad943d..7c61a75 100644
--- a/media/cast/test/utility/tap_proxy.cc
+++ b/media/cast/test/utility/tap_proxy.cc
@@ -23,10 +23,10 @@
#include <utility>
#include "base/at_exit.h"
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/containers/circular_deque.h"
#include "base/files/file_descriptor_watcher_posix.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/rand_util.h"
#include "base/run_loop.h"
diff --git a/media/cast/test/utility/udp_proxy.cc b/media/cast/test/utility/udp_proxy.cc
index 416a582..343931b 100644
--- a/media/cast/test/utility/udp_proxy.cc
+++ b/media/cast/test/utility/udp_proxy.cc
@@ -11,8 +11,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/message_loop/message_pump_type.h"
diff --git a/media/cast/test/utility/udp_proxy_main.cc b/media/cast/test/utility/udp_proxy_main.cc
index fe36b0f..36d0ed62 100644
--- a/media/cast/test/utility/udp_proxy_main.cc
+++ b/media/cast/test/utility/udp_proxy_main.cc
@@ -9,9 +9,9 @@
#include <utility>
#include "base/at_exit.h"
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/media/cdm/aes_decryptor_unittest.cc b/media/cdm/aes_decryptor_unittest.cc
index b5db765..0dc2d8b2 100644
--- a/media/cdm/aes_decryptor_unittest.cc
+++ b/media/cdm/aes_decryptor_unittest.cc
@@ -11,8 +11,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
#include "base/debug/leak_annotations.h"
+#include "base/functional/bind.h"
#include "base/json/json_reader.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/media/cdm/cdm_adapter.cc b/media/cdm/cdm_adapter.cc
index 58f82bfa..2ac4602 100644
--- a/media/cdm/cdm_adapter.cc
+++ b/media/cdm/cdm_adapter.cc
@@ -9,8 +9,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
diff --git a/media/cdm/cdm_adapter.h b/media/cdm/cdm_adapter.h
index 0b4e3a40..cd816a3 100644
--- a/media/cdm/cdm_adapter.h
+++ b/media/cdm/cdm_adapter.h
@@ -11,8 +11,8 @@
#include <string>
#include <vector>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/scoped_native_library.h"
diff --git a/media/cdm/cdm_adapter_factory.cc b/media/cdm/cdm_adapter_factory.cc
index f9538ff..e99eba16 100644
--- a/media/cdm/cdm_adapter_factory.cc
+++ b/media/cdm/cdm_adapter_factory.cc
@@ -4,7 +4,7 @@
#include "media/cdm/cdm_adapter_factory.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/single_thread_task_runner.h"
#include "media/base/cdm_factory.h"
#include "media/cdm/cdm_adapter.h"
diff --git a/media/cdm/cdm_adapter_factory.h b/media/cdm/cdm_adapter_factory.h
index a82ee3b3..a9508c12 100644
--- a/media/cdm/cdm_adapter_factory.h
+++ b/media/cdm/cdm_adapter_factory.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "media/base/cdm_factory.h"
#include "media/base/media_export.h"
#include "media/cdm/cdm_auxiliary_helper.h"
diff --git a/media/cdm/cdm_adapter_unittest.cc b/media/cdm/cdm_adapter_unittest.cc
index c0a1718f..043483a 100644
--- a/media/cdm/cdm_adapter_unittest.cc
+++ b/media/cdm/cdm_adapter_unittest.cc
@@ -8,9 +8,9 @@
#include <memory>
-#include "base/bind.h"
#include "base/check.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/cdm/cdm_allocator.h b/media/cdm/cdm_allocator.h
index fb888d6..464c71f 100644
--- a/media/cdm/cdm_allocator.h
+++ b/media/cdm/cdm_allocator.h
@@ -10,7 +10,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/base/media_export.h"
namespace cdm {
diff --git a/media/cdm/cdm_auxiliary_helper.h b/media/cdm/cdm_auxiliary_helper.h
index 6d953f3..30628a6 100644
--- a/media/cdm/cdm_auxiliary_helper.h
+++ b/media/cdm/cdm_auxiliary_helper.h
@@ -10,7 +10,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/unguessable_token.h"
#include "build/build_config.h"
#include "media/base/media_export.h"
diff --git a/media/cdm/cdm_capability.h b/media/cdm/cdm_capability.h
index 5c4759c..67e52ca 100644
--- a/media/cdm/cdm_capability.h
+++ b/media/cdm/cdm_capability.h
@@ -7,8 +7,8 @@
#include <map>
-#include "base/callback.h"
#include "base/containers/flat_set.h"
+#include "base/functional/callback.h"
#include "media/base/audio_codecs.h"
#include "media/base/content_decryption_module.h"
#include "media/base/encryption_scheme.h"
diff --git a/media/cdm/cdm_document_service.h b/media/cdm/cdm_document_service.h
index 726e1ce..a8a85d3 100644
--- a/media/cdm/cdm_document_service.h
+++ b/media/cdm/cdm_document_service.h
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "build/build_config.h"
#include "media/base/media_export.h"
diff --git a/media/cdm/default_cdm_factory.cc b/media/cdm/default_cdm_factory.cc
index 2eab549f..ace2bf9 100644
--- a/media/cdm/default_cdm_factory.cc
+++ b/media/cdm/default_cdm_factory.cc
@@ -4,8 +4,8 @@
#include "media/cdm/default_cdm_factory.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
#include "media/base/cdm_config.h"
diff --git a/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.cc b/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.cc
index 4bb44a9..4f79142 100644
--- a/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.cc
+++ b/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "media/cdm/library_cdm/cdm_host_proxy.h"
diff --git a/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.h b/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.h
index b9e3dd2..56bab49 100644
--- a/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.h
+++ b/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.h
@@ -10,8 +10,8 @@
#include <string>
#include <vector>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "media/cdm/api/content_decryption_module.h"
diff --git a/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.cc b/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.cc
index 0eaf846..2f9b3d4 100644
--- a/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.cc
+++ b/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.cc
@@ -7,8 +7,8 @@
#include <algorithm>
#include <limits>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.h b/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.h
index b8ad857..75d653f 100644
--- a/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.h
+++ b/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.h
@@ -13,9 +13,9 @@
#include <string>
#include <vector>
-#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/containers/stack.h"
+#include "base/functional/callback.h"
#include "media/cdm/api/content_decryption_module.h"
namespace media {
diff --git a/media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.cc b/media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.cc
index c7804728..1a44c0b 100644
--- a/media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.cc
+++ b/media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.cc
@@ -7,11 +7,11 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/containers/queue.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/no_destructor.h"
diff --git a/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc b/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc
index f5f0703..bdc9878 100644
--- a/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc
+++ b/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc
@@ -10,8 +10,8 @@
#include <sstream>
#include <utility>
-#include "base/bind.h"
#include "base/files/file.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/cdm/library_cdm/clear_key_cdm/clear_key_persistent_session_cdm.cc b/media/cdm/library_cdm/clear_key_cdm/clear_key_persistent_session_cdm.cc
index 0385ac97..844b3568 100644
--- a/media/cdm/library_cdm/clear_key_cdm/clear_key_persistent_session_cdm.cc
+++ b/media/cdm/library_cdm/clear_key_cdm/clear_key_persistent_session_cdm.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "media/base/cdm_promise.h"
#include "media/cdm/json_web_key.h"
diff --git a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
index eb7765ec..7fdb81b 100644
--- a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
+++ b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
@@ -9,9 +9,9 @@
#include <algorithm>
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_timestamp_helper.h"
diff --git a/media/cdm/mock_helpers.h b/media/cdm/mock_helpers.h
index 00bf6abc..06b1a34 100644
--- a/media/cdm/mock_helpers.h
+++ b/media/cdm/mock_helpers.h
@@ -10,7 +10,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "build/build_config.h"
#include "media/cdm/cdm_allocator.h"
#include "media/cdm/cdm_auxiliary_helper.h"
diff --git a/media/cdm/output_protection.h b/media/cdm/output_protection.h
index 0d543a7c..20374db 100644
--- a/media/cdm/output_protection.h
+++ b/media/cdm/output_protection.h
@@ -7,7 +7,7 @@
#include <stdint.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/base/media_export.h"
namespace media {
diff --git a/media/cdm/simple_cdm_allocator.cc b/media/cdm/simple_cdm_allocator.cc
index 45e39b9..0391a38 100644
--- a/media/cdm/simple_cdm_allocator.cc
+++ b/media/cdm/simple_cdm_allocator.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "media/base/video_frame.h"
#include "media/cdm/cdm_helpers.h"
#include "media/cdm/simple_cdm_buffer.h"
diff --git a/media/cdm/win/media_foundation_cdm.cc b/media/cdm/win/media_foundation_cdm.cc
index ad392c27..68c0498 100644
--- a/media/cdm/win/media_foundation_cdm.cc
+++ b/media/cdm/win/media_foundation_cdm.cc
@@ -9,7 +9,7 @@
#include <stdlib.h>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
#include "base/rand_util.h"
diff --git a/media/cdm/win/media_foundation_cdm_factory.cc b/media/cdm/win/media_foundation_cdm_factory.cc
index 670ec04e..e6d03b2 100644
--- a/media/cdm/win/media_foundation_cdm_factory.cc
+++ b/media/cdm/win/media_foundation_cdm_factory.cc
@@ -8,8 +8,8 @@
#include <mferror.h>
#include <mfmediaengine.h>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/metrics/histogram_functions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/thread_pool.h"
diff --git a/media/cdm/win/media_foundation_cdm_factory.h b/media/cdm/win/media_foundation_cdm_factory.h
index 8903b420..3e72c81 100644
--- a/media/cdm/win/media_foundation_cdm_factory.h
+++ b/media/cdm/win/media_foundation_cdm_factory.h
@@ -12,8 +12,8 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/unguessable_token.h"
#include "base/win/scoped_com_initializer.h"
diff --git a/media/cdm/win/media_foundation_cdm_factory_unittest.cc b/media/cdm/win/media_foundation_cdm_factory_unittest.cc
index f48160c..9d3dbdc 100644
--- a/media/cdm/win/media_foundation_cdm_factory_unittest.cc
+++ b/media/cdm/win/media_foundation_cdm_factory_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/test/gmock_callback_support.h"
#include "base/test/mock_callback.h"
diff --git a/media/cdm/win/media_foundation_cdm_session.h b/media/cdm/win/media_foundation_cdm_session.h
index 054af661..f25daac8 100644
--- a/media/cdm/win/media_foundation_cdm_session.h
+++ b/media/cdm/win/media_foundation_cdm_session.h
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
#include "media/base/content_decryption_module.h"
diff --git a/media/cdm/win/media_foundation_cdm_session_unittest.cc b/media/cdm/win/media_foundation_cdm_session_unittest.cc
index f06f244..daddfaf 100644
--- a/media/cdm/win/media_foundation_cdm_session_unittest.cc
+++ b/media/cdm/win/media_foundation_cdm_session_unittest.cc
@@ -6,7 +6,7 @@
#include <wchar.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/test/mock_callback.h"
#include "base/test/task_environment.h"
#include "media/base/mock_filters.h"
diff --git a/media/cdm/win/media_foundation_cdm_unittest.cc b/media/cdm/win/media_foundation_cdm_unittest.cc
index c429aed..890b676 100644
--- a/media/cdm/win/media_foundation_cdm_unittest.cc
+++ b/media/cdm/win/media_foundation_cdm_unittest.cc
@@ -6,7 +6,7 @@
#include <wchar.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/mock_callback.h"
#include "base/test/task_environment.h"
diff --git a/media/device_monitors/device_monitor_mac.mm b/media/device_monitors/device_monitor_mac.mm
index 25cf3b4ed..6a9f905 100644
--- a/media/device_monitors/device_monitor_mac.mm
+++ b/media/device_monitors/device_monitor_mac.mm
@@ -8,10 +8,10 @@
#include <set>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/mac/scoped_nsobject.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/device_monitors/device_monitor_udev.cc b/media/device_monitors/device_monitor_udev.cc
index 0a3d067..8dd628a 100644
--- a/media/device_monitors/device_monitor_udev.cc
+++ b/media/device_monitors/device_monitor_udev.cc
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/sequence_checker.h"
#include "base/system/system_monitor.h"
#include "base/task/thread_pool.h"
diff --git a/media/ffmpeg/ffmpeg_common_unittest.cc b/media/ffmpeg/ffmpeg_common_unittest.cc
index 815243c..94a3936 100644
--- a/media/ffmpeg/ffmpeg_common_unittest.cc
+++ b/media/ffmpeg/ffmpeg_common_unittest.cc
@@ -9,8 +9,8 @@
#include <cstring>
-#include "base/bind.h"
#include "base/files/memory_mapped_file.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/media.h"
diff --git a/media/ffmpeg/ffmpeg_decoding_loop.cc b/media/ffmpeg/ffmpeg_decoding_loop.cc
index 63de64aeb..f32ffa9 100644
--- a/media/ffmpeg/ffmpeg_decoding_loop.cc
+++ b/media/ffmpeg/ffmpeg_decoding_loop.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "media/ffmpeg/ffmpeg_decoding_loop.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "media/ffmpeg/ffmpeg_common.h"
diff --git a/media/ffmpeg/ffmpeg_decoding_loop.h b/media/ffmpeg/ffmpeg_decoding_loop.h
index ab71f71..b277607 100644
--- a/media/ffmpeg/ffmpeg_decoding_loop.h
+++ b/media/ffmpeg/ffmpeg_decoding_loop.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "media/base/media_export.h"
#include "media/ffmpeg/ffmpeg_deleters.h"
diff --git a/media/ffmpeg/ffmpeg_regression_tests.cc b/media/ffmpeg/ffmpeg_regression_tests.cc
index ba71809..05dcb1c 100644
--- a/media/ffmpeg/ffmpeg_regression_tests.cc
+++ b/media/ffmpeg/ffmpeg_regression_tests.cc
@@ -21,7 +21,7 @@
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/time/time.h"
#include "media/test/pipeline_integration_test_base.h"
diff --git a/media/filters/android/media_codec_audio_decoder.cc b/media/filters/android/media_codec_audio_decoder.cc
index ef2ffce..c80e0bf 100644
--- a/media/filters/android/media_codec_audio_decoder.cc
+++ b/media/filters/android/media_codec_audio_decoder.cc
@@ -8,9 +8,9 @@
#include <memory>
#include "base/android/build_info.h"
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/task/single_thread_task_runner.h"
#include "media/base/android/media_codec_bridge_impl.h"
diff --git a/media/filters/android/video_frame_extractor.cc b/media/filters/android/video_frame_extractor.cc
index 292981b..0997aba 100644
--- a/media/filters/android/video_frame_extractor.cc
+++ b/media/filters/android/video_frame_extractor.cc
@@ -5,7 +5,7 @@
#include "media/filters/android/video_frame_extractor.h"
#include "base/android/build_info.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/threading/thread.h"
#include "media/base/android/media_codec_bridge_impl.h"
#include "media/base/data_source.h"
diff --git a/media/filters/android/video_frame_extractor.h b/media/filters/android/video_frame_extractor.h
index 9203a07f..890943b 100644
--- a/media/filters/android/video_frame_extractor.h
+++ b/media/filters/android/video_frame_extractor.h
@@ -8,7 +8,7 @@
#include <stdint.h>
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "media/base/media_export.h"
diff --git a/media/filters/android/video_frame_extractor_unittest.cc b/media/filters/android/video_frame_extractor_unittest.cc
index 82425e7..31dc97c 100644
--- a/media/filters/android/video_frame_extractor_unittest.cc
+++ b/media/filters/android/video_frame_extractor_unittest.cc
@@ -6,9 +6,9 @@
#include <memory>
-#include "base/bind.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "base/test/test_mock_time_task_runner.h"
diff --git a/media/filters/audio_decoder_stream_unittest.cc b/media/filters/audio_decoder_stream_unittest.cc
index 2620bb8a..2a5c1d4 100644
--- a/media/filters/audio_decoder_stream_unittest.cc
+++ b/media/filters/audio_decoder_stream_unittest.cc
@@ -5,8 +5,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/filters/audio_decoder_unittest.cc b/media/filters/audio_decoder_unittest.cc
index e7f422a3..8cfa221 100644
--- a/media/filters/audio_decoder_unittest.cc
+++ b/media/filters/audio_decoder_unittest.cc
@@ -8,10 +8,10 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/circular_deque.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/hash/md5.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc
index 200788ed..9d37f32 100644
--- a/media/filters/audio_file_reader.cc
+++ b/media/filters/audio_file_reader.cc
@@ -10,8 +10,8 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/numerics/safe_math.h"
#include "base/time/time.h"
diff --git a/media/filters/audio_renderer_algorithm.cc b/media/filters/audio_renderer_algorithm.cc
index 9fe0703..34a5cc8 100644
--- a/media/filters/audio_renderer_algorithm.cc
+++ b/media/filters/audio_renderer_algorithm.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include <cmath>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "cc/base/math_util.h"
#include "media/base/audio_bus.h"
diff --git a/media/filters/audio_renderer_algorithm_unittest.cc b/media/filters/audio_renderer_algorithm_unittest.cc
index f39cc12..a52f86be 100644
--- a/media/filters/audio_renderer_algorithm_unittest.cc
+++ b/media/filters/audio_renderer_algorithm_unittest.cc
@@ -18,8 +18,8 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "media/base/audio_buffer.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_timestamp_helper.h"
diff --git a/media/filters/audio_video_metadata_extractor.cc b/media/filters/audio_video_metadata_extractor.cc
index c2eb016..cb00249 100644
--- a/media/filters/audio_video_metadata_extractor.cc
+++ b/media/filters/audio_video_metadata_extractor.cc
@@ -4,7 +4,7 @@
#include "media/filters/audio_video_metadata_extractor.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/time/time.h"
diff --git a/media/filters/blocking_url_protocol.cc b/media/filters/blocking_url_protocol.cc
index 3df4b70..4012605 100644
--- a/media/filters/blocking_url_protocol.cc
+++ b/media/filters/blocking_url_protocol.cc
@@ -6,7 +6,7 @@
#include <stddef.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread_restrictions.h"
#include "media/base/data_source.h"
diff --git a/media/filters/blocking_url_protocol.h b/media/filters/blocking_url_protocol.h
index f8bc159..c72ecf3 100644
--- a/media/filters/blocking_url_protocol.h
+++ b/media/filters/blocking_url_protocol.h
@@ -7,7 +7,7 @@
#include <stdint.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/synchronization/lock.h"
#include "base/synchronization/waitable_event.h"
diff --git a/media/filters/blocking_url_protocol_unittest.cc b/media/filters/blocking_url_protocol_unittest.cc
index 21b20e1..7040507 100644
--- a/media/filters/blocking_url_protocol_unittest.cc
+++ b/media/filters/blocking_url_protocol_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/synchronization/waitable_event.h"
#include "media/base/test_data_util.h"
#include "media/ffmpeg/ffmpeg_common.h"
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index 3e8ea63..0805876 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -9,8 +9,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/strings/string_number_conversions.h"
#include "base/trace_event/trace_event.h"
#include "media/base/audio_decoder_config.h"
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc
index d74e2eb4..13508bb 100644
--- a/media/filters/chunk_demuxer_unittest.cc
+++ b/media/filters/chunk_demuxer_unittest.cc
@@ -12,9 +12,9 @@
#include <queue>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/filters/dav1d_video_decoder.cc b/media/filters/dav1d_video_decoder.cc
index ba69386..ad5ab1c8 100644
--- a/media/filters/dav1d_video_decoder.cc
+++ b/media/filters/dav1d_video_decoder.cc
@@ -8,10 +8,10 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/bits.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/strings/stringprintf.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/filters/dav1d_video_decoder.h b/media/filters/dav1d_video_decoder.h
index fcb444e..b2a8557 100644
--- a/media/filters/dav1d_video_decoder.h
+++ b/media/filters/dav1d_video_decoder.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_FILTERS_DAV1D_VIDEO_DECODER_H_
#define MEDIA_FILTERS_DAV1D_VIDEO_DECODER_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted_memory.h"
#include "base/sequence_checker.h"
diff --git a/media/filters/dav1d_video_decoder_unittest.cc b/media/filters/dav1d_video_decoder_unittest.cc
index 4709254..b5d1bf1c 100644
--- a/media/filters/dav1d_video_decoder_unittest.cc
+++ b/media/filters/dav1d_video_decoder_unittest.cc
@@ -7,8 +7,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/hash/md5.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
diff --git a/media/filters/decoder_selector.cc b/media/filters/decoder_selector.cc
index e83a9a3..b9d8568d 100644
--- a/media/filters/decoder_selector.cc
+++ b/media/filters/decoder_selector.cc
@@ -7,9 +7,9 @@
#include <algorithm>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
diff --git a/media/filters/decoder_selector.h b/media/filters/decoder_selector.h
index 16d3e07..38fd047 100644
--- a/media/filters/decoder_selector.h
+++ b/media/filters/decoder_selector.h
@@ -8,7 +8,7 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/media/filters/decoder_selector_unittest.cc b/media/filters/decoder_selector_unittest.cc
index ffb91ce..b6275f1 100644
--- a/media/filters/decoder_selector_unittest.cc
+++ b/media/filters/decoder_selector_unittest.cc
@@ -5,8 +5,8 @@
#include <memory>
#include <tuple>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/memory/scoped_refptr.h"
#include "base/notreached.h"
#include "base/test/gmock_callback_support.h"
diff --git a/media/filters/decoder_stream.cc b/media/filters/decoder_stream.cc
index 0e96f04..215a17c0 100644
--- a/media/filters/decoder_stream.cc
+++ b/media/filters/decoder_stream.cc
@@ -6,9 +6,9 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/filters/decoder_stream.h b/media/filters/decoder_stream.h
index ca62663..34c46d70 100644
--- a/media/filters/decoder_stream.h
+++ b/media/filters/decoder_stream.h
@@ -8,9 +8,9 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/media/filters/decrypting_audio_decoder.cc b/media/filters/decrypting_audio_decoder.cc
index cd48483..d361f58 100644
--- a/media/filters/decrypting_audio_decoder.cc
+++ b/media/filters/decrypting_audio_decoder.cc
@@ -9,8 +9,8 @@
#include <cstdlib>
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/filters/decrypting_audio_decoder.h b/media/filters/decrypting_audio_decoder.h
index 82e3fe5..74f16858 100644
--- a/media/filters/decrypting_audio_decoder.h
+++ b/media/filters/decrypting_audio_decoder.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/media/filters/decrypting_audio_decoder_unittest.cc b/media/filters/decrypting_audio_decoder_unittest.cc
index 190007e..327c257 100644
--- a/media/filters/decrypting_audio_decoder_unittest.cc
+++ b/media/filters/decrypting_audio_decoder_unittest.cc
@@ -9,8 +9,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/test/gmock_callback_support.h"
#include "base/test/gmock_move_support.h"
diff --git a/media/filters/decrypting_demuxer_stream.cc b/media/filters/decrypting_demuxer_stream.cc
index 4c58288..6edb4a8 100644
--- a/media/filters/decrypting_demuxer_stream.cc
+++ b/media/filters/decrypting_demuxer_stream.cc
@@ -4,8 +4,8 @@
#include "media/filters/decrypting_demuxer_stream.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/filters/decrypting_demuxer_stream.h b/media/filters/decrypting_demuxer_stream.h
index 3c716ecb..7f00f05 100644
--- a/media/filters/decrypting_demuxer_stream.h
+++ b/media/filters/decrypting_demuxer_stream.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_
#define MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/media/filters/decrypting_demuxer_stream_unittest.cc b/media/filters/decrypting_demuxer_stream_unittest.cc
index 6864b9f4..89e42ae 100644
--- a/media/filters/decrypting_demuxer_stream_unittest.cc
+++ b/media/filters/decrypting_demuxer_stream_unittest.cc
@@ -9,8 +9,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/test/gmock_callback_support.h"
#include "base/test/gmock_move_support.h"
diff --git a/media/filters/decrypting_media_resource.cc b/media/filters/decrypting_media_resource.cc
index 4d1621f..a20ad43 100644
--- a/media/filters/decrypting_media_resource.cc
+++ b/media/filters/decrypting_media_resource.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/task/sequenced_task_runner.h"
#include "media/base/cdm_context.h"
diff --git a/media/filters/decrypting_media_resource.h b/media/filters/decrypting_media_resource.h
index eeadcf95..be4f5f9 100644
--- a/media/filters/decrypting_media_resource.h
+++ b/media/filters/decrypting_media_resource.h
@@ -7,7 +7,7 @@
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/media/filters/decrypting_media_resource_unittest.cc b/media/filters/decrypting_media_resource_unittest.cc
index 28cffbdf..037a360 100644
--- a/media/filters/decrypting_media_resource_unittest.cc
+++ b/media/filters/decrypting_media_resource_unittest.cc
@@ -6,8 +6,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/test/gmock_callback_support.h"
#include "base/test/mock_callback.h"
#include "base/test/task_environment.h"
diff --git a/media/filters/decrypting_video_decoder.cc b/media/filters/decrypting_video_decoder.cc
index 97a56f3..1f0ba6f 100644
--- a/media/filters/decrypting_video_decoder.cc
+++ b/media/filters/decrypting_video_decoder.cc
@@ -4,8 +4,8 @@
#include "media/filters/decrypting_video_decoder.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/filters/decrypting_video_decoder.h b/media/filters/decrypting_video_decoder.h
index 7d3dff1..0ef51d9a 100644
--- a/media/filters/decrypting_video_decoder.h
+++ b/media/filters/decrypting_video_decoder.h
@@ -7,7 +7,7 @@
#include <stdint.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
diff --git a/media/filters/decrypting_video_decoder_unittest.cc b/media/filters/decrypting_video_decoder_unittest.cc
index 605439b..b54b4c1 100644
--- a/media/filters/decrypting_video_decoder_unittest.cc
+++ b/media/filters/decrypting_video_decoder_unittest.cc
@@ -9,8 +9,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/test/gmock_callback_support.h"
#include "base/test/gmock_move_support.h"
diff --git a/media/filters/demuxer_perftest.cc b/media/filters/demuxer_perftest.cc
index b7ee94d..70274b8 100644
--- a/media/filters/demuxer_perftest.cc
+++ b/media/filters/demuxer_perftest.cc
@@ -7,7 +7,7 @@
#include <memory>
#include "base/at_exit.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/filters/fake_video_decoder.h b/media/filters/fake_video_decoder.h
index 7c1def6..8687c82 100644
--- a/media/filters/fake_video_decoder.h
+++ b/media/filters/fake_video_decoder.h
@@ -9,9 +9,9 @@
#include <list>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
#include "media/base/callback_holder.h"
diff --git a/media/filters/fake_video_decoder_unittest.cc b/media/filters/fake_video_decoder_unittest.cc
index 4e9d2a7..f561d7b 100644
--- a/media/filters/fake_video_decoder_unittest.cc
+++ b/media/filters/fake_video_decoder_unittest.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "media/base/decoder_buffer.h"
diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc
index dc0b292..3391ec3 100644
--- a/media/filters/ffmpeg_audio_decoder.cc
+++ b/media/filters/ffmpeg_audio_decoder.cc
@@ -9,8 +9,8 @@
#include <functional>
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
#include "media/base/audio_buffer.h"
diff --git a/media/filters/ffmpeg_audio_decoder.h b/media/filters/ffmpeg_audio_decoder.h
index 0a0bcbf8..83b5759a 100644
--- a/media/filters/ffmpeg_audio_decoder.h
+++ b/media/filters/ffmpeg_audio_decoder.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/sequence_checker.h"
#include "media/base/audio_buffer.h"
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index 34c2fec..8438d37f 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -10,9 +10,9 @@
#include <utility>
#include "base/base64.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index 4a614a514..5ebe7e0 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -30,7 +30,7 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index 45236c2..8e46897 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -12,8 +12,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/path_service.h"
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
index 7673e9c..0945657 100644
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -10,8 +10,8 @@
#include <algorithm>
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/task/sequenced_task_runner.h"
#include "media/base/bind_to_current_loop.h"
diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
index ec7cfbb..e11cada7 100644
--- a/media/filters/ffmpeg_video_decoder.h
+++ b/media/filters/ffmpeg_video_decoder.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/sequence_checker.h"
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc
index a44a832..8b5daa3 100644
--- a/media/filters/ffmpeg_video_decoder_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -8,8 +8,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ref_counted.h"
#include "base/memory/singleton.h"
#include "base/run_loop.h"
diff --git a/media/filters/file_data_source.cc b/media/filters/file_data_source.cc
index 180989a7..86b11793 100644
--- a/media/filters/file_data_source.cc
+++ b/media/filters/file_data_source.cc
@@ -7,8 +7,8 @@
#include <algorithm>
#include <utility>
-#include "base/callback.h"
#include "base/check_op.h"
+#include "base/functional/callback.h"
namespace media {
diff --git a/media/filters/file_data_source_unittest.cc b/media/filters/file_data_source_unittest.cc
index bbb0c00..3c7155d 100644
--- a/media/filters/file_data_source_unittest.cc
+++ b/media/filters/file_data_source_unittest.cc
@@ -7,8 +7,8 @@
#include <string>
#include "base/base_paths.h"
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/path_service.h"
#include "base/strings/utf_string_conversions.h"
#include "media/base/test_helpers.h"
diff --git a/media/filters/frame_buffer_pool.cc b/media/filters/frame_buffer_pool.cc
index c3b9665..96aef0e 100644
--- a/media/filters/frame_buffer_pool.cc
+++ b/media/filters/frame_buffer_pool.cc
@@ -4,10 +4,10 @@
#include "media/filters/frame_buffer_pool.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
#include "base/containers/cxx20_erase.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/process/memory.h"
#include "base/ranges/algorithm.h"
diff --git a/media/filters/frame_buffer_pool.h b/media/filters/frame_buffer_pool.h
index 11224d4e..613d813 100644
--- a/media/filters/frame_buffer_pool.h
+++ b/media/filters/frame_buffer_pool.h
@@ -9,7 +9,7 @@
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/sequence_checker.h"
diff --git a/media/filters/frame_processor.h b/media/filters/frame_processor.h
index bc96a76..d68f9211 100644
--- a/media/filters/frame_processor.h
+++ b/media/filters/frame_processor.h
@@ -8,7 +8,7 @@
#include <map>
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/time/time.h"
#include "media/base/media_export.h"
diff --git a/media/filters/frame_processor_unittest.cc b/media/filters/frame_processor_unittest.cc
index 51a7f1e..12d306c3 100644
--- a/media/filters/frame_processor_unittest.cc
+++ b/media/filters/frame_processor_unittest.cc
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
diff --git a/media/filters/hls_data_source_provider.h b/media/filters/hls_data_source_provider.h
index a19c49bb8..98133da 100644
--- a/media/filters/hls_data_source_provider.h
+++ b/media/filters/hls_data_source_provider.h
@@ -8,7 +8,7 @@
#include <cstdint>
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/strings/string_piece_forward.h"
#include "media/base/media_export.h"
#include "media/base/status.h"
diff --git a/media/filters/mac/audio_toolbox_audio_decoder.cc b/media/filters/mac/audio_toolbox_audio_decoder.cc
index e837d96..659e303 100644
--- a/media/filters/mac/audio_toolbox_audio_decoder.cc
+++ b/media/filters/mac/audio_toolbox_audio_decoder.cc
@@ -5,7 +5,7 @@
#include "media/filters/mac/audio_toolbox_audio_decoder.h"
#include "base/auto_reset.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/mac/mac_logging.h"
#include "base/ranges/algorithm.h"
diff --git a/media/filters/mac/audio_toolbox_audio_encoder.cc b/media/filters/mac/audio_toolbox_audio_encoder.cc
index ffd30ec7a..c187527 100644
--- a/media/filters/mac/audio_toolbox_audio_encoder.cc
+++ b/media/filters/mac/audio_toolbox_audio_encoder.cc
@@ -4,7 +4,7 @@
#include "media/filters/mac/audio_toolbox_audio_encoder.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/mac/mac_logging.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/filters/media_file_checker.cc b/media/filters/media_file_checker.cc
index 422068b..dca328bc 100644
--- a/media/filters/media_file_checker.cc
+++ b/media/filters/media_file_checker.cc
@@ -10,7 +10,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/time/time.h"
#include "media/ffmpeg/ffmpeg_common.h"
#include "media/ffmpeg/ffmpeg_decoding_loop.h"
diff --git a/media/filters/memory_data_source.cc b/media/filters/memory_data_source.cc
index 487282a..516055b6 100644
--- a/media/filters/memory_data_source.cc
+++ b/media/filters/memory_data_source.cc
@@ -6,8 +6,8 @@
#include <algorithm>
-#include "base/callback.h"
#include "base/check.h"
+#include "base/functional/callback.h"
namespace media {
diff --git a/media/filters/memory_data_source_unittest.cc b/media/filters/memory_data_source_unittest.cc
index af1908c..722f191 100644
--- a/media/filters/memory_data_source_unittest.cc
+++ b/media/filters/memory_data_source_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/rand_util.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/filters/offloading_video_decoder.cc b/media/filters/offloading_video_decoder.cc
index fd67c591..2805443 100644
--- a/media/filters/offloading_video_decoder.cc
+++ b/media/filters/offloading_video_decoder.cc
@@ -6,9 +6,9 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/synchronization/atomic_flag.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/thread_pool.h"
diff --git a/media/filters/offloading_video_decoder.h b/media/filters/offloading_video_decoder.h
index c3c1a79..9deee09 100644
--- a/media/filters/offloading_video_decoder.h
+++ b/media/filters/offloading_video_decoder.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_FILTERS_OFFLOADING_VIDEO_DECODER_H_
#define MEDIA_FILTERS_OFFLOADING_VIDEO_DECODER_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
#include "media/base/video_codecs.h"
diff --git a/media/filters/offloading_video_decoder_unittest.cc b/media/filters/offloading_video_decoder_unittest.cc
index 1ae7d50..95cbe172 100644
--- a/media/filters/offloading_video_decoder_unittest.cc
+++ b/media/filters/offloading_video_decoder_unittest.cc
@@ -4,8 +4,8 @@
#include "media/filters/offloading_video_decoder.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/test/gmock_callback_support.h"
diff --git a/media/filters/pipeline_controller.cc b/media/filters/pipeline_controller.cc
index 62f8d171..35dc4f32 100644
--- a/media/filters/pipeline_controller.cc
+++ b/media/filters/pipeline_controller.cc
@@ -4,7 +4,7 @@
#include "media/filters/pipeline_controller.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "media/base/demuxer.h"
namespace media {
diff --git a/media/filters/pipeline_controller.h b/media/filters/pipeline_controller.h
index 4eff4f7..d50290a 100644
--- a/media/filters/pipeline_controller.h
+++ b/media/filters/pipeline_controller.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_FILTERS_PIPELINE_CONTROLLER_H_
#define MEDIA_FILTERS_PIPELINE_CONTROLLER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
diff --git a/media/filters/pipeline_controller_unittest.cc b/media/filters/pipeline_controller_unittest.cc
index 823adbadb0..a590c62e 100644
--- a/media/filters/pipeline_controller_unittest.cc
+++ b/media/filters/pipeline_controller_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/notreached.h"
diff --git a/media/filters/source_buffer_parse_warnings.h b/media/filters/source_buffer_parse_warnings.h
index f921d49..41b89eb 100644
--- a/media/filters/source_buffer_parse_warnings.h
+++ b/media/filters/source_buffer_parse_warnings.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_FILTERS_SOURCE_BUFFER_PARSE_WARNINGS_H_
#define MEDIA_FILTERS_SOURCE_BUFFER_PARSE_WARNINGS_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
namespace media {
diff --git a/media/filters/source_buffer_range.h b/media/filters/source_buffer_range.h
index 51d734a..f6d36ec 100644
--- a/media/filters/source_buffer_range.h
+++ b/media/filters/source_buffer_range.h
@@ -9,7 +9,7 @@
#include <map>
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/time/time.h"
#include "media/base/media_export.h"
diff --git a/media/filters/source_buffer_state.cc b/media/filters/source_buffer_state.cc
index 7d18724..ca3c451 100644
--- a/media/filters/source_buffer_state.cc
+++ b/media/filters/source_buffer_state.cc
@@ -6,9 +6,9 @@
#include <set>
-#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/feature_list.h"
+#include "base/functional/callback_helpers.h"
#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "build/build_config.h"
diff --git a/media/filters/source_buffer_state.h b/media/filters/source_buffer_state.h
index e7eff93..77a7303 100644
--- a/media/filters/source_buffer_state.h
+++ b/media/filters/source_buffer_state.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_FILTERS_SOURCE_BUFFER_STATE_H_
#define MEDIA_FILTERS_SOURCE_BUFFER_STATE_H_
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/memory_pressure_listener.h"
#include "base/memory/raw_ptr.h"
#include "base/time/time.h"
diff --git a/media/filters/source_buffer_state_unittest.cc b/media/filters/source_buffer_state_unittest.cc
index 78f137d..184c98a 100644
--- a/media/filters/source_buffer_state_unittest.cc
+++ b/media/filters/source_buffer_state_unittest.cc
@@ -6,7 +6,7 @@
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/filters/source_buffer_stream.cc b/media/filters/source_buffer_stream.cc
index dfa917c..d7412584 100644
--- a/media/filters/source_buffer_stream.cc
+++ b/media/filters/source_buffer_stream.cc
@@ -10,7 +10,7 @@
#include <sstream>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/trace_event/trace_event.h"
#include "media/base/demuxer_memory_limit.h"
diff --git a/media/filters/source_buffer_stream_unittest.cc b/media/filters/source_buffer_stream_unittest.cc
index 4f92d6d..81af440 100644
--- a/media/filters/source_buffer_stream_unittest.cc
+++ b/media/filters/source_buffer_stream_unittest.cc
@@ -11,8 +11,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/filters/video_decoder_stream_unittest.cc b/media/filters/video_decoder_stream_unittest.cc
index 2f27ea8..5404e13 100644
--- a/media/filters/video_decoder_stream_unittest.cc
+++ b/media/filters/video_decoder_stream_unittest.cc
@@ -6,8 +6,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/filters/video_renderer_algorithm.h b/media/filters/video_renderer_algorithm.h
index 58e1a725..aeacd6d 100644
--- a/media/filters/video_renderer_algorithm.h
+++ b/media/filters/video_renderer_algorithm.h
@@ -8,8 +8,8 @@
#include <stddef.h>
#include <stdint.h>
-#include "base/callback.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/time/time.h"
diff --git a/media/filters/video_renderer_algorithm_unittest.cc b/media/filters/video_renderer_algorithm_unittest.cc
index f4a6262..231dce2 100644
--- a/media/filters/video_renderer_algorithm_unittest.cc
+++ b/media/filters/video_renderer_algorithm_unittest.cc
@@ -10,8 +10,8 @@
#include <cmath>
#include <tuple>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ref_counted.h"
#include "base/strings/stringprintf.h"
#include "base/test/simple_test_tick_clock.h"
diff --git a/media/filters/vp9_parser.cc b/media/filters/vp9_parser.cc
index 3cbc758..0e2bb6e 100644
--- a/media/filters/vp9_parser.cc
+++ b/media/filters/vp9_parser.cc
@@ -13,10 +13,10 @@
#include <algorithm>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/circular_deque.h"
#include "base/cxx17_backports.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "base/sys_byteorder.h"
diff --git a/media/filters/vp9_parser.h b/media/filters/vp9_parser.h
index e58a4c5..e76701b6 100644
--- a/media/filters/vp9_parser.h
+++ b/media/filters/vp9_parser.h
@@ -18,8 +18,8 @@
#include <memory>
-#include "base/callback.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "media/base/decrypt_config.h"
#include "media/base/media_export.h"
diff --git a/media/filters/vpx_video_decoder.cc b/media/filters/vpx_video_decoder.cc
index 09b0846..3bff768 100644
--- a/media/filters/vpx_video_decoder.cc
+++ b/media/filters/vpx_video_decoder.cc
@@ -11,9 +11,9 @@
#include <string>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
diff --git a/media/filters/vpx_video_decoder.h b/media/filters/vpx_video_decoder.h
index eb0bc74..cdb2a917 100644
--- a/media/filters/vpx_video_decoder.h
+++ b/media/filters/vpx_video_decoder.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_FILTERS_VPX_VIDEO_DECODER_H_
#define MEDIA_FILTERS_VPX_VIDEO_DECODER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/sequence_checker.h"
#include "media/base/supported_video_decoder_config.h"
#include "media/base/video_decoder.h"
diff --git a/media/filters/vpx_video_decoder_fuzzertest.cc b/media/filters/vpx_video_decoder_fuzzertest.cc
index c86eb0c..1f7aa91e 100644
--- a/media/filters/vpx_video_decoder_fuzzertest.cc
+++ b/media/filters/vpx_video_decoder_fuzzertest.cc
@@ -8,9 +8,9 @@
#include <random>
#include "base/at_exit.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
diff --git a/media/filters/vpx_video_decoder_unittest.cc b/media/filters/vpx_video_decoder_unittest.cc
index ac28313..0df350a 100644
--- a/media/filters/vpx_video_decoder_unittest.cc
+++ b/media/filters/vpx_video_decoder_unittest.cc
@@ -6,8 +6,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "build/build_config.h"
diff --git a/media/filters/win/media_foundation_audio_decoder.cc b/media/filters/win/media_foundation_audio_decoder.cc
index aa86d56..b84418e 100644
--- a/media/filters/win/media_foundation_audio_decoder.cc
+++ b/media/filters/win/media_foundation_audio_decoder.cc
@@ -8,7 +8,7 @@
#include <wmcodecdsp.h>
#include "base/auto_reset.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/task/single_thread_task_runner.h"
#include "base/win/scoped_co_mem.h"
diff --git a/media/filters/win/media_foundation_audio_decoder.h b/media/filters/win/media_foundation_audio_decoder.h
index d684182..2ebb53c 100644
--- a/media/filters/win/media_foundation_audio_decoder.h
+++ b/media/filters/win/media_foundation_audio_decoder.h
@@ -10,7 +10,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/sequence_checker.h"
#include "media/base/audio_buffer.h"
#include "media/base/audio_decoder.h"
diff --git a/media/formats/common/stream_parser_test_base.cc b/media/formats/common/stream_parser_test_base.cc
index c174730..ab13eaa 100644
--- a/media/formats/common/stream_parser_test_base.cc
+++ b/media/formats/common/stream_parser_test_base.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "media/base/media_log.h"
#include "media/base/media_track.h"
#include "media/base/media_tracks.h"
diff --git a/media/formats/hls/media_playlist_test_builder.h b/media/formats/hls/media_playlist_test_builder.h
index c9a703ec8..862e38c 100644
--- a/media/formats/hls/media_playlist_test_builder.h
+++ b/media/formats/hls/media_playlist_test_builder.h
@@ -5,8 +5,8 @@
#ifndef MEDIA_FORMATS_HLS_MEDIA_PLAYLIST_TEST_BUILDER_H_
#define MEDIA_FORMATS_HLS_MEDIA_PLAYLIST_TEST_BUILDER_H_
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/time/time.h"
diff --git a/media/formats/hls/multivariant_playlist_test_builder.cc b/media/formats/hls/multivariant_playlist_test_builder.cc
index 84034ff..b559ff9 100644
--- a/media/formats/hls/multivariant_playlist_test_builder.cc
+++ b/media/formats/hls/multivariant_playlist_test_builder.cc
@@ -4,7 +4,7 @@
#include "media/formats/hls/multivariant_playlist_test_builder.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "media/formats/hls/audio_rendition.h"
#include "media/formats/hls/multivariant_playlist.h"
diff --git a/media/formats/hls/multivariant_playlist_test_builder.h b/media/formats/hls/multivariant_playlist_test_builder.h
index 3f22182..2df3158 100644
--- a/media/formats/hls/multivariant_playlist_test_builder.h
+++ b/media/formats/hls/multivariant_playlist_test_builder.h
@@ -8,8 +8,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/strings/string_piece.h"
#include "media/formats/hls/audio_rendition.h"
diff --git a/media/formats/hls/playlist_test_builder.h b/media/formats/hls/playlist_test_builder.h
index ecede1b..2d2279c6 100644
--- a/media/formats/hls/playlist_test_builder.h
+++ b/media/formats/hls/playlist_test_builder.h
@@ -9,8 +9,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "media/formats/hls/playlist.h"
#include "media/formats/hls/source_string.h"
diff --git a/media/formats/mp2t/es_adapter_video.h b/media/formats/mp2t/es_adapter_video.h
index 453026c93..14c0498c 100644
--- a/media/formats/mp2t/es_adapter_video.h
+++ b/media/formats/mp2t/es_adapter_video.h
@@ -10,8 +10,8 @@
#include <list>
#include <utility>
-#include "base/callback.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/time/time.h"
#include "media/base/media_export.h"
diff --git a/media/formats/mp2t/es_adapter_video_unittest.cc b/media/formats/mp2t/es_adapter_video_unittest.cc
index edb0ee8..a7d3be73 100644
--- a/media/formats/mp2t/es_adapter_video_unittest.cc
+++ b/media/formats/mp2t/es_adapter_video_unittest.cc
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/string_util.h"
#include "base/time/time.h"
#include "media/base/media_util.h"
diff --git a/media/formats/mp2t/es_parser.h b/media/formats/mp2t/es_parser.h
index 3d9e2cf..6e7b482 100644
--- a/media/formats/mp2t/es_parser.h
+++ b/media/formats/mp2t/es_parser.h
@@ -11,7 +11,7 @@
#include <memory>
#include <utility>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/time/time.h"
#include "media/base/media_export.h"
diff --git a/media/formats/mp2t/es_parser_adts.h b/media/formats/mp2t/es_parser_adts.h
index dbadd992..ae7316a 100644
--- a/media/formats/mp2t/es_parser_adts.h
+++ b/media/formats/mp2t/es_parser_adts.h
@@ -10,8 +10,8 @@
#include <memory>
#include <utility>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/decrypt_config.h"
#include "media/base/media_export.h"
diff --git a/media/formats/mp2t/es_parser_adts_fuzzer.cc b/media/formats/mp2t/es_parser_adts_fuzzer.cc
index 12e290e..369d3a2 100644
--- a/media/formats/mp2t/es_parser_adts_fuzzer.cc
+++ b/media/formats/mp2t/es_parser_adts_fuzzer.cc
@@ -5,7 +5,7 @@
#include <stddef.h>
#include <stdint.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "media/base/stream_parser_buffer.h"
#include "media/formats/mp2t/es_parser_adts.h"
diff --git a/media/formats/mp2t/es_parser_adts_unittest.cc b/media/formats/mp2t/es_parser_adts_unittest.cc
index ee7cbf1..db62bac 100644
--- a/media/formats/mp2t/es_parser_adts_unittest.cc
+++ b/media/formats/mp2t/es_parser_adts_unittest.cc
@@ -4,7 +4,7 @@
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/time/time.h"
#include "media/base/stream_parser_buffer.h"
#include "media/formats/mp2t/es_parser_adts.h"
diff --git a/media/formats/mp2t/es_parser_h264.h b/media/formats/mp2t/es_parser_h264.h
index 6769b6f..a790cc16 100644
--- a/media/formats/mp2t/es_parser_h264.h
+++ b/media/formats/mp2t/es_parser_h264.h
@@ -10,8 +10,8 @@
#include <memory>
#include <utility>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "media/base/media_export.h"
#include "media/base/ranges.h"
#include "media/base/video_decoder_config.h"
diff --git a/media/formats/mp2t/es_parser_h264_fuzzer.cc b/media/formats/mp2t/es_parser_h264_fuzzer.cc
index e90d685..078794c1f 100644
--- a/media/formats/mp2t/es_parser_h264_fuzzer.cc
+++ b/media/formats/mp2t/es_parser_h264_fuzzer.cc
@@ -5,7 +5,7 @@
#include <stddef.h>
#include <stdint.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "media/base/stream_parser_buffer.h"
#include "media/formats/mp2t/es_parser_h264.h"
diff --git a/media/formats/mp2t/es_parser_h264_unittest.cc b/media/formats/mp2t/es_parser_h264_unittest.cc
index 428939e7..c15cd7c 100644
--- a/media/formats/mp2t/es_parser_h264_unittest.cc
+++ b/media/formats/mp2t/es_parser_h264_unittest.cc
@@ -9,8 +9,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/strings/string_util.h"
#include "base/time/time.h"
#include "media/base/stream_parser_buffer.h"
diff --git a/media/formats/mp2t/es_parser_mpeg1audio.cc b/media/formats/mp2t/es_parser_mpeg1audio.cc
index eb046520..46919d8a2 100644
--- a/media/formats/mp2t/es_parser_mpeg1audio.cc
+++ b/media/formats/mp2t/es_parser_mpeg1audio.cc
@@ -6,7 +6,7 @@
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "media/base/audio_timestamp_helper.h"
diff --git a/media/formats/mp2t/es_parser_mpeg1audio.h b/media/formats/mp2t/es_parser_mpeg1audio.h
index 41723de..550eab5 100644
--- a/media/formats/mp2t/es_parser_mpeg1audio.h
+++ b/media/formats/mp2t/es_parser_mpeg1audio.h
@@ -11,8 +11,8 @@
#include <memory>
#include <utility>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/media_export.h"
diff --git a/media/formats/mp2t/es_parser_mpeg1audio_fuzzer.cc b/media/formats/mp2t/es_parser_mpeg1audio_fuzzer.cc
index 62f5436e..97d1e1d8 100644
--- a/media/formats/mp2t/es_parser_mpeg1audio_fuzzer.cc
+++ b/media/formats/mp2t/es_parser_mpeg1audio_fuzzer.cc
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "media/base/media_util.h"
#include "media/base/stream_parser_buffer.h"
#include "media/formats/mp2t/es_parser_mpeg1audio.h"
diff --git a/media/formats/mp2t/es_parser_mpeg1audio_unittest.cc b/media/formats/mp2t/es_parser_mpeg1audio_unittest.cc
index e4361176..ff81413d 100644
--- a/media/formats/mp2t/es_parser_mpeg1audio_unittest.cc
+++ b/media/formats/mp2t/es_parser_mpeg1audio_unittest.cc
@@ -4,7 +4,7 @@
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/time/time.h"
#include "media/base/media_util.h"
#include "media/base/stream_parser_buffer.h"
diff --git a/media/formats/mp2t/mp2t_stream_parser.cc b/media/formats/mp2t/mp2t_stream_parser.cc
index 0e7fc3d..5e60463a 100644
--- a/media/formats/mp2t/mp2t_stream_parser.cc
+++ b/media/formats/mp2t/mp2t_stream_parser.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/numerics/checked_math.h"
#include "media/base/byte_queue.h"
#include "media/base/media_tracks.h"
diff --git a/media/formats/mp2t/mp2t_stream_parser_unittest.cc b/media/formats/mp2t/mp2t_stream_parser_unittest.cc
index 0e095685..e15410c 100644
--- a/media/formats/mp2t/mp2t_stream_parser_unittest.cc
+++ b/media/formats/mp2t/mp2t_stream_parser_unittest.cc
@@ -11,8 +11,8 @@
#include <memory>
#include <string>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/formats/mp2t/ts_section_cat.h b/media/formats/mp2t/ts_section_cat.h
index 6bc5c74..9d2e34a4 100644
--- a/media/formats/mp2t/ts_section_cat.h
+++ b/media/formats/mp2t/ts_section_cat.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_FORMATS_MP2T_TS_SECTION_CAT_H_
#define MEDIA_FORMATS_MP2T_TS_SECTION_CAT_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/base/encryption_scheme.h"
#include "media/formats/mp2t/ts_section_psi.h"
diff --git a/media/formats/mp2t/ts_section_cets_ecm.h b/media/formats/mp2t/ts_section_cets_ecm.h
index 7ea876f..8bc59f5 100644
--- a/media/formats/mp2t/ts_section_cets_ecm.h
+++ b/media/formats/mp2t/ts_section_cets_ecm.h
@@ -9,7 +9,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/formats/mp2t/ts_section.h"
namespace media {
diff --git a/media/formats/mp2t/ts_section_cets_pssh.h b/media/formats/mp2t/ts_section_cets_pssh.h
index d358f85..94416d4 100644
--- a/media/formats/mp2t/ts_section_cets_pssh.h
+++ b/media/formats/mp2t/ts_section_cets_pssh.h
@@ -8,7 +8,7 @@
#include <stdint.h>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/base/byte_queue.h"
#include "media/formats/mp2t/ts_section.h"
diff --git a/media/formats/mp2t/ts_section_pat.h b/media/formats/mp2t/ts_section_pat.h
index f865296..52a470c 100644
--- a/media/formats/mp2t/ts_section_pat.h
+++ b/media/formats/mp2t/ts_section_pat.h
@@ -5,8 +5,8 @@
#ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PAT_H_
#define MEDIA_FORMATS_MP2T_TS_SECTION_PAT_H_
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "media/formats/mp2t/ts_section_psi.h"
namespace media {
diff --git a/media/formats/mp2t/ts_section_pmt.h b/media/formats/mp2t/ts_section_pmt.h
index 10c76c0..d5fc6a0 100644
--- a/media/formats/mp2t/ts_section_pmt.h
+++ b/media/formats/mp2t/ts_section_pmt.h
@@ -5,8 +5,8 @@
#ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_
#define MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "media/formats/mp2t/descriptors.h"
#include "media/formats/mp2t/ts_section_psi.h"
diff --git a/media/formats/mp4/mp4_stream_parser.cc b/media/formats/mp4/mp4_stream_parser.cc
index 27e2b9d..a8241e1 100644
--- a/media/formats/mp4/mp4_stream_parser.cc
+++ b/media/formats/mp4/mp4_stream_parser.cc
@@ -11,7 +11,7 @@
#include <utility>
#include <vector>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/numerics/math_constants.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/formats/mp4/mp4_stream_parser.h b/media/formats/mp4/mp4_stream_parser.h
index 4ded7cd..52ae44a6 100644
--- a/media/formats/mp4/mp4_stream_parser.h
+++ b/media/formats/mp4/mp4_stream_parser.h
@@ -11,8 +11,8 @@
#include <set>
#include <vector>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "media/base/media_export.h"
#include "media/base/stream_parser.h"
diff --git a/media/formats/mp4/mp4_stream_parser_unittest.cc b/media/formats/mp4/mp4_stream_parser_unittest.cc
index e24fc69b5..42bd4d6 100644
--- a/media/formats/mp4/mp4_stream_parser_unittest.cc
+++ b/media/formats/mp4/mp4_stream_parser_unittest.cc
@@ -12,8 +12,8 @@
#include <string>
#include <tuple>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/test/metrics/histogram_tester.h"
diff --git a/media/formats/mpeg/mpeg_audio_stream_parser_base.cc b/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
index 5e77078..d4bc4fc 100644
--- a/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
+++ b/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/numerics/checked_math.h"
#include "base/time/time.h"
#include "media/base/byte_queue.h"
diff --git a/media/formats/mpeg/mpeg_audio_stream_parser_base.h b/media/formats/mpeg/mpeg_audio_stream_parser_base.h
index be776ce..b879f81b 100644
--- a/media/formats/mpeg/mpeg_audio_stream_parser_base.h
+++ b/media/formats/mpeg/mpeg_audio_stream_parser_base.h
@@ -11,7 +11,7 @@
#include <set>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/audio_timestamp_helper.h"
diff --git a/media/formats/webcodecs/webcodecs_encoded_chunk_stream_parser.cc b/media/formats/webcodecs/webcodecs_encoded_chunk_stream_parser.cc
index 6a0c6e1..ad23416 100644
--- a/media/formats/webcodecs/webcodecs_encoded_chunk_stream_parser.cc
+++ b/media/formats/webcodecs/webcodecs_encoded_chunk_stream_parser.cc
@@ -6,7 +6,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/notreached.h"
#include "media/base/media_log.h"
diff --git a/media/formats/webm/webm_cluster_parser_unittest.cc b/media/formats/webm/webm_cluster_parser_unittest.cc
index 4add1d8..4f6c180 100644
--- a/media/formats/webm/webm_cluster_parser_unittest.cc
+++ b/media/formats/webm/webm_cluster_parser_unittest.cc
@@ -13,7 +13,7 @@
#include <string>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "media/base/audio_decoder_config.h"
diff --git a/media/formats/webm/webm_content_encodings_client.h b/media/formats/webm/webm_content_encodings_client.h
index 16124f4a..1b3ad58 100644
--- a/media/formats/webm/webm_content_encodings_client.h
+++ b/media/formats/webm/webm_content_encodings_client.h
@@ -10,8 +10,8 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "media/base/media_export.h"
#include "media/base/media_log.h"
diff --git a/media/formats/webm/webm_content_encodings_client_unittest.cc b/media/formats/webm/webm_content_encodings_client_unittest.cc
index b864bf7..a9e8a12 100644
--- a/media/formats/webm/webm_content_encodings_client_unittest.cc
+++ b/media/formats/webm/webm_content_encodings_client_unittest.cc
@@ -8,7 +8,7 @@
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/string_number_conversions.h"
#include "media/base/mock_media_log.h"
#include "media/formats/webm/webm_constants.h"
diff --git a/media/formats/webm/webm_stream_parser.cc b/media/formats/webm/webm_stream_parser.cc
index f3640d9..54d46f3 100644
--- a/media/formats/webm/webm_stream_parser.cc
+++ b/media/formats/webm/webm_stream_parser.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <string>
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/numerics/checked_math.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/formats/webm/webm_stream_parser_unittest.cc b/media/formats/webm/webm_stream_parser_unittest.cc
index 45ebfc8..8bfa66e 100644
--- a/media/formats/webm/webm_stream_parser_unittest.cc
+++ b/media/formats/webm/webm_stream_parser_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "media/base/decoder_buffer.h"
#include "media/base/demuxer.h"
#include "media/base/media_tracks.h"
diff --git a/media/fuchsia/audio/fake_audio_capturer.cc b/media/fuchsia/audio/fake_audio_capturer.cc
index fff595c..a9a7e96 100644
--- a/media/fuchsia/audio/fake_audio_capturer.cc
+++ b/media/fuchsia/audio/fake_audio_capturer.cc
@@ -6,8 +6,8 @@
#include <string.h>
-#include "base/bind.h"
#include "base/fuchsia/fuchsia_logging.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/notreached.h"
#include "base/ranges/algorithm.h"
diff --git a/media/fuchsia/cdm/fuchsia_cdm.h b/media/fuchsia/cdm/fuchsia_cdm.h
index 075c410..94dc715e 100644
--- a/media/fuchsia/cdm/fuchsia_cdm.h
+++ b/media/fuchsia/cdm/fuchsia_cdm.h
@@ -7,8 +7,8 @@
#include <fuchsia/media/drm/cpp/fidl.h>
-#include "base/callback_forward.h"
#include "base/containers/flat_map.h"
+#include "base/functional/callback_forward.h"
#include "media/base/callback_registry.h"
#include "media/base/cdm_context.h"
#include "media/base/cdm_promise_adapter.h"
diff --git a/media/fuchsia/cdm/fuchsia_cdm_factory.cc b/media/fuchsia/cdm/fuchsia_cdm_factory.cc
index 2c7da55..2d88003d 100644
--- a/media/fuchsia/cdm/fuchsia_cdm_factory.cc
+++ b/media/fuchsia/cdm/fuchsia_cdm_factory.cc
@@ -4,7 +4,7 @@
#include "media/fuchsia/cdm/fuchsia_cdm_factory.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "media/base/bind_to_current_loop.h"
#include "media/base/cdm_config.h"
#include "media/base/key_systems.h"
diff --git a/media/fuchsia/cdm/fuchsia_stream_decryptor.cc b/media/fuchsia/cdm/fuchsia_stream_decryptor.cc
index 2cbf5ba..a99105b 100644
--- a/media/fuchsia/cdm/fuchsia_stream_decryptor.cc
+++ b/media/fuchsia/cdm/fuchsia_stream_decryptor.cc
@@ -7,8 +7,8 @@
#include <fuchsia/media/cpp/fidl.h>
#include <fuchsia/media/drm/cpp/fidl.h>
-#include "base/bind.h"
#include "base/fuchsia/fuchsia_logging.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "media/base/bind_to_current_loop.h"
#include "media/base/decoder_buffer.h"
diff --git a/media/fuchsia/cdm/service/fuchsia_cdm_manager.cc b/media/fuchsia/cdm/service/fuchsia_cdm_manager.cc
index f8cbc90..3923af1a 100644
--- a/media/fuchsia/cdm/service/fuchsia_cdm_manager.cc
+++ b/media/fuchsia/cdm/service/fuchsia_cdm_manager.cc
@@ -8,8 +8,6 @@
#include <lib/fidl/cpp/binding_set.h>
#include <lib/fpromise/promise.h>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/containers/flat_set.h"
#include "base/containers/unique_ptr_adapters.h"
#include "base/files/file_enumerator.h"
@@ -17,6 +15,8 @@
#include "base/files/file_util.h"
#include "base/fuchsia/file_utils.h"
#include "base/fuchsia/fuchsia_logging.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/hash/hash.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/fuchsia/cdm/service/fuchsia_cdm_manager.h b/media/fuchsia/cdm/service/fuchsia_cdm_manager.h
index ff77398..aa4b510a 100644
--- a/media/fuchsia/cdm/service/fuchsia_cdm_manager.h
+++ b/media/fuchsia/cdm/service/fuchsia_cdm_manager.h
@@ -8,10 +8,10 @@
#include <fuchsia/media/drm/cpp/fidl.h>
#include <string>
-#include "base/callback_forward.h"
#include "base/containers/flat_map.h"
#include "base/files/file.h"
#include "base/files/file_path.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner.h"
#include "base/threading/thread_checker.h"
diff --git a/media/fuchsia/cdm/service/fuchsia_cdm_manager_unittest.cc b/media/fuchsia/cdm/service/fuchsia_cdm_manager_unittest.cc
index 7d77d764..30c124b3 100644
--- a/media/fuchsia/cdm/service/fuchsia_cdm_manager_unittest.cc
+++ b/media/fuchsia/cdm/service/fuchsia_cdm_manager_unittest.cc
@@ -11,10 +11,10 @@
#include <lib/fpromise/promise.h>
#include <map>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/run_loop.h"
#include "base/test/bind.h"
#include "base/test/task_environment.h"
diff --git a/media/fuchsia/cdm/service/provisioning_fetcher_impl.cc b/media/fuchsia/cdm/service/provisioning_fetcher_impl.cc
index 040081c..4b3c797 100644
--- a/media/fuchsia/cdm/service/provisioning_fetcher_impl.cc
+++ b/media/fuchsia/cdm/service/provisioning_fetcher_impl.cc
@@ -4,10 +4,10 @@
#include "media/fuchsia/cdm/service/provisioning_fetcher_impl.h"
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/fuchsia/fuchsia_logging.h"
#include "base/fuchsia/mem_buffer_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
namespace media {
diff --git a/media/fuchsia/cdm/service/provisioning_fetcher_impl.h b/media/fuchsia/cdm/service/provisioning_fetcher_impl.h
index 780df277..829f902 100644
--- a/media/fuchsia/cdm/service/provisioning_fetcher_impl.h
+++ b/media/fuchsia/cdm/service/provisioning_fetcher_impl.h
@@ -10,7 +10,7 @@
#include <lib/fidl/cpp/interface_handle.h>
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "media/base/provision_fetcher.h"
namespace media {
diff --git a/media/fuchsia/cdm/service/provisioning_fetcher_impl_unittest.cc b/media/fuchsia/cdm/service/provisioning_fetcher_impl_unittest.cc
index f8b3969..0bca19c 100644
--- a/media/fuchsia/cdm/service/provisioning_fetcher_impl_unittest.cc
+++ b/media/fuchsia/cdm/service/provisioning_fetcher_impl_unittest.cc
@@ -7,8 +7,8 @@
#include <fuchsia/media/drm/cpp/fidl.h>
#include <memory>
-#include "base/bind.h"
#include "base/fuchsia/mem_buffer_util.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/test/bind.h"
#include "base/test/task_environment.h"
diff --git a/media/fuchsia/common/sysmem_client.cc b/media/fuchsia/common/sysmem_client.cc
index b8160d2..c897a05 100644
--- a/media/fuchsia/common/sysmem_client.cc
+++ b/media/fuchsia/common/sysmem_client.cc
@@ -9,9 +9,9 @@
#include <algorithm>
-#include "base/bind.h"
#include "base/fuchsia/fuchsia_logging.h"
#include "base/fuchsia/process_context.h"
+#include "base/functional/bind.h"
#include "base/process/process_handle.h"
#include "media/fuchsia/common/vmo_buffer.h"
diff --git a/media/fuchsia/common/sysmem_client.h b/media/fuchsia/common/sysmem_client.h
index a88bca7..497bea8 100644
--- a/media/fuchsia/common/sysmem_client.h
+++ b/media/fuchsia/common/sysmem_client.h
@@ -10,7 +10,7 @@
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/threading/thread_checker.h"
#include "media/base/media_export.h"
diff --git a/media/gpu/android/android_video_encode_accelerator.cc b/media/gpu/android/android_video_encode_accelerator.cc
index 51054a3..ccd15573 100644
--- a/media/gpu/android/android_video_encode_accelerator.cc
+++ b/media/gpu/android/android_video_encode_accelerator.cc
@@ -8,7 +8,7 @@
#include <set>
#include <tuple>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/shared_memory_mapping.h"
diff --git a/media/gpu/android/android_video_surface_chooser.h b/media/gpu/android/android_video_surface_chooser.h
index acae9bf..0766163b 100644
--- a/media/gpu/android/android_video_surface_chooser.h
+++ b/media/gpu/android/android_video_surface_chooser.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_GPU_ANDROID_ANDROID_VIDEO_SURFACE_CHOOSER_H_
#define MEDIA_GPU_ANDROID_ANDROID_VIDEO_SURFACE_CHOOSER_H_
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/weak_ptr.h"
#include "media/base/android/android_overlay.h"
#include "media/base/video_transformation.h"
diff --git a/media/gpu/android/android_video_surface_chooser_impl.h b/media/gpu/android/android_video_surface_chooser_impl.h
index 0086bc0..8d0b062 100644
--- a/media/gpu/android/android_video_surface_chooser_impl.h
+++ b/media/gpu/android/android_video_surface_chooser_impl.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_GPU_ANDROID_ANDROID_VIDEO_SURFACE_CHOOSER_IMPL_H_
#define MEDIA_GPU_ANDROID_ANDROID_VIDEO_SURFACE_CHOOSER_IMPL_H_
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time/tick_clock.h"
diff --git a/media/gpu/android/android_video_surface_chooser_impl_unittest.cc b/media/gpu/android/android_video_surface_chooser_impl_unittest.cc
index c479aaf3..27d7a159 100644
--- a/media/gpu/android/android_video_surface_chooser_impl_unittest.cc
+++ b/media/gpu/android/android_video_surface_chooser_impl_unittest.cc
@@ -8,7 +8,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/test/simple_test_tick_clock.h"
#include "media/base/android/mock_android_overlay.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/gpu/android/codec_allocator.cc b/media/gpu/android/codec_allocator.cc
index eb4bb5fc..f27fa7b 100644
--- a/media/gpu/android/codec_allocator.cc
+++ b/media/gpu/android/codec_allocator.cc
@@ -8,7 +8,7 @@
#include <memory>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/no_destructor.h"
#include "base/ranges/algorithm.h"
diff --git a/media/gpu/android/codec_allocator.h b/media/gpu/android/codec_allocator.h
index be14c88e..9f4fdda 100644
--- a/media/gpu/android/codec_allocator.h
+++ b/media/gpu/android/codec_allocator.h
@@ -9,8 +9,8 @@
#include <memory>
-#include "base/callback.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/no_destructor.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/android/codec_allocator_unittest.cc b/media/gpu/android/codec_allocator_unittest.cc
index 4ebc81a..9737f4d 100644
--- a/media/gpu/android/codec_allocator_unittest.cc
+++ b/media/gpu/android/codec_allocator_unittest.cc
@@ -9,9 +9,9 @@
#include <memory>
#include "base/android/build_info.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/android/codec_image.cc b/media/gpu/android/codec_image.cc
index ae3a520..9517c26 100644
--- a/media/gpu/android/codec_image.cc
+++ b/media/gpu/android/codec_image.cc
@@ -9,8 +9,8 @@
#include <memory>
#include "base/android/scoped_hardware_buffer_fence_sync.h"
-#include "base/callback_helpers.h"
#include "base/debug/dump_without_crashing.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/sequenced_task_runner.h"
#include "gpu/command_buffer/service/gles2_cmd_decoder.h"
#include "gpu/command_buffer/service/texture_manager.h"
diff --git a/media/gpu/android/codec_image.h b/media/gpu/android/codec_image.h
index 79274b8..f9da311 100644
--- a/media/gpu/android/codec_image.h
+++ b/media/gpu/android/codec_image.h
@@ -10,7 +10,7 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted_delete_on_sequence.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/android/codec_image_group.cc b/media/gpu/android/codec_image_group.cc
index d1ad68187..806af42 100644
--- a/media/gpu/android/codec_image_group.cc
+++ b/media/gpu/android/codec_image_group.cc
@@ -4,7 +4,7 @@
#include "media/gpu/android/codec_image_group.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "media/gpu/android/codec_surface_bundle.h"
diff --git a/media/gpu/android/codec_image_group_unittest.cc b/media/gpu/android/codec_image_group_unittest.cc
index a08abc4..227e4561 100644
--- a/media/gpu/android/codec_image_group_unittest.cc
+++ b/media/gpu/android/codec_image_group_unittest.cc
@@ -4,8 +4,8 @@
#include "media/gpu/android/codec_image_group.h"
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "base/task/sequenced_task_runner.h"
#include "base/test/task_environment.h"
diff --git a/media/gpu/android/codec_image_unittest.cc b/media/gpu/android/codec_image_unittest.cc
index 125e2284..2b7430d0 100644
--- a/media/gpu/android/codec_image_unittest.cc
+++ b/media/gpu/android/codec_image_unittest.cc
@@ -4,8 +4,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/task/sequenced_task_runner.h"
#include "base/test/mock_callback.h"
diff --git a/media/gpu/android/codec_output_buffer_renderer.cc b/media/gpu/android/codec_output_buffer_renderer.cc
index c9030a5..6dbfb533 100644
--- a/media/gpu/android/codec_output_buffer_renderer.cc
+++ b/media/gpu/android/codec_output_buffer_renderer.cc
@@ -6,7 +6,7 @@
#include <string.h>
#include "base/android/scoped_hardware_buffer_fence_sync.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "gpu/command_buffer/service/gles2_cmd_decoder.h"
#include "gpu/command_buffer/service/texture_manager.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/media/gpu/android/codec_surface_bundle.cc b/media/gpu/android/codec_surface_bundle.cc
index 9faa381..bb44360f 100644
--- a/media/gpu/android/codec_surface_bundle.cc
+++ b/media/gpu/android/codec_surface_bundle.cc
@@ -4,7 +4,7 @@
#include "media/gpu/android/codec_surface_bundle.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "media/base/android/android_overlay.h"
diff --git a/media/gpu/android/codec_wrapper.cc b/media/gpu/android/codec_wrapper.cc
index a8567e6..aa0bbd8 100644
--- a/media/gpu/android/codec_wrapper.cc
+++ b/media/gpu/android/codec_wrapper.cc
@@ -10,8 +10,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
#include "base/debug/crash_logging.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/android/codec_wrapper_unittest.cc b/media/gpu/android/codec_wrapper_unittest.cc
index 499cbbd..1f74c611 100644
--- a/media/gpu/android/codec_wrapper_unittest.cc
+++ b/media/gpu/android/codec_wrapper_unittest.cc
@@ -4,7 +4,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/synchronization/waitable_event.h"
diff --git a/media/gpu/android/direct_shared_image_video_provider.cc b/media/gpu/android/direct_shared_image_video_provider.cc
index 4c89007..5e2a0a0 100644
--- a/media/gpu/android/direct_shared_image_video_provider.cc
+++ b/media/gpu/android/direct_shared_image_video_provider.cc
@@ -6,9 +6,9 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ref_counted.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
diff --git a/media/gpu/android/fake_codec_allocator.cc b/media/gpu/android/fake_codec_allocator.cc
index c8783b2..2260f30 100644
--- a/media/gpu/android/fake_codec_allocator.cc
+++ b/media/gpu/android/fake_codec_allocator.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner.h"
#include "media/base/android/mock_media_codec_bridge.h"
diff --git a/media/gpu/android/media_codec_video_decoder.cc b/media/gpu/android/media_codec_video_decoder.cc
index 855013e..1b8e9356 100644
--- a/media/gpu/android/media_codec_video_decoder.cc
+++ b/media/gpu/android/media_codec_video_decoder.cc
@@ -7,10 +7,10 @@
#include <memory>
#include "base/android/build_info.h"
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/weak_ptr.h"
diff --git a/media/gpu/android/media_codec_video_decoder_unittest.cc b/media/gpu/android/media_codec_video_decoder_unittest.cc
index 1cce44a9..c90ebae 100644
--- a/media/gpu/android/media_codec_video_decoder_unittest.cc
+++ b/media/gpu/android/media_codec_video_decoder_unittest.cc
@@ -5,8 +5,8 @@
#include "media/gpu/android/media_codec_video_decoder.h"
#include "base/android/jni_android.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/android/promotion_hint_aggregator.h b/media/gpu/android/promotion_hint_aggregator.h
index 5ba33c64..b07f2ff 100644
--- a/media/gpu/android/promotion_hint_aggregator.h
+++ b/media/gpu/android/promotion_hint_aggregator.h
@@ -5,8 +5,8 @@
#ifndef MEDIA_GPU_ANDROID_PROMOTION_HINT_AGGREGATOR_H_
#define MEDIA_GPU_ANDROID_PROMOTION_HINT_AGGREGATOR_H_
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "media/gpu/media_gpu_export.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/media/gpu/android/promotion_hint_aggregator_impl.cc b/media/gpu/android/promotion_hint_aggregator_impl.cc
index 8b4bbbc..bde1bb3 100644
--- a/media/gpu/android/promotion_hint_aggregator_impl.cc
+++ b/media/gpu/android/promotion_hint_aggregator_impl.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/time/default_tick_clock.h"
namespace media {
diff --git a/media/gpu/android/promotion_hint_aggregator_impl.h b/media/gpu/android/promotion_hint_aggregator_impl.h
index 4a859a4c..6a61783 100644
--- a/media/gpu/android/promotion_hint_aggregator_impl.h
+++ b/media/gpu/android/promotion_hint_aggregator_impl.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_GPU_ANDROID_PROMOTION_HINT_AGGREGATOR_IMPL_H_
#define MEDIA_GPU_ANDROID_PROMOTION_HINT_AGGREGATOR_IMPL_H_
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time/tick_clock.h"
diff --git a/media/gpu/android/promotion_hint_aggregator_impl_unittest.cc b/media/gpu/android/promotion_hint_aggregator_impl_unittest.cc
index fb9d956..f552a20 100644
--- a/media/gpu/android/promotion_hint_aggregator_impl_unittest.cc
+++ b/media/gpu/android/promotion_hint_aggregator_impl_unittest.cc
@@ -8,7 +8,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/test/simple_test_tick_clock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/gpu/android/shared_image_video_provider.h b/media/gpu/android/shared_image_video_provider.h
index ccbbd6f..091596c 100644
--- a/media/gpu/android/shared_image_video_provider.h
+++ b/media/gpu/android/shared_image_video_provider.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_GPU_ANDROID_SHARED_IMAGE_VIDEO_PROVIDER_H_
#define MEDIA_GPU_ANDROID_SHARED_IMAGE_VIDEO_PROVIDER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "gpu/command_buffer/service/mailbox_manager.h"
#include "gpu/ipc/common/vulkan_ycbcr_info.h"
#include "media/gpu/android/codec_image_group.h"
diff --git a/media/gpu/android/surface_chooser_helper_unittest.cc b/media/gpu/android/surface_chooser_helper_unittest.cc
index 7eacffd..032be14 100644
--- a/media/gpu/android/surface_chooser_helper_unittest.cc
+++ b/media/gpu/android/surface_chooser_helper_unittest.cc
@@ -8,7 +8,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/test/simple_test_tick_clock.h"
#include "media/gpu/android/mock_android_video_surface_chooser.h"
diff --git a/media/gpu/android/video_frame_factory_impl.cc b/media/gpu/android/video_frame_factory_impl.cc
index aae3389..59fb880b 100644
--- a/media/gpu/android/video_frame_factory_impl.cc
+++ b/media/gpu/android/video_frame_factory_impl.cc
@@ -7,10 +7,10 @@
#include <memory>
#include "base/android/android_image_reader_compat.h"
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/android/video_frame_factory_impl_unittest.cc b/media/gpu/android/video_frame_factory_impl_unittest.cc
index aea6dfb..d26858a 100644
--- a/media/gpu/android/video_frame_factory_impl_unittest.cc
+++ b/media/gpu/android/video_frame_factory_impl_unittest.cc
@@ -4,8 +4,8 @@
#include "media/gpu/android/video_frame_factory_impl.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/gmock_callback_support.h"
diff --git a/media/gpu/av1_decoder.cc b/media/gpu/av1_decoder.cc
index 3e3eada..98ab17a1 100644
--- a/media/gpu/av1_decoder.cc
+++ b/media/gpu/av1_decoder.cc
@@ -6,7 +6,7 @@
#include <bitset>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_functions.h"
diff --git a/media/gpu/buffer_validation.h b/media/gpu/buffer_validation.h
index 2ddc301..a3e23bc 100644
--- a/media/gpu/buffer_validation.h
+++ b/media/gpu/buffer_validation.h
@@ -5,8 +5,8 @@
#ifndef MEDIA_GPU_BUFFER_VALIDATION_H_
#define MEDIA_GPU_BUFFER_VALIDATION_H_
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "media/base/video_types.h"
namespace gfx {
diff --git a/media/gpu/buffer_validation_unittest.cc b/media/gpu/buffer_validation_unittest.cc
index eadda4e..c91ac84 100644
--- a/media/gpu/buffer_validation_unittest.cc
+++ b/media/gpu/buffer_validation_unittest.cc
@@ -6,8 +6,8 @@
#include <fcntl.h>
-#include "base/bind.h"
#include "base/files/scoped_file.h"
+#include "base/functional/bind.h"
#include "media/base/video_frame.h"
#include "media/base/video_types.h"
#include "media/video/fake_gpu_memory_buffer.h"
diff --git a/media/gpu/chromeos/decoder_buffer_transcryptor.cc b/media/gpu/chromeos/decoder_buffer_transcryptor.cc
index 238785fb..a3bd51e2 100644
--- a/media/gpu/chromeos/decoder_buffer_transcryptor.cc
+++ b/media/gpu/chromeos/decoder_buffer_transcryptor.cc
@@ -4,7 +4,7 @@
#include "media/gpu/chromeos/decoder_buffer_transcryptor.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "chromeos/components/cdm_factory_daemon/chromeos_cdm_context.h"
#include "media/base/bind_to_current_loop.h"
diff --git a/media/gpu/chromeos/decoder_buffer_transcryptor.h b/media/gpu/chromeos/decoder_buffer_transcryptor.h
index f604f63..6ead301d5 100644
--- a/media/gpu/chromeos/decoder_buffer_transcryptor.h
+++ b/media/gpu/chromeos/decoder_buffer_transcryptor.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback_forward.h"
#include "base/containers/queue.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
#include "media/base/callback_registry.h"
diff --git a/media/gpu/chromeos/generic_dmabuf_video_frame_mapper.cc b/media/gpu/chromeos/generic_dmabuf_video_frame_mapper.cc
index 1883444..76ae9fd 100644
--- a/media/gpu/chromeos/generic_dmabuf_video_frame_mapper.cc
+++ b/media/gpu/chromeos/generic_dmabuf_video_frame_mapper.cc
@@ -9,8 +9,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "media/gpu/macros.h"
diff --git a/media/gpu/chromeos/gl_image_processor_backend.cc b/media/gpu/chromeos/gl_image_processor_backend.cc
index c83e9094..45d4da7 100644
--- a/media/gpu/chromeos/gl_image_processor_backend.cc
+++ b/media/gpu/chromeos/gl_image_processor_backend.cc
@@ -4,7 +4,7 @@
#include "media/gpu/chromeos/gl_image_processor_backend.h"
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/metrics/histogram_macros.h"
#include "base/stl_util.h"
#include "base/synchronization/waitable_event.h"
diff --git a/media/gpu/chromeos/gl_image_processor_backend.h b/media/gpu/chromeos/gl_image_processor_backend.h
index d82e647..03d9a48 100644
--- a/media/gpu/chromeos/gl_image_processor_backend.h
+++ b/media/gpu/chromeos/gl_image_processor_backend.h
@@ -8,7 +8,7 @@
#include <memory>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/synchronization/waitable_event.h"
diff --git a/media/gpu/chromeos/gpu_memory_buffer_video_frame_mapper.cc b/media/gpu/chromeos/gpu_memory_buffer_video_frame_mapper.cc
index 7445e5d..e204490b 100644
--- a/media/gpu/chromeos/gpu_memory_buffer_video_frame_mapper.cc
+++ b/media/gpu/chromeos/gpu_memory_buffer_video_frame_mapper.cc
@@ -6,7 +6,7 @@
#include <sys/mman.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "media/gpu/macros.h"
#include "ui/gfx/gpu_memory_buffer.h"
diff --git a/media/gpu/chromeos/image_processor.cc b/media/gpu/chromeos/image_processor.cc
index 5fdfc425..0130ee4 100644
--- a/media/gpu/chromeos/image_processor.cc
+++ b/media/gpu/chromeos/image_processor.cc
@@ -8,7 +8,7 @@
#include <ostream>
#include <sstream>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/task_traits.h"
diff --git a/media/gpu/chromeos/image_processor.h b/media/gpu/chromeos/image_processor.h
index 58ebc68f..aac11f0 100644
--- a/media/gpu/chromeos/image_processor.h
+++ b/media/gpu/chromeos/image_processor.h
@@ -11,7 +11,7 @@
#include <utility>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
diff --git a/media/gpu/chromeos/image_processor_backend.cc b/media/gpu/chromeos/image_processor_backend.cc
index 3e8f3dac..9895f22 100644
--- a/media/gpu/chromeos/image_processor_backend.cc
+++ b/media/gpu/chromeos/image_processor_backend.cc
@@ -8,7 +8,7 @@
#include <ostream>
#include <sstream>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/stringprintf.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/task_traits.h"
diff --git a/media/gpu/chromeos/image_processor_backend.h b/media/gpu/chromeos/image_processor_backend.h
index f07f811..d79921bd 100644
--- a/media/gpu/chromeos/image_processor_backend.h
+++ b/media/gpu/chromeos/image_processor_backend.h
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/sequence_checker.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/chromeos/image_processor_factory.cc b/media/gpu/chromeos/image_processor_factory.cc
index 1b0dd67..b24fbf5 100644
--- a/media/gpu/chromeos/image_processor_factory.cc
+++ b/media/gpu/chromeos/image_processor_factory.cc
@@ -6,10 +6,10 @@
#include <stddef.h>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/containers/contains.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/task/sequenced_task_runner.h"
#include "media/base/media_switches.h"
diff --git a/media/gpu/chromeos/image_processor_factory.h b/media/gpu/chromeos/image_processor_factory.h
index 994cc51..9160c93 100644
--- a/media/gpu/chromeos/image_processor_factory.h
+++ b/media/gpu/chromeos/image_processor_factory.h
@@ -10,7 +10,7 @@
#include <memory>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/task/sequenced_task_runner.h"
#include "media/gpu/chromeos/fourcc.h"
#include "media/gpu/chromeos/image_processor.h"
diff --git a/media/gpu/chromeos/image_processor_with_pool.cc b/media/gpu/chromeos/image_processor_with_pool.cc
index d9270fd5..1f360c7 100644
--- a/media/gpu/chromeos/image_processor_with_pool.cc
+++ b/media/gpu/chromeos/image_processor_with_pool.cc
@@ -4,7 +4,7 @@
#include "media/gpu/chromeos/image_processor_with_pool.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/task/sequenced_task_runner.h"
#include "media/base/media_serializers.h"
diff --git a/media/gpu/chromeos/mailbox_video_frame_converter.cc b/media/gpu/chromeos/mailbox_video_frame_converter.cc
index 4280936c..ae33789 100644
--- a/media/gpu/chromeos/mailbox_video_frame_converter.cc
+++ b/media/gpu/chromeos/mailbox_video_frame_converter.cc
@@ -4,9 +4,9 @@
#include "media/gpu/chromeos/mailbox_video_frame_converter.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/chromeos/mailbox_video_frame_converter.h b/media/gpu/chromeos/mailbox_video_frame_converter.h
index dba44b4e..f40576c 100644
--- a/media/gpu/chromeos/mailbox_video_frame_converter.h
+++ b/media/gpu/chromeos/mailbox_video_frame_converter.h
@@ -5,9 +5,9 @@
#ifndef MEDIA_GPU_CHROMEOS_MAILBOX_VIDEO_FRAME_CONVERTER_H_
#define MEDIA_GPU_CHROMEOS_MAILBOX_VIDEO_FRAME_CONVERTER_H_
-#include "base/callback_forward.h"
#include "base/containers/queue.h"
#include "base/containers/small_map.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "gpu/command_buffer/common/mailbox.h"
diff --git a/media/gpu/chromeos/mailbox_video_frame_converter_unittest.cc b/media/gpu/chromeos/mailbox_video_frame_converter_unittest.cc
index 4bee603..375c74f 100644
--- a/media/gpu/chromeos/mailbox_video_frame_converter_unittest.cc
+++ b/media/gpu/chromeos/mailbox_video_frame_converter_unittest.cc
@@ -4,7 +4,7 @@
#include "media/gpu/chromeos/mailbox_video_frame_converter.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/task/single_thread_task_runner.h"
#include "base/task/thread_pool.h"
diff --git a/media/gpu/chromeos/platform_video_frame_pool.h b/media/gpu/chromeos/platform_video_frame_pool.h
index 05187c8..14882039 100644
--- a/media/gpu/chromeos/platform_video_frame_pool.h
+++ b/media/gpu/chromeos/platform_video_frame_pool.h
@@ -10,9 +10,9 @@
#include <map>
#include <vector>
-#include "base/bind.h"
#include "base/containers/circular_deque.h"
#include "base/files/scoped_file.h"
+#include "base/functional/bind.h"
#include "base/memory/weak_ptr.h"
#include "base/synchronization/lock.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/chromeos/platform_video_frame_pool_unittest.cc b/media/gpu/chromeos/platform_video_frame_pool_unittest.cc
index 18d75690..56ad1dc 100644
--- a/media/gpu/chromeos/platform_video_frame_pool_unittest.cc
+++ b/media/gpu/chromeos/platform_video_frame_pool_unittest.cc
@@ -9,7 +9,7 @@
#include <memory>
#include <vector>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/task_environment.h"
#include "gpu/command_buffer/common/mailbox_holder.h"
diff --git a/media/gpu/chromeos/platform_video_frame_utils.cc b/media/gpu/chromeos/platform_video_frame_utils.cc
index 4e68e75..5875174 100644
--- a/media/gpu/chromeos/platform_video_frame_utils.cc
+++ b/media/gpu/chromeos/platform_video_frame_utils.cc
@@ -9,13 +9,13 @@
#include <limits>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/fixed_flat_set.h"
#include "base/dcheck_is_on.h"
#include "base/files/file.h"
#include "base/files/file_path.h"
#include "base/files/scoped_file.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/no_destructor.h"
#include "base/posix/eintr_wrapper.h"
#include "base/strings/string_util.h"
diff --git a/media/gpu/chromeos/vd_video_decode_accelerator.cc b/media/gpu/chromeos/vd_video_decode_accelerator.cc
index 35b3eeb4..a5a9418 100644
--- a/media/gpu/chromeos/vd_video_decode_accelerator.cc
+++ b/media/gpu/chromeos/vd_video_decode_accelerator.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/unsafe_shared_memory_region.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/chromeos/vd_video_decode_accelerator.h b/media/gpu/chromeos/vd_video_decode_accelerator.h
index 5a6973a..56a149b4 100644
--- a/media/gpu/chromeos/vd_video_decode_accelerator.h
+++ b/media/gpu/chromeos/vd_video_decode_accelerator.h
@@ -8,7 +8,7 @@
#include <map>
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/media/gpu/chromeos/vda_video_frame_pool.cc b/media/gpu/chromeos/vda_video_frame_pool.cc
index facf27e..990d6606 100644
--- a/media/gpu/chromeos/vda_video_frame_pool.cc
+++ b/media/gpu/chromeos/vda_video_frame_pool.cc
@@ -4,7 +4,7 @@
#include "media/gpu/chromeos/vda_video_frame_pool.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/scoped_refptr.h"
#include "base/synchronization/waitable_event.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/chromeos/video_decoder_pipeline.cc b/media/gpu/chromeos/video_decoder_pipeline.cc
index b9db1ef9..9397cb7 100644
--- a/media/gpu/chromeos/video_decoder_pipeline.cc
+++ b/media/gpu/chromeos/video_decoder_pipeline.cc
@@ -7,9 +7,9 @@
#include <atomic>
#include <memory>
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/no_destructor.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/gpu/chromeos/video_decoder_pipeline.h b/media/gpu/chromeos/video_decoder_pipeline.h
index 65f4554f..a24abc7 100644
--- a/media/gpu/chromeos/video_decoder_pipeline.h
+++ b/media/gpu/chromeos/video_decoder_pipeline.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
#include "build/build_config.h"
diff --git a/media/gpu/chromeos/video_decoder_pipeline_unittest.cc b/media/gpu/chromeos/video_decoder_pipeline_unittest.cc
index 31fdc98..0cdc391d 100644
--- a/media/gpu/chromeos/video_decoder_pipeline_unittest.cc
+++ b/media/gpu/chromeos/video_decoder_pipeline_unittest.cc
@@ -4,9 +4,9 @@
#include "media/gpu/chromeos/video_decoder_pipeline.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/chromeos/video_frame_converter.h b/media/gpu/chromeos/video_frame_converter.h
index 5ccd2b6..fed2894 100644
--- a/media/gpu/chromeos/video_frame_converter.h
+++ b/media/gpu/chromeos/video_frame_converter.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/command_buffer_helper.h b/media/gpu/command_buffer_helper.h
index e279cdc..ddf7cf2 100644
--- a/media/gpu/command_buffer_helper.h
+++ b/media/gpu/command_buffer_helper.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_GPU_COMMAND_BUFFER_HELPER_H_
#define MEDIA_GPU_COMMAND_BUFFER_HELPER_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/ref_counted_delete_on_sequence.h"
#include "base/memory/scoped_refptr.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/gpu_video_decode_accelerator_factory.h b/media/gpu/gpu_video_decode_accelerator_factory.h
index 059778e..fadf951 100644
--- a/media/gpu/gpu_video_decode_accelerator_factory.h
+++ b/media/gpu/gpu_video_decode_accelerator_factory.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/threading/thread_checker.h"
#include "build/build_config.h"
#include "gpu/config/gpu_driver_bug_workarounds.h"
diff --git a/media/gpu/gpu_video_decode_accelerator_helpers.h b/media/gpu/gpu_video_decode_accelerator_helpers.h
index 571915a..6aea6b0 100644
--- a/media/gpu/gpu_video_decode_accelerator_helpers.h
+++ b/media/gpu/gpu_video_decode_accelerator_helpers.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_GPU_GPU_VIDEO_DECODE_ACCELERATOR_HELPERS_H_
#define MEDIA_GPU_GPU_VIDEO_DECODE_ACCELERATOR_HELPERS_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "media/base/supported_video_decoder_config.h"
#include "media/gpu/media_gpu_export.h"
diff --git a/media/gpu/gpu_video_encode_accelerator_factory.cc b/media/gpu/gpu_video_encode_accelerator_factory.cc
index e4683c3..2d74e6b 100644
--- a/media/gpu/gpu_video_encode_accelerator_factory.cc
+++ b/media/gpu/gpu_video_encode_accelerator_factory.cc
@@ -4,10 +4,10 @@
#include "media/gpu/gpu_video_encode_accelerator_factory.h"
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/containers/cxx20_erase.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/task/single_thread_task_runner.h"
#include "build/build_config.h"
diff --git a/media/gpu/h264_decoder.cc b/media/gpu/h264_decoder.cc
index bc61a5e..5c94bb0 100644
--- a/media/gpu/h264_decoder.cc
+++ b/media/gpu/h264_decoder.cc
@@ -7,9 +7,9 @@
#include <limits>
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
#include "base/numerics/safe_conversions.h"
diff --git a/media/gpu/ipc/client/gpu_video_decode_accelerator_host.cc b/media/gpu/ipc/client/gpu_video_decode_accelerator_host.cc
index bd74fce..1aaef12e 100644
--- a/media/gpu/ipc/client/gpu_video_decode_accelerator_host.cc
+++ b/media/gpu/ipc/client/gpu_video_decode_accelerator_host.cc
@@ -4,7 +4,7 @@
#include "media/gpu/ipc/client/gpu_video_decode_accelerator_host.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/ipc/service/gpu_video_decode_accelerator.cc b/media/gpu/ipc/service/gpu_video_decode_accelerator.cc
index 81b5e85f..ac6e768 100644
--- a/media/gpu/ipc/service/gpu_video_decode_accelerator.cc
+++ b/media/gpu/ipc/service/gpu_video_decode_accelerator.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/gpu/ipc/service/gpu_video_decode_accelerator.h b/media/gpu/ipc/service/gpu_video_decode_accelerator.h
index 069c990c..6e7c0c0c 100644
--- a/media/gpu/ipc/service/gpu_video_decode_accelerator.h
+++ b/media/gpu/ipc/service/gpu_video_decode_accelerator.h
@@ -11,9 +11,9 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/ipc/service/media_gpu_channel.cc b/media/gpu/ipc/service/media_gpu_channel.cc
index 60d3a0e..9dc4d70 100644
--- a/media/gpu/ipc/service/media_gpu_channel.cc
+++ b/media/gpu/ipc/service/media_gpu_channel.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/task/single_thread_task_runner.h"
#include "base/unguessable_token.h"
diff --git a/media/gpu/ipc/service/picture_buffer_manager.cc b/media/gpu/ipc/service/picture_buffer_manager.cc
index ef1af80..5e96015 100644
--- a/media/gpu/ipc/service/picture_buffer_manager.cc
+++ b/media/gpu/ipc/service/picture_buffer_manager.cc
@@ -8,7 +8,7 @@
#include <set>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/synchronization/lock.h"
diff --git a/media/gpu/ipc/service/picture_buffer_manager.h b/media/gpu/ipc/service/picture_buffer_manager.h
index dd6cbb20..f0476ec4 100644
--- a/media/gpu/ipc/service/picture_buffer_manager.h
+++ b/media/gpu/ipc/service/picture_buffer_manager.h
@@ -9,7 +9,7 @@
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/ipc/service/vda_video_decoder.cc b/media/gpu/ipc/service/vda_video_decoder.cc
index 93edff3..2bc7251 100644
--- a/media/gpu/ipc/service/vda_video_decoder.cc
+++ b/media/gpu/ipc/service/vda_video_decoder.cc
@@ -9,8 +9,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/media/gpu/ipc/service/vda_video_decoder.h b/media/gpu/ipc/service/vda_video_decoder.h
index 12f0b1ac..505a44b 100644
--- a/media/gpu/ipc/service/vda_video_decoder.h
+++ b/media/gpu/ipc/service/vda_video_decoder.h
@@ -10,8 +10,8 @@
#include <map>
#include <memory>
-#include "base/callback_forward.h"
#include "base/containers/lru_cache.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/ipc/service/vda_video_decoder_unittest.cc b/media/gpu/ipc/service/vda_video_decoder_unittest.cc
index 0a977651..5a353f7 100644
--- a/media/gpu/ipc/service/vda_video_decoder_unittest.cc
+++ b/media/gpu/ipc/service/vda_video_decoder_unittest.cc
@@ -6,7 +6,7 @@
#include <stdint.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
diff --git a/media/gpu/mac/vt_video_decode_accelerator_mac.cc b/media/gpu/mac/vt_video_decode_accelerator_mac.cc
index 57e12c1..c1b73080 100644
--- a/media/gpu/mac/vt_video_decode_accelerator_mac.cc
+++ b/media/gpu/mac/vt_video_decode_accelerator_mac.cc
@@ -14,10 +14,10 @@
#include <memory>
#include "base/atomic_sequence_num.h"
-#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/containers/span.h"
#include "base/cxx17_backports.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/mac/mac_logging.h"
#include "base/mac/mac_util.h"
diff --git a/media/gpu/mac/vt_video_encode_accelerator_mac.h b/media/gpu/mac/vt_video_encode_accelerator_mac.h
index 76757f2..eee2063 100644
--- a/media/gpu/mac/vt_video_encode_accelerator_mac.h
+++ b/media/gpu/mac/vt_video_encode_accelerator_mac.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/bind.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/test/bitstream_helpers.h b/media/gpu/test/bitstream_helpers.h
index ec1877b..8d87cd2 100644
--- a/media/gpu/test/bitstream_helpers.h
+++ b/media/gpu/test/bitstream_helpers.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_GPU_TEST_BITSTREAM_HELPERS_H_
#define MEDIA_GPU_TEST_BITSTREAM_HELPERS_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "base/time/time.h"
#include "media/video/video_encode_accelerator.h"
diff --git a/media/gpu/test/image_processor/image_processor_client.cc b/media/gpu/test/image_processor/image_processor_client.cc
index 01576ee..9cb3c2a 100644
--- a/media/gpu/test/image_processor/image_processor_client.cc
+++ b/media/gpu/test/image_processor/image_processor_client.cc
@@ -7,9 +7,9 @@
#include <functional>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/synchronization/waitable_event.h"
diff --git a/media/gpu/test/video.cc b/media/gpu/test/video.cc
index d3943b4..187e334 100644
--- a/media/gpu/test/video.cc
+++ b/media/gpu/test/video.cc
@@ -8,9 +8,9 @@
#include <numeric>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/json/json_reader.h"
#include "base/numerics/safe_conversions.h"
#include "base/run_loop.h"
diff --git a/media/gpu/test/video_encoder/bitstream_file_writer.cc b/media/gpu/test/video_encoder/bitstream_file_writer.cc
index dd61384..17a505e 100644
--- a/media/gpu/test/video_encoder/bitstream_file_writer.cc
+++ b/media/gpu/test/video_encoder/bitstream_file_writer.cc
@@ -4,8 +4,8 @@
#include "media/gpu/test/video_encoder/bitstream_file_writer.h"
-#include "base/bind.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/ranges/algorithm.h"
diff --git a/media/gpu/test/video_encoder/bitstream_validator.cc b/media/gpu/test/video_encoder/bitstream_validator.cc
index 6391053c..2f8a891 100644
--- a/media/gpu/test/video_encoder/bitstream_validator.cc
+++ b/media/gpu/test/video_encoder/bitstream_validator.cc
@@ -6,8 +6,8 @@
#include <numeric>
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/ranges/algorithm.h"
diff --git a/media/gpu/test/video_encoder/video_encoder.cc b/media/gpu/test/video_encoder/video_encoder.cc
index 8a8eed8..b90d18c 100644
--- a/media/gpu/test/video_encoder/video_encoder.cc
+++ b/media/gpu/test/video_encoder/video_encoder.cc
@@ -4,7 +4,7 @@
#include "media/gpu/test/video_encoder/video_encoder.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "media/base/video_bitrate_allocation.h"
#include "media/gpu/macros.h"
diff --git a/media/gpu/test/video_encoder/video_encoder.h b/media/gpu/test/video_encoder/video_encoder.h
index 377125c..d6283a8 100644
--- a/media/gpu/test/video_encoder/video_encoder.h
+++ b/media/gpu/test/video_encoder/video_encoder.h
@@ -11,7 +11,7 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/sequence_checker.h"
#include "base/synchronization/condition_variable.h"
diff --git a/media/gpu/test/video_encoder/video_encoder_client.cc b/media/gpu/test/video_encoder/video_encoder_client.cc
index 69db78f..fb2e7b7 100644
--- a/media/gpu/test/video_encoder/video_encoder_client.cc
+++ b/media/gpu/test/video_encoder/video_encoder_client.cc
@@ -9,7 +9,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/test/video_frame_file_writer.cc b/media/gpu/test/video_frame_file_writer.cc
index 9cfe516f..b87513f 100644
--- a/media/gpu/test/video_frame_file_writer.cc
+++ b/media/gpu/test/video_frame_file_writer.cc
@@ -8,8 +8,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h"
diff --git a/media/gpu/test/video_frame_helpers.cc b/media/gpu/test/video_frame_helpers.cc
index 4ed54bf..07aed59 100644
--- a/media/gpu/test/video_frame_helpers.cc
+++ b/media/gpu/test/video_frame_helpers.cc
@@ -9,7 +9,7 @@
#include <vector>
#include "base/bits.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/scoped_refptr.h"
#include "gpu/ipc/common/gpu_memory_buffer_support.h"
diff --git a/media/gpu/test/video_frame_validator.cc b/media/gpu/test/video_frame_validator.cc
index cc07886..ed082bb 100644
--- a/media/gpu/test/video_frame_validator.cc
+++ b/media/gpu/test/video_frame_validator.cc
@@ -6,9 +6,9 @@
#include <sys/mman.h>
-#include "base/bind.h"
#include "base/cpu.h"
#include "base/files/file.h"
+#include "base/functional/bind.h"
#include "base/hash/md5.h"
#include "base/memory/ptr_util.h"
#include "base/no_destructor.h"
diff --git a/media/gpu/test/video_frame_validator.h b/media/gpu/test/video_frame_validator.h
index 389720d4..5831317 100644
--- a/media/gpu/test/video_frame_validator.h
+++ b/media/gpu/test/video_frame_validator.h
@@ -11,8 +11,8 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
#include "base/files/file.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/synchronization/condition_variable.h"
#include "base/synchronization/lock.h"
diff --git a/media/gpu/test/video_player/decoder_listener.cc b/media/gpu/test/video_player/decoder_listener.cc
index 0e8d043..41035c5 100644
--- a/media/gpu/test/video_player/decoder_listener.cc
+++ b/media/gpu/test/video_player/decoder_listener.cc
@@ -4,7 +4,7 @@
#include "media/gpu/test/video_player/decoder_listener.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "media/gpu/macros.h"
#include "media/gpu/test/video.h"
diff --git a/media/gpu/test/video_player/decoder_listener.h b/media/gpu/test/video_player/decoder_listener.h
index 229fdf4..9b5cd7d 100644
--- a/media/gpu/test/video_player/decoder_listener.h
+++ b/media/gpu/test/video_player/decoder_listener.h
@@ -9,8 +9,8 @@
#include <memory>
#include <utility>
-#include "base/callback.h"
#include "base/containers/queue.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/sequence_checker.h"
#include "base/synchronization/condition_variable.h"
diff --git a/media/gpu/test/video_player/decoder_wrapper.cc b/media/gpu/test/video_player/decoder_wrapper.cc
index 8eb2e29..f79e937 100644
--- a/media/gpu/test/video_player/decoder_wrapper.cc
+++ b/media/gpu/test/video_player/decoder_wrapper.cc
@@ -7,7 +7,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/test/video_player/test_vda_video_decoder.cc b/media/gpu/test/video_player/test_vda_video_decoder.cc
index 021db0c3e..7faacd5 100644
--- a/media/gpu/test/video_player/test_vda_video_decoder.cc
+++ b/media/gpu/test/video_player/test_vda_video_decoder.cc
@@ -10,7 +10,7 @@
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/test/video_test_helpers.cc b/media/gpu/test/video_test_helpers.cc
index 42ebca4..0b83296 100644
--- a/media/gpu/test/video_test_helpers.cc
+++ b/media/gpu/test/video_test_helpers.cc
@@ -6,7 +6,7 @@
#include <limits>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/read_only_shared_memory_region.h"
diff --git a/media/gpu/v4l2/v4l2_decode_surface.h b/media/gpu/v4l2/v4l2_decode_surface.h
index ea01b5f..0552b7a 100644
--- a/media/gpu/v4l2/v4l2_decode_surface.h
+++ b/media/gpu/v4l2/v4l2_decode_surface.h
@@ -7,7 +7,7 @@
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "base/sequence_checker.h"
#include "media/base/video_color_space.h"
diff --git a/media/gpu/v4l2/v4l2_device.cc b/media/gpu/v4l2/v4l2_device.cc
index fcc52dd..6151f7e3f 100644
--- a/media/gpu/v4l2/v4l2_device.cc
+++ b/media/gpu/v4l2/v4l2_device.cc
@@ -20,7 +20,7 @@
#include <string.h>
#include <sys/mman.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/numerics/checked_math.h"
#include "base/numerics/safe_conversions.h"
diff --git a/media/gpu/v4l2/v4l2_device_poller.cc b/media/gpu/v4l2/v4l2_device_poller.cc
index cfb1eb6..8323cc7 100644
--- a/media/gpu/v4l2/v4l2_device_poller.cc
+++ b/media/gpu/v4l2/v4l2_device_poller.cc
@@ -6,7 +6,7 @@
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "base/threading/thread_checker.h"
#include "media/gpu/macros.h"
diff --git a/media/gpu/v4l2/v4l2_device_poller.h b/media/gpu/v4l2/v4l2_device_poller.h
index 8469f9e..2e171e85 100644
--- a/media/gpu/v4l2/v4l2_device_poller.h
+++ b/media/gpu/v4l2/v4l2_device_poller.h
@@ -6,7 +6,7 @@
#define MEDIA_GPU_V4L2_V4L2_DEVICE_POLLER_H_
#include <atomic>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/sequence_checker.h"
#include "base/synchronization/waitable_event.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/v4l2/v4l2_image_processor_backend.cc b/media/gpu/v4l2/v4l2_image_processor_backend.cc
index 090fddf..d95d9ab006 100644
--- a/media/gpu/v4l2/v4l2_image_processor_backend.cc
+++ b/media/gpu/v4l2/v4l2_image_processor_backend.cc
@@ -16,8 +16,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/numerics/safe_conversions.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/task_traits.h"
diff --git a/media/gpu/v4l2/v4l2_jpeg_encode_accelerator.cc b/media/gpu/v4l2/v4l2_jpeg_encode_accelerator.cc
index e1fdc8a6..fbdff0a8 100644
--- a/media/gpu/v4l2/v4l2_jpeg_encode_accelerator.cc
+++ b/media/gpu/v4l2/v4l2_jpeg_encode_accelerator.cc
@@ -13,9 +13,9 @@
#include <tuple>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/cxx17_backports.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/single_thread_task_runner.h"
#include "media/base/bind_to_current_loop.h"
#include "media/gpu/chromeos/fourcc.h"
diff --git a/media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.cc b/media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.cc
index c338fdbc..05f8911ef 100644
--- a/media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.cc
+++ b/media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.cc
@@ -14,9 +14,9 @@
#include <utility>
#include "base/big_endian.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/files/scoped_file.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/page_size.h"
#include "base/memory/shared_memory_mapping.h"
#include "base/memory/unsafe_shared_memory_region.h"
diff --git a/media/gpu/v4l2/v4l2_slice_video_decode_accelerator.cc b/media/gpu/v4l2/v4l2_slice_video_decode_accelerator.cc
index 6ffc6c5..a8c51951 100644
--- a/media/gpu/v4l2/v4l2_slice_video_decode_accelerator.cc
+++ b/media/gpu/v4l2/v4l2_slice_video_decode_accelerator.cc
@@ -16,11 +16,11 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/numerics/safe_conversions.h"
#include "base/posix/eintr_wrapper.h"
diff --git a/media/gpu/v4l2/v4l2_vda_helpers.cc b/media/gpu/v4l2/v4l2_vda_helpers.cc
index 60001b3..1fda578e 100644
--- a/media/gpu/v4l2/v4l2_vda_helpers.cc
+++ b/media/gpu/v4l2/v4l2_vda_helpers.cc
@@ -4,8 +4,8 @@
#include "media/gpu/v4l2/v4l2_vda_helpers.h"
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/ranges/algorithm.h"
#include "base/task/sequenced_task_runner.h"
#include "media/base/color_plane_layout.h"
diff --git a/media/gpu/v4l2/v4l2_video_decode_accelerator.cc b/media/gpu/v4l2/v4l2_video_decode_accelerator.cc
index c364cf5..e47ed8f 100644
--- a/media/gpu/v4l2/v4l2_video_decode_accelerator.cc
+++ b/media/gpu/v4l2/v4l2_video_decode_accelerator.cc
@@ -14,9 +14,9 @@
#include <sys/ioctl.h>
#include <sys/mman.h>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/numerics/safe_conversions.h"
#include "base/posix/eintr_wrapper.h"
#include "base/ranges/algorithm.h"
diff --git a/media/gpu/v4l2/v4l2_video_decode_accelerator.h b/media/gpu/v4l2/v4l2_video_decode_accelerator.h
index 9edb4cd..8a6c688 100644
--- a/media/gpu/v4l2/v4l2_video_decode_accelerator.h
+++ b/media/gpu/v4l2/v4l2_video_decode_accelerator.h
@@ -18,9 +18,9 @@
#include <utility>
#include <vector>
-#include "base/callback_forward.h"
#include "base/cancelable_callback.h"
#include "base/containers/queue.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/synchronization/waitable_event.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/v4l2/v4l2_video_decoder.cc b/media/gpu/v4l2/v4l2_video_decoder.cc
index 839034c..e15c7bc 100644
--- a/media/gpu/v4l2/v4l2_video_decoder.cc
+++ b/media/gpu/v4l2/v4l2_video_decoder.cc
@@ -6,9 +6,9 @@
#include <algorithm>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/v4l2/v4l2_video_decoder.h b/media/gpu/v4l2/v4l2_video_decoder.h
index 98bb71f..3b6c76a 100644
--- a/media/gpu/v4l2/v4l2_video_decoder.h
+++ b/media/gpu/v4l2/v4l2_video_decoder.h
@@ -12,9 +12,9 @@
#include <utility>
#include <vector>
-#include "base/callback_forward.h"
#include "base/containers/lru_cache.h"
#include "base/containers/queue.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
diff --git a/media/gpu/v4l2/v4l2_video_decoder_backend_stateful.cc b/media/gpu/v4l2/v4l2_video_decoder_backend_stateful.cc
index a29af02..fcb58ad1 100644
--- a/media/gpu/v4l2/v4l2_video_decoder_backend_stateful.cc
+++ b/media/gpu/v4l2/v4l2_video_decoder_backend_stateful.cc
@@ -9,9 +9,9 @@
#include <tuple>
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/sequence_checker.h"
diff --git a/media/gpu/v4l2/v4l2_video_decoder_backend_stateless.cc b/media/gpu/v4l2/v4l2_video_decoder_backend_stateless.cc
index f9f5724..a85a7bd 100644
--- a/media/gpu/v4l2/v4l2_video_decoder_backend_stateless.cc
+++ b/media/gpu/v4l2/v4l2_video_decoder_backend_stateless.cc
@@ -10,9 +10,9 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/metrics/histogram_macros.h"
#include "base/numerics/safe_conversions.h"
#include "base/posix/eintr_wrapper.h"
diff --git a/media/gpu/v4l2/v4l2_video_encode_accelerator.cc b/media/gpu/v4l2/v4l2_video_encode_accelerator.cc
index c560d98..56389ea3ee 100644
--- a/media/gpu/v4l2/v4l2_video_encode_accelerator.cc
+++ b/media/gpu/v4l2/v4l2_video_encode_accelerator.cc
@@ -16,11 +16,11 @@
#include <numeric>
#include <utility>
-#include "base/bind.h"
#include "base/bits.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/shared_memory_mapping.h"
#include "base/memory/unsafe_shared_memory_region.h"
#include "base/numerics/safe_conversions.h"
diff --git a/media/gpu/vaapi/av1_vaapi_video_decoder_delegate.cc b/media/gpu/vaapi/av1_vaapi_video_decoder_delegate.cc
index 1760460..bc304cd 100644
--- a/media/gpu/vaapi/av1_vaapi_video_decoder_delegate.cc
+++ b/media/gpu/vaapi/av1_vaapi_video_decoder_delegate.cc
@@ -9,7 +9,7 @@
#include <algorithm>
#include <vector>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/scoped_refptr.h"
#include "build/chromeos_buildflags.h"
diff --git a/media/gpu/vaapi/fuzzers/jpeg_decoder/jpeg_decoder_fuzzertest.cc b/media/gpu/vaapi/fuzzers/jpeg_decoder/jpeg_decoder_fuzzertest.cc
index 8a9d38c0..3a3cd744d 100644
--- a/media/gpu/vaapi/fuzzers/jpeg_decoder/jpeg_decoder_fuzzertest.cc
+++ b/media/gpu/vaapi/fuzzers/jpeg_decoder/jpeg_decoder_fuzzertest.cc
@@ -9,7 +9,7 @@
#include <algorithm>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "media/gpu/vaapi/fuzzers/jpeg_decoder/jpeg_decoder_fuzzer_input.pb.h"
diff --git a/media/gpu/vaapi/h264_vaapi_video_decoder_delegate.h b/media/gpu/vaapi/h264_vaapi_video_decoder_delegate.h
index 1cad17e..7d366ef1 100644
--- a/media/gpu/vaapi/h264_vaapi_video_decoder_delegate.h
+++ b/media/gpu/vaapi/h264_vaapi_video_decoder_delegate.h
@@ -6,7 +6,7 @@
#define MEDIA_GPU_VAAPI_H264_VAAPI_VIDEO_DECODER_DELEGATE_H_
#include "base/atomic_sequence_num.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/scoped_refptr.h"
#include "base/sequence_checker.h"
#include "build/chromeos_buildflags.h"
diff --git a/media/gpu/vaapi/va_surface.h b/media/gpu/vaapi/va_surface.h
index 60c41b2..2f1d3a702 100644
--- a/media/gpu/vaapi/va_surface.h
+++ b/media/gpu/vaapi/va_surface.h
@@ -10,7 +10,7 @@
#include <va/va.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "ui/gfx/geometry/size.h"
diff --git a/media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.cc b/media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.cc
index 0158342..c893b43 100644
--- a/media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.cc
+++ b/media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.cc
@@ -6,8 +6,8 @@
#include <sys/mman.h>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "build/build_config.h"
#include "media/base/color_plane_layout.h"
diff --git a/media/gpu/vaapi/vaapi_image_decode_accelerator_worker.cc b/media/gpu/vaapi/vaapi_image_decode_accelerator_worker.cc
index 296057a..02e7b0d 100644
--- a/media/gpu/vaapi/vaapi_image_decode_accelerator_worker.cc
+++ b/media/gpu/vaapi/vaapi_image_decode_accelerator_worker.cc
@@ -9,9 +9,9 @@
#include <utility>
-#include "base/bind.h"
#include "base/containers/span.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/media/gpu/vaapi/vaapi_image_decode_accelerator_worker_unittest.cc b/media/gpu/vaapi/vaapi_image_decode_accelerator_worker_unittest.cc
index 47295cd..9130b2a 100644
--- a/media/gpu/vaapi/vaapi_image_decode_accelerator_worker_unittest.cc
+++ b/media/gpu/vaapi/vaapi_image_decode_accelerator_worker_unittest.cc
@@ -13,9 +13,9 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/containers/span.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/scoped_refptr.h"
#include "base/notreached.h"
diff --git a/media/gpu/vaapi/vaapi_image_decoder.h b/media/gpu/vaapi/vaapi_image_decoder.h
index fcbb0e0..ac654dc 100644
--- a/media/gpu/vaapi/vaapi_image_decoder.h
+++ b/media/gpu/vaapi/vaapi_image_decoder.h
@@ -10,8 +10,8 @@
#include <memory>
-#include "base/callback_forward.h"
#include "base/containers/span.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "gpu/config/gpu_info.h"
#include "third_party/skia/include/core/SkImageInfo.h"
diff --git a/media/gpu/vaapi/vaapi_image_decoder_test_common.cc b/media/gpu/vaapi/vaapi_image_decoder_test_common.cc
index 960239e0..01fa165 100644
--- a/media/gpu/vaapi/vaapi_image_decoder_test_common.cc
+++ b/media/gpu/vaapi/vaapi_image_decoder_test_common.cc
@@ -4,11 +4,11 @@
#include "media/gpu/vaapi/vaapi_image_decoder_test_common.h"
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "media/base/test_data_util.h"
#include "media/gpu/vaapi/vaapi_image_decoder.h"
diff --git a/media/gpu/vaapi/vaapi_image_processor_backend.cc b/media/gpu/vaapi/vaapi_image_processor_backend.cc
index a557ff1..1662a47 100644
--- a/media/gpu/vaapi/vaapi_image_processor_backend.cc
+++ b/media/gpu/vaapi/vaapi_image_processor_backend.cc
@@ -8,9 +8,9 @@
#include <va/va.h>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
#include "base/memory/scoped_refptr.h"
#include "base/metrics/histogram_functions.h"
diff --git a/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.cc b/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.cc
index 1b5345f..ab9cbb8 100644
--- a/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.cc
+++ b/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.cc
@@ -9,8 +9,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/shared_memory_mapping.h"
#include "base/memory/unsafe_shared_memory_region.h"
diff --git a/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.cc b/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.cc
index 908adb5..138fa23 100644
--- a/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.cc
+++ b/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.cc
@@ -11,9 +11,9 @@
#include <array>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/files/scoped_file.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/page_size.h"
diff --git a/media/gpu/vaapi/vaapi_unittest.cc b/media/gpu/vaapi/vaapi_unittest.cc
index 9ade72a..2e055b0 100644
--- a/media/gpu/vaapi/vaapi_unittest.cc
+++ b/media/gpu/vaapi/vaapi_unittest.cc
@@ -18,12 +18,12 @@
#include <xf86drm.h>
#include "base/bits.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
#include "base/cpu.h"
#include "base/files/file.h"
#include "base/files/file_util.h"
#include "base/files/scoped_file.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/process/launch.h"
#include "base/strings/pattern.h"
diff --git a/media/gpu/vaapi/vaapi_utils.h b/media/gpu/vaapi/vaapi_utils.h
index c475641..0d85a433 100644
--- a/media/gpu/vaapi/vaapi_utils.h
+++ b/media/gpu/vaapi/vaapi_utils.h
@@ -7,8 +7,8 @@
#include <va/va.h>
-#include "base/callback_forward.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_forward.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/thread_annotations.h"
#include "ui/gfx/geometry/size.h"
diff --git a/media/gpu/vaapi/vaapi_utils_unittest.cc b/media/gpu/vaapi/vaapi_utils_unittest.cc
index 71d5435f..5602b85 100644
--- a/media/gpu/vaapi/vaapi_utils_unittest.cc
+++ b/media/gpu/vaapi/vaapi_utils_unittest.cc
@@ -9,7 +9,7 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/scoped_refptr.h"
#include "base/numerics/safe_conversions.h"
diff --git a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
index 4e3a55f..07d39bae 100644
--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
@@ -9,12 +9,12 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
#include "base/containers/cxx20_erase.h"
#include "base/cpu.h"
#include "base/files/scoped_file.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/json/json_writer.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
diff --git a/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc b/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc
index 976daf1..6cc22e9c 100644
--- a/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc
+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc
@@ -4,8 +4,8 @@
#include "media/gpu/vaapi/vaapi_video_decode_accelerator.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/media/gpu/vaapi/vaapi_video_decoder.cc b/media/gpu/vaapi/vaapi_video_decoder.cc
index 83c7e46a..9ec8dde 100644
--- a/media/gpu/vaapi/vaapi_video_decoder.cc
+++ b/media/gpu/vaapi/vaapi_video_decoder.cc
@@ -9,11 +9,11 @@
#include <limits>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/containers/contains.h"
#include "base/containers/fixed_flat_map.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/vaapi/vaapi_video_decoder_delegate.cc b/media/gpu/vaapi/vaapi_video_decoder_delegate.cc
index ce605e5..0f238b0 100644
--- a/media/gpu/vaapi/vaapi_video_decoder_delegate.cc
+++ b/media/gpu/vaapi/vaapi_video_decoder_delegate.cc
@@ -4,8 +4,8 @@
#include "media/gpu/vaapi/vaapi_video_decoder_delegate.h"
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/vaapi/vaapi_video_decoder_delegate.h b/media/gpu/vaapi/vaapi_video_decoder_delegate.h
index addff582..4177e4c0 100644
--- a/media/gpu/vaapi/vaapi_video_decoder_delegate.h
+++ b/media/gpu/vaapi/vaapi_video_decoder_delegate.h
@@ -10,8 +10,8 @@
#include <string>
#include <vector>
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/media/gpu/vaapi/vaapi_video_encode_accelerator.cc b/media/gpu/vaapi/vaapi_video_encode_accelerator.cc
index 8b69d97..098117c 100644
--- a/media/gpu/vaapi/vaapi_video_encode_accelerator.cc
+++ b/media/gpu/vaapi/vaapi_video_encode_accelerator.cc
@@ -13,13 +13,13 @@
#include <utility>
#include <variant>
-#include "base/bind.h"
#include "base/bits.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
#include "base/cxx17_backports.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/memory/shared_memory_mapping.h"
#include "base/memory/unsafe_shared_memory_region.h"
diff --git a/media/gpu/vaapi/vaapi_video_encoder_delegate.h b/media/gpu/vaapi/vaapi_video_encoder_delegate.h
index 1af498e..b224a3f 100644
--- a/media/gpu/vaapi/vaapi_video_encoder_delegate.h
+++ b/media/gpu/vaapi/vaapi_video_encoder_delegate.h
@@ -8,8 +8,8 @@
#include <va/va.h>
#include <vector>
-#include "base/callback.h"
#include "base/containers/queue.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/sequence_checker.h"
#include "base/time/time.h"
diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc
index 77e0216..8c24925 100644
--- a/media/gpu/vaapi/vaapi_wrapper.cc
+++ b/media/gpu/vaapi/vaapi_wrapper.cc
@@ -20,14 +20,14 @@
#include <type_traits>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
#include "base/containers/cxx20_erase.h"
#include "base/containers/fixed_flat_set.h"
#include "base/cpu.h"
#include "base/environment.h"
#include "base/files/scoped_file.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/no_destructor.h"
diff --git a/media/gpu/vaapi/vp8_vaapi_video_decoder_delegate.cc b/media/gpu/vaapi/vp8_vaapi_video_decoder_delegate.cc
index cac6d9a..e7abc552 100644
--- a/media/gpu/vaapi/vp8_vaapi_video_decoder_delegate.cc
+++ b/media/gpu/vaapi/vp8_vaapi_video_decoder_delegate.cc
@@ -4,7 +4,7 @@
#include "media/gpu/vaapi/vp8_vaapi_video_decoder_delegate.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/trace_event/trace_event.h"
#include "media/gpu/decode_surface_handler.h"
#include "media/gpu/vaapi/va_surface.h"
diff --git a/media/gpu/vaapi/vp9_vaapi_video_decoder_delegate.h b/media/gpu/vaapi/vp9_vaapi_video_decoder_delegate.h
index 0abe7312..2df02f9 100644
--- a/media/gpu/vaapi/vp9_vaapi_video_decoder_delegate.h
+++ b/media/gpu/vaapi/vp9_vaapi_video_decoder_delegate.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_GPU_VAAPI_VP9_VAAPI_VIDEO_DECODER_DELEGATE_H_
#define MEDIA_GPU_VAAPI_VP9_VAAPI_VIDEO_DECODER_DELEGATE_H_
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/scoped_refptr.h"
#include "base/sequence_checker.h"
#include "media/filters/vp9_parser.h"
diff --git a/media/gpu/vaapi/vp9_vaapi_video_encoder_delegate_unittest.cc b/media/gpu/vaapi/vp9_vaapi_video_encoder_delegate_unittest.cc
index ef8fe00a..f7f6ded 100644
--- a/media/gpu/vaapi/vp9_vaapi_video_encoder_delegate_unittest.cc
+++ b/media/gpu/vaapi/vp9_vaapi_video_encoder_delegate_unittest.cc
@@ -10,9 +10,9 @@
#include <va/va.h>
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/cxx17_backports.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/numerics/safe_conversions.h"
diff --git a/media/gpu/video_decode_accelerator_tests.cc b/media/gpu/video_decode_accelerator_tests.cc
index 1a226b9..ed143f9 100644
--- a/media/gpu/video_decode_accelerator_tests.cc
+++ b/media/gpu/video_decode_accelerator_tests.cc
@@ -4,9 +4,9 @@
#include <limits>
-#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/files/file_util.h"
+#include "base/functional/callback_helpers.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "build/build_config.h"
diff --git a/media/gpu/vp9_decoder.cc b/media/gpu/vp9_decoder.cc
index d8974e0..202c3d0 100644
--- a/media/gpu/vp9_decoder.cc
+++ b/media/gpu/vp9_decoder.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
#include "build/build_config.h"
diff --git a/media/gpu/vp9_decoder.h b/media/gpu/vp9_decoder.h
index 130e1e65..3486ed5 100644
--- a/media/gpu/vp9_decoder.h
+++ b/media/gpu/vp9_decoder.h
@@ -11,7 +11,7 @@
#include <memory>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "media/base/video_types.h"
#include "media/filters/vp9_parser.h"
diff --git a/media/gpu/windows/d3d11_av1_accelerator.h b/media/gpu/windows/d3d11_av1_accelerator.h
index df8b984..a0517fb 100644
--- a/media/gpu/windows/d3d11_av1_accelerator.h
+++ b/media/gpu/windows/d3d11_av1_accelerator.h
@@ -11,7 +11,7 @@
#include <windows.h>
#include <wrl/client.h>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "media/base/media_log.h"
#include "media/gpu/av1_decoder.h"
diff --git a/media/gpu/windows/d3d11_copying_texture_wrapper_unittest.cc b/media/gpu/windows/d3d11_copying_texture_wrapper_unittest.cc
index 24924c0..ad4ca6e 100644
--- a/media/gpu/windows/d3d11_copying_texture_wrapper_unittest.cc
+++ b/media/gpu/windows/d3d11_copying_texture_wrapper_unittest.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/task_environment.h"
#include "media/gpu/windows/d3d11_copying_texture_wrapper.h"
diff --git a/media/gpu/windows/d3d11_picture_buffer_unittest.cc b/media/gpu/windows/d3d11_picture_buffer_unittest.cc
index 8366b49..5a7be5de 100644
--- a/media/gpu/windows/d3d11_picture_buffer_unittest.cc
+++ b/media/gpu/windows/d3d11_picture_buffer_unittest.cc
@@ -4,7 +4,7 @@
#include <utility>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/test/task_environment.h"
#include "media/gpu/windows/d3d11_picture_buffer.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/gpu/windows/d3d11_texture_wrapper_unittest.cc b/media/gpu/windows/d3d11_texture_wrapper_unittest.cc
index 2a633a48..ad32cd3 100644
--- a/media/gpu/windows/d3d11_texture_wrapper_unittest.cc
+++ b/media/gpu/windows/d3d11_texture_wrapper_unittest.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/task_environment.h"
diff --git a/media/gpu/windows/d3d11_video_decoder.cc b/media/gpu/windows/d3d11_video_decoder.cc
index 1f04bdf..60c0f80 100644
--- a/media/gpu/windows/d3d11_video_decoder.cc
+++ b/media/gpu/windows/d3d11_video_decoder.cc
@@ -8,12 +8,12 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/debug/crash_logging.h"
#include "base/debug/dump_without_crashing.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted_delete_on_sequence.h"
#include "base/metrics/histogram_functions.h"
diff --git a/media/gpu/windows/d3d11_video_decoder_client.h b/media/gpu/windows/d3d11_video_decoder_client.h
index aeeb694..17c8b03 100644
--- a/media/gpu/windows/d3d11_video_decoder_client.h
+++ b/media/gpu/windows/d3d11_video_decoder_client.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_GPU_WINDOWS_D3D11_VIDEO_DECODER_CLIENT_H_
#define MEDIA_GPU_WINDOWS_D3D11_VIDEO_DECODER_CLIENT_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/base/video_color_space.h"
#include "media/gpu/windows/d3d11_com_defs.h"
diff --git a/media/gpu/windows/d3d11_video_decoder_impl.cc b/media/gpu/windows/d3d11_video_decoder_impl.cc
index 954a440..cadf7fa 100644
--- a/media/gpu/windows/d3d11_video_decoder_impl.cc
+++ b/media/gpu/windows/d3d11_video_decoder_impl.cc
@@ -4,7 +4,7 @@
#include "media/gpu/windows/d3d11_video_decoder_impl.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "gpu/command_buffer/common/sync_token.h"
#include "gpu/command_buffer/service/scheduler.h"
#include "gpu/ipc/service/gpu_channel.h"
diff --git a/media/gpu/windows/d3d11_video_decoder_impl.h b/media/gpu/windows/d3d11_video_decoder_impl.h
index 50a8924..ec071d04 100644
--- a/media/gpu/windows/d3d11_video_decoder_impl.h
+++ b/media/gpu/windows/d3d11_video_decoder_impl.h
@@ -11,7 +11,7 @@
#include <memory>
#include <tuple>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
diff --git a/media/gpu/windows/d3d11_video_decoder_unittest.cc b/media/gpu/windows/d3d11_video_decoder_unittest.cc
index d0b51f4..a38caf9 100644
--- a/media/gpu/windows/d3d11_video_decoder_unittest.cc
+++ b/media/gpu/windows/d3d11_video_decoder_unittest.cc
@@ -11,8 +11,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/media/gpu/windows/d3d11_video_processor_proxy_unittest.cc b/media/gpu/windows/d3d11_video_processor_proxy_unittest.cc
index 50e7122..7f874c93 100644
--- a/media/gpu/windows/d3d11_video_processor_proxy_unittest.cc
+++ b/media/gpu/windows/d3d11_video_processor_proxy_unittest.cc
@@ -5,7 +5,7 @@
#include <random>
#include <utility>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "media/base/win/d3d11_mocks.h"
#include "media/gpu/windows/d3d11_copying_texture_wrapper.h"
#include "media/gpu/windows/d3d11_texture_wrapper.h"
diff --git a/media/gpu/windows/dxva_video_decode_accelerator_win.cc b/media/gpu/windows/dxva_video_decode_accelerator_win.cc
index 7d08966..eaf93b8a 100644
--- a/media/gpu/windows/dxva_video_decode_accelerator_win.cc
+++ b/media/gpu/windows/dxva_video_decode_accelerator_win.cc
@@ -22,12 +22,12 @@
#include "base/atomicops.h"
#include "base/base_paths_win.h"
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/command_line.h"
#include "base/containers/contains.h"
#include "base/file_version_info.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
diff --git a/media/gpu/windows/media_foundation_video_encode_accelerator_win.h b/media/gpu/windows/media_foundation_video_encode_accelerator_win.h
index 6660fb1..1ac8e2d5 100644
--- a/media/gpu/windows/media_foundation_video_encode_accelerator_win.h
+++ b/media/gpu/windows/media_foundation_video_encode_accelerator_win.h
@@ -13,8 +13,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/bind.h"
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/windows/mf_audio_encoder.cc b/media/gpu/windows/mf_audio_encoder.cc
index 4008c00..aa54a0a 100644
--- a/media/gpu/windows/mf_audio_encoder.cc
+++ b/media/gpu/windows/mf_audio_encoder.cc
@@ -16,8 +16,8 @@
#include <algorithm>
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/windows/mf_audio_encoder.h b/media/gpu/windows/mf_audio_encoder.h
index c257f31..1f721eb8 100644
--- a/media/gpu/windows/mf_audio_encoder.h
+++ b/media/gpu/windows/mf_audio_encoder.h
@@ -9,9 +9,9 @@
#include <memory>
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
#include "media/base/audio_encoder.h"
diff --git a/media/gpu/windows/output_with_release_mailbox_cb.h b/media/gpu/windows/output_with_release_mailbox_cb.h
index 849d73f..3ea87c2 100644
--- a/media/gpu/windows/output_with_release_mailbox_cb.h
+++ b/media/gpu/windows/output_with_release_mailbox_cb.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_GPU_WINDOWS_OUTPUT_WITH_RELEASE_MAILBOX_CB_H_
#define MEDIA_GPU_WINDOWS_OUTPUT_WITH_RELEASE_MAILBOX_CB_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "media/base/video_frame.h"
diff --git a/media/learning/common/learning_task_controller.h b/media/learning/common/learning_task_controller.h
index 285e1e50..169d950 100644
--- a/media/learning/common/learning_task_controller.h
+++ b/media/learning/common/learning_task_controller.h
@@ -5,8 +5,8 @@
#ifndef MEDIA_LEARNING_COMMON_LEARNING_TASK_CONTROLLER_H_
#define MEDIA_LEARNING_COMMON_LEARNING_TASK_CONTROLLER_H_
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/unguessable_token.h"
#include "media/learning/common/labelled_example.h"
#include "media/learning/common/learning_task.h"
diff --git a/media/learning/common/media_learning_tasks.h b/media/learning/common/media_learning_tasks.h
index b6b0c78..fd1ade54 100644
--- a/media/learning/common/media_learning_tasks.h
+++ b/media/learning/common/media_learning_tasks.h
@@ -5,8 +5,8 @@
#ifndef MEDIA_LEARNING_COMMON_MEDIA_LEARNING_TASKS_H_
#define MEDIA_LEARNING_COMMON_MEDIA_LEARNING_TASKS_H_
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "media/learning/common/learning_task.h"
namespace media {
diff --git a/media/learning/common/media_learning_tasks_unittest.cc b/media/learning/common/media_learning_tasks_unittest.cc
index 6eeeb5bb..38e7782 100644
--- a/media/learning/common/media_learning_tasks_unittest.cc
+++ b/media/learning/common/media_learning_tasks_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/learning/impl/distribution_reporter.cc b/media/learning/impl/distribution_reporter.cc
index d36da980..1e83192 100644
--- a/media/learning/impl/distribution_reporter.cc
+++ b/media/learning/impl/distribution_reporter.cc
@@ -4,8 +4,8 @@
#include "media/learning/impl/distribution_reporter.h"
-#include "base/bind.h"
#include "base/cxx17_backports.h"
+#include "base/functional/bind.h"
#include "base/metrics/histogram_functions.h"
#include "services/metrics/public/cpp/ukm_builders.h"
#include "services/metrics/public/cpp/ukm_recorder.h"
diff --git a/media/learning/impl/distribution_reporter.h b/media/learning/impl/distribution_reporter.h
index d6b40a9..6f9a41b 100644
--- a/media/learning/impl/distribution_reporter.h
+++ b/media/learning/impl/distribution_reporter.h
@@ -7,8 +7,8 @@
#include <set>
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "media/learning/common/learning_task.h"
#include "media/learning/common/target_histogram.h"
diff --git a/media/learning/impl/distribution_reporter_unittest.cc b/media/learning/impl/distribution_reporter_unittest.cc
index 5020246..0e72a6c 100644
--- a/media/learning/impl/distribution_reporter_unittest.cc
+++ b/media/learning/impl/distribution_reporter_unittest.cc
@@ -5,7 +5,7 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/test/task_environment.h"
#include "components/ukm/test_ukm_recorder.h"
#include "media/learning/common/learning_task.h"
diff --git a/media/learning/impl/extra_trees_trainer.cc b/media/learning/impl/extra_trees_trainer.cc
index 7e8d90c..e2f3f2c 100644
--- a/media/learning/impl/extra_trees_trainer.cc
+++ b/media/learning/impl/extra_trees_trainer.cc
@@ -6,8 +6,8 @@
#include <set>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "media/learning/impl/voting_ensemble.h"
namespace media {
diff --git a/media/learning/impl/extra_trees_trainer_unittest.cc b/media/learning/impl/extra_trees_trainer_unittest.cc
index f7c35a4..c269142 100644
--- a/media/learning/impl/extra_trees_trainer_unittest.cc
+++ b/media/learning/impl/extra_trees_trainer_unittest.cc
@@ -4,7 +4,7 @@
#include "media/learning/impl/extra_trees_trainer.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted.h"
#include "base/test/task_environment.h"
#include "media/learning/impl/fisher_iris_dataset.h"
diff --git a/media/learning/impl/feature_provider.h b/media/learning/impl/feature_provider.h
index 34cc9e2..cb56e0e 100644
--- a/media/learning/impl/feature_provider.h
+++ b/media/learning/impl/feature_provider.h
@@ -5,8 +5,8 @@
#ifndef MEDIA_LEARNING_IMPL_FEATURE_PROVIDER_H_
#define MEDIA_LEARNING_IMPL_FEATURE_PROVIDER_H_
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/threading/sequence_bound.h"
#include "media/learning/common/labelled_example.h"
#include "media/learning/common/learning_task.h"
diff --git a/media/learning/impl/learning_session_impl.cc b/media/learning/impl/learning_session_impl.cc
index 987d631..bf24a2d 100644
--- a/media/learning/impl/learning_session_impl.cc
+++ b/media/learning/impl/learning_session_impl.cc
@@ -7,8 +7,8 @@
#include <set>
#include <utility>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/task/sequenced_task_runner.h"
#include "media/learning/impl/distribution_reporter.h"
diff --git a/media/learning/impl/learning_session_impl_unittest.cc b/media/learning/impl/learning_session_impl_unittest.cc
index 11b10a3..38825f8e 100644
--- a/media/learning/impl/learning_session_impl_unittest.cc
+++ b/media/learning/impl/learning_session_impl_unittest.cc
@@ -6,7 +6,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/task/sequenced_task_runner.h"
#include "base/test/task_environment.h"
diff --git a/media/learning/impl/learning_task_controller_helper.cc b/media/learning/impl/learning_task_controller_helper.cc
index 0b4be37..2e63468 100644
--- a/media/learning/impl/learning_task_controller_helper.cc
+++ b/media/learning/impl/learning_task_controller_helper.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
namespace media {
diff --git a/media/learning/impl/learning_task_controller_helper.h b/media/learning/impl/learning_task_controller_helper.h
index 8fda2c2..ba57eef 100644
--- a/media/learning/impl/learning_task_controller_helper.h
+++ b/media/learning/impl/learning_task_controller_helper.h
@@ -8,8 +8,8 @@
#include <map>
#include <memory>
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/learning/impl/learning_task_controller_helper_unittest.cc b/media/learning/impl/learning_task_controller_helper_unittest.cc
index 7846583..7258cee 100644
--- a/media/learning/impl/learning_task_controller_helper_unittest.cc
+++ b/media/learning/impl/learning_task_controller_helper_unittest.cc
@@ -6,7 +6,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/task/sequenced_task_runner.h"
#include "base/test/task_environment.h"
diff --git a/media/learning/impl/learning_task_controller_impl.cc b/media/learning/impl/learning_task_controller_impl.cc
index 21408ac..330fed3 100644
--- a/media/learning/impl/learning_task_controller_impl.cc
+++ b/media/learning/impl/learning_task_controller_impl.cc
@@ -8,8 +8,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/notreached.h"
#include "media/learning/impl/distribution_reporter.h"
#include "media/learning/impl/extra_trees_trainer.h"
diff --git a/media/learning/impl/learning_task_controller_impl.h b/media/learning/impl/learning_task_controller_impl.h
index 4a9c3bf..7bf5bba 100644
--- a/media/learning/impl/learning_task_controller_impl.h
+++ b/media/learning/impl/learning_task_controller_impl.h
@@ -8,8 +8,8 @@
#include <memory>
#include <set>
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "media/learning/common/learning_task_controller.h"
#include "media/learning/impl/distribution_reporter.h"
diff --git a/media/learning/impl/learning_task_controller_impl_unittest.cc b/media/learning/impl/learning_task_controller_impl_unittest.cc
index 1603112..a9653a6 100644
--- a/media/learning/impl/learning_task_controller_impl_unittest.cc
+++ b/media/learning/impl/learning_task_controller_impl_unittest.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/task/sequenced_task_runner.h"
#include "base/test/task_environment.h"
diff --git a/media/learning/impl/lookup_table_trainer_unittest.cc b/media/learning/impl/lookup_table_trainer_unittest.cc
index b8c114f..4cfec482 100644
--- a/media/learning/impl/lookup_table_trainer_unittest.cc
+++ b/media/learning/impl/lookup_table_trainer_unittest.cc
@@ -4,7 +4,7 @@
#include "media/learning/impl/lookup_table_trainer.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/learning/impl/model.h b/media/learning/impl/model.h
index 7dd67da..6dccc2b 100644
--- a/media/learning/impl/model.h
+++ b/media/learning/impl/model.h
@@ -5,8 +5,8 @@
#ifndef MEDIA_LEARNING_IMPL_MODEL_H_
#define MEDIA_LEARNING_IMPL_MODEL_H_
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "media/learning/common/labelled_example.h"
#include "media/learning/common/target_histogram.h"
diff --git a/media/learning/impl/random_number_generator_unittest.cc b/media/learning/impl/random_number_generator_unittest.cc
index 4b69297d..8bc8d81 100644
--- a/media/learning/impl/random_number_generator_unittest.cc
+++ b/media/learning/impl/random_number_generator_unittest.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "media/learning/impl/test_random_number_generator.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/learning/impl/random_tree_trainer.cc b/media/learning/impl/random_tree_trainer.cc
index 558702a4..0d8c7cc5 100644
--- a/media/learning/impl/random_tree_trainer.cc
+++ b/media/learning/impl/random_tree_trainer.cc
@@ -6,8 +6,8 @@
#include <math.h>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/media/learning/impl/random_tree_trainer_unittest.cc b/media/learning/impl/random_tree_trainer_unittest.cc
index bea7bed8..19ffe8d 100644
--- a/media/learning/impl/random_tree_trainer_unittest.cc
+++ b/media/learning/impl/random_tree_trainer_unittest.cc
@@ -4,7 +4,7 @@
#include "media/learning/impl/random_tree_trainer.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "media/learning/impl/test_random_number_generator.h"
diff --git a/media/learning/impl/training_algorithm.h b/media/learning/impl/training_algorithm.h
index 33a7b71b..e999c63 100644
--- a/media/learning/impl/training_algorithm.h
+++ b/media/learning/impl/training_algorithm.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/learning/common/labelled_example.h"
#include "media/learning/impl/model.h"
diff --git a/media/learning/mojo/mojo_learning_task_controller_service.cc b/media/learning/mojo/mojo_learning_task_controller_service.cc
index 9926c114..5081b4e 100644
--- a/media/learning/mojo/mojo_learning_task_controller_service.cc
+++ b/media/learning/mojo/mojo_learning_task_controller_service.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "media/learning/common/learning_task_controller.h"
namespace media {
diff --git a/media/learning/mojo/mojo_learning_task_controller_service_unittest.cc b/media/learning/mojo/mojo_learning_task_controller_service_unittest.cc
index e020d096..2de9ed6 100644
--- a/media/learning/mojo/mojo_learning_task_controller_service_unittest.cc
+++ b/media/learning/mojo/mojo_learning_task_controller_service_unittest.cc
@@ -5,7 +5,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/test/task_environment.h"
diff --git a/media/learning/mojo/public/cpp/mojo_learning_task_controller_unittest.cc b/media/learning/mojo/public/cpp/mojo_learning_task_controller_unittest.cc
index be3e5fe..5743750 100644
--- a/media/learning/mojo/public/cpp/mojo_learning_task_controller_unittest.cc
+++ b/media/learning/mojo/public/cpp/mojo_learning_task_controller_unittest.cc
@@ -5,8 +5,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/test/task_environment.h"
#include "base/threading/thread.h"
diff --git a/media/midi/midi_manager.cc b/media/midi/midi_manager.cc
index c9a35be..7ca5cbca 100644
--- a/media/midi/midi_manager.cc
+++ b/media/midi/midi_manager.cc
@@ -4,7 +4,7 @@
#include "media/midi/midi_manager.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/metrics/histogram_macros.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/midi/midi_manager_alsa.cc b/media/midi/midi_manager_alsa.cc
index a5fc2c9..fce0187 100644
--- a/media/midi/midi_manager_alsa.cc
+++ b/media/midi/midi_manager_alsa.cc
@@ -12,7 +12,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/json/json_string_value_serializer.h"
#include "base/logging.h"
#include "base/posix/eintr_wrapper.h"
diff --git a/media/midi/midi_manager_android.cc b/media/midi/midi_manager_android.cc
index c1c3ed0..0639abed 100644
--- a/media/midi/midi_manager_android.cc
+++ b/media/midi/midi_manager_android.cc
@@ -4,8 +4,8 @@
#include "media/midi/midi_manager_android.h"
-#include "base/bind.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/metrics/field_trial_params.h"
#include "base/strings/stringprintf.h"
#include "media/midi/midi_device_android.h"
diff --git a/media/midi/midi_manager_mac.cc b/media/midi/midi_manager_mac.cc
index 45c7893d..25354f7 100644
--- a/media/midi/midi_manager_mac.cc
+++ b/media/midi/midi_manager_mac.cc
@@ -12,7 +12,7 @@
#include <CoreAudio/HostTime.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/sys_string_conversions.h"
diff --git a/media/midi/midi_manager_mac.h b/media/midi/midi_manager_mac.h
index e848b5fd..3cda776 100644
--- a/media/midi/midi_manager_mac.h
+++ b/media/midi/midi_manager_mac.h
@@ -9,8 +9,8 @@
#include <stdint.h>
#include <vector>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/synchronization/lock.h"
#include "base/thread_annotations.h"
#include "base/threading/thread.h"
diff --git a/media/midi/midi_manager_unittest.cc b/media/midi/midi_manager_unittest.cc
index c89afef2..0aaf58b 100644
--- a/media/midi/midi_manager_unittest.cc
+++ b/media/midi/midi_manager_unittest.cc
@@ -10,8 +10,8 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/memory/weak_ptr.h"
#include "base/run_loop.h"
#include "base/system/system_monitor.h"
diff --git a/media/midi/midi_manager_usb.cc b/media/midi/midi_manager_usb.cc
index 4060631..fccc6224 100644
--- a/media/midi/midi_manager_usb.cc
+++ b/media/midi/midi_manager_usb.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/strings/stringprintf.h"
#include "media/midi/midi_service.h"
#include "media/midi/task_service.h"
diff --git a/media/midi/midi_manager_win.cc b/media/midi/midi_manager_win.cc
index 774e50f..b11d74c 100644
--- a/media/midi/midi_manager_win.cc
+++ b/media/midi/midi_manager_win.cc
@@ -18,10 +18,10 @@
#include <tuple>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/ranges/algorithm.h"
diff --git a/media/midi/midi_manager_win.h b/media/midi/midi_manager_win.h
index 412341c..64f7efd 100644
--- a/media/midi/midi_manager_win.h
+++ b/media/midi/midi_manager_win.h
@@ -8,7 +8,7 @@
#include <memory>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/system/system_monitor.h"
#include "media/midi/midi_export.h"
diff --git a/media/midi/midi_manager_winrt.cc b/media/midi/midi_manager_winrt.cc
index a9c39587..c819674 100644
--- a/media/midi/midi_manager_winrt.cc
+++ b/media/midi/midi_manager_winrt.cc
@@ -27,7 +27,7 @@
#include <unordered_map>
#include <unordered_set>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/scoped_generic.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/media/midi/task_service.cc b/media/midi/task_service.cc
index 104e282..e6d7237 100644
--- a/media/midi/task_service.cc
+++ b/media/midi/task_service.cc
@@ -6,7 +6,7 @@
#include <limits>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/message_loop/message_pump_type.h"
#include "base/strings/stringprintf.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/midi/task_service.h b/media/midi/task_service.h
index 7752b35..74b4451 100644
--- a/media/midi/task_service.h
+++ b/media/midi/task_service.h
@@ -8,7 +8,7 @@
#include <memory>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/sequence_checker.h"
#include "base/synchronization/condition_variable.h"
diff --git a/media/midi/task_service_unittest.cc b/media/midi/task_service_unittest.cc
index 7ca32dd..cc5eac0 100644
--- a/media/midi/task_service_unittest.cc
+++ b/media/midi/task_service_unittest.cc
@@ -6,9 +6,9 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
diff --git a/media/midi/usb_midi_device.h b/media/midi/usb_midi_device.h
index 6fcc8e9..f40723c4 100644
--- a/media/midi/usb_midi_device.h
+++ b/media/midi/usb_midi_device.h
@@ -11,7 +11,7 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "media/midi/usb_midi_export.h"
diff --git a/media/midi/usb_midi_device_android.h b/media/midi/usb_midi_device_android.h
index e7d3a47..ec54bad 100644
--- a/media/midi/usb_midi_device_android.h
+++ b/media/midi/usb_midi_device_android.h
@@ -12,7 +12,7 @@
#include <vector>
#include "base/android/scoped_java_ref.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "media/midi/usb_midi_device.h"
#include "media/midi/usb_midi_export.h"
diff --git a/media/midi/usb_midi_device_factory_android.cc b/media/midi/usb_midi_device_factory_android.cc
index 8718c91d..9bb7314 100644
--- a/media/midi/usb_midi_device_factory_android.cc
+++ b/media/midi/usb_midi_device_factory_android.cc
@@ -7,7 +7,7 @@
#include <stddef.h>
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/synchronization/lock.h"
#include "media/midi/midi_jni_headers/UsbMidiDeviceFactoryAndroid_jni.h"
#include "media/midi/usb_midi_device_android.h"
diff --git a/media/midi/usb_midi_device_factory_android.h b/media/midi/usb_midi_device_factory_android.h
index 9a48479..20b676e2 100644
--- a/media/midi/usb_midi_device_factory_android.h
+++ b/media/midi/usb_midi_device_factory_android.h
@@ -8,7 +8,7 @@
#include <jni.h>
#include "base/android/scoped_java_ref.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "media/midi/usb_midi_device.h"
diff --git a/media/mojo/clients/mojo_android_overlay_unittest.cc b/media/mojo/clients/mojo_android_overlay_unittest.cc
index aa426a8..20eabe2 100644
--- a/media/mojo/clients/mojo_android_overlay_unittest.cc
+++ b/media/mojo/clients/mojo_android_overlay_unittest.cc
@@ -5,7 +5,7 @@
#include <memory>
#include "base/android/jni_android.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
diff --git a/media/mojo/clients/mojo_audio_decoder.cc b/media/mojo/clients/mojo_audio_decoder.cc
index 118c947..1a0e017 100644
--- a/media/mojo/clients/mojo_audio_decoder.cc
+++ b/media/mojo/clients/mojo_audio_decoder.cc
@@ -4,8 +4,8 @@
#include "media/mojo/clients/mojo_audio_decoder.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/mojo/clients/mojo_audio_decoder_unittest.cc b/media/mojo/clients/mojo_audio_decoder_unittest.cc
index d91724c..ffcb3c3 100644
--- a/media/mojo/clients/mojo_audio_decoder_unittest.cc
+++ b/media/mojo/clients/mojo_audio_decoder_unittest.cc
@@ -4,8 +4,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/mojo/clients/mojo_audio_encoder.cc b/media/mojo/clients/mojo_audio_encoder.cc
index 7324292..ef7d255 100644
--- a/media/mojo/clients/mojo_audio_encoder.cc
+++ b/media/mojo/clients/mojo_audio_encoder.cc
@@ -4,8 +4,8 @@
#include "media/mojo/clients/mojo_audio_encoder.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/task/sequenced_task_runner.h"
#include "build/build_config.h"
diff --git a/media/mojo/clients/mojo_audio_encoder_unittest.cc b/media/mojo/clients/mojo_audio_encoder_unittest.cc
index e83f0bc..bb1b8d7 100644
--- a/media/mojo/clients/mojo_audio_encoder_unittest.cc
+++ b/media/mojo/clients/mojo_audio_encoder_unittest.cc
@@ -4,8 +4,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/mojo/clients/mojo_cdm.cc b/media/mojo/clients/mojo_cdm.cc
index 0f0bc75..7084d86a 100644
--- a/media/mojo/clients/mojo_cdm.cc
+++ b/media/mojo/clients/mojo_cdm.cc
@@ -8,8 +8,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
diff --git a/media/mojo/clients/mojo_cdm_factory.cc b/media/mojo/clients/mojo_cdm_factory.cc
index 11ffcfc..60ee6ff 100644
--- a/media/mojo/clients/mojo_cdm_factory.cc
+++ b/media/mojo/clients/mojo_cdm_factory.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/scoped_refptr.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/mojo/clients/mojo_cdm_unittest.cc b/media/mojo/clients/mojo_cdm_unittest.cc
index d3c3bf35..5d922db 100644
--- a/media/mojo/clients/mojo_cdm_unittest.cc
+++ b/media/mojo/clients/mojo_cdm_unittest.cc
@@ -8,7 +8,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
#include "base/test/test_message_loop.h"
diff --git a/media/mojo/clients/mojo_decryptor.cc b/media/mojo/clients/mojo_decryptor.cc
index 73447f7f..9db1b5fa 100644
--- a/media/mojo/clients/mojo_decryptor.cc
+++ b/media/mojo/clients/mojo_decryptor.cc
@@ -9,7 +9,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/numerics/safe_conversions.h"
#include "media/base/audio_buffer.h"
#include "media/base/decoder_buffer.h"
diff --git a/media/mojo/clients/mojo_decryptor_unittest.cc b/media/mojo/clients/mojo_decryptor_unittest.cc
index a223a40..cee2c2c 100644
--- a/media/mojo/clients/mojo_decryptor_unittest.cc
+++ b/media/mojo/clients/mojo_decryptor_unittest.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/test_message_loop.h"
#include "media/base/decryptor.h"
diff --git a/media/mojo/clients/mojo_demuxer_stream_impl.cc b/media/mojo/clients/mojo_demuxer_stream_impl.cc
index a0e32a3..04b567e 100644
--- a/media/mojo/clients/mojo_demuxer_stream_impl.cc
+++ b/media/mojo/clients/mojo_demuxer_stream_impl.cc
@@ -7,7 +7,7 @@
#include <stdint.h>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/numerics/safe_conversions.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/decoder_buffer.h"
diff --git a/media/mojo/clients/mojo_demuxer_stream_impl.h b/media/mojo/clients/mojo_demuxer_stream_impl.h
index e7e11f13..1011405d 100644
--- a/media/mojo/clients/mojo_demuxer_stream_impl.h
+++ b/media/mojo/clients/mojo_demuxer_stream_impl.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "media/base/demuxer_stream.h"
diff --git a/media/mojo/clients/mojo_renderer.cc b/media/mojo/clients/mojo_renderer.cc
index a44a39b..2758065 100644
--- a/media/mojo/clients/mojo_renderer.cc
+++ b/media/mojo/clients/mojo_renderer.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/mojo/clients/mojo_renderer_unittest.cc b/media/mojo/clients/mojo_renderer_unittest.cc
index 381103f..191d91e8 100644
--- a/media/mojo/clients/mojo_renderer_unittest.cc
+++ b/media/mojo/clients/mojo_renderer_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/media/mojo/clients/mojo_video_decoder.cc b/media/mojo/clients/mojo_video_decoder.cc
index 0f535acd..57962d7 100644
--- a/media/mojo/clients/mojo_video_decoder.cc
+++ b/media/mojo/clients/mojo_video_decoder.cc
@@ -4,10 +4,10 @@
#include "media/mojo/clients/mojo_video_decoder.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/scoped_refptr.h"
diff --git a/media/mojo/clients/mojo_video_encode_accelerator.cc b/media/mojo/clients/mojo_video_encode_accelerator.cc
index 00eba20..6fe7a38 100644
--- a/media/mojo/clients/mojo_video_encode_accelerator.cc
+++ b/media/mojo/clients/mojo_video_encode_accelerator.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_macros.h"
diff --git a/media/mojo/clients/win/media_foundation_renderer_client.cc b/media/mojo/clients/win/media_foundation_renderer_client.cc
index c2abff2..5a7c00d4 100644
--- a/media/mojo/clients/win/media_foundation_renderer_client.cc
+++ b/media/mojo/clients/win/media_foundation_renderer_client.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/bind_post_task.h"
#include "base/task/sequenced_task_runner.h"
#include "media/base/media_log.h"
diff --git a/media/mojo/clients/win/media_foundation_renderer_client.h b/media/mojo/clients/win/media_foundation_renderer_client.h
index 1eb8a7d..7aff950 100644
--- a/media/mojo/clients/win/media_foundation_renderer_client.h
+++ b/media/mojo/clients/win/media_foundation_renderer_client.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_MOJO_CLIENTS_WIN_MEDIA_FOUNDATION_RENDERER_CLIENT_H_
#define MEDIA_MOJO_CLIENTS_WIN_MEDIA_FOUNDATION_RENDERER_CLIENT_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/mojo/clients/win/media_foundation_renderer_client_factory.h b/media/mojo/clients/win/media_foundation_renderer_client_factory.h
index d1ba1e6..1110c03 100644
--- a/media/mojo/clients/win/media_foundation_renderer_client_factory.h
+++ b/media/mojo/clients/win/media_foundation_renderer_client_factory.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_MOJO_CLIENTS_WIN_MEDIA_FOUNDATION_RENDERER_CLIENT_FACTORY_H_
#define MEDIA_MOJO_CLIENTS_WIN_MEDIA_FOUNDATION_RENDERER_CLIENT_FACTORY_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/mojo/common/mojo_data_pipe_read_write.cc b/media/mojo/common/mojo_data_pipe_read_write.cc
index f4e3705..33ffe31f 100644
--- a/media/mojo/common/mojo_data_pipe_read_write.cc
+++ b/media/mojo/common/mojo_data_pipe_read_write.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/mojo/common/mojo_decoder_buffer_converter.cc b/media/mojo/common/mojo_decoder_buffer_converter.cc
index 0da8239..149e1b53 100644
--- a/media/mojo/common/mojo_decoder_buffer_converter.cc
+++ b/media/mojo/common/mojo_decoder_buffer_converter.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <tuple>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/mojo/mojom/video_frame_metadata_mojom_traits.cc b/media/mojo/mojom/video_frame_metadata_mojom_traits.cc
index 31891a4..c0b3514 100644
--- a/media/mojo/mojom/video_frame_metadata_mojom_traits.cc
+++ b/media/mojo/mojom/video_frame_metadata_mojom_traits.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "build/build_config.h"
#include "mojo/public/cpp/base/time_mojom_traits.h"
diff --git a/media/mojo/mojom/video_frame_metadata_mojom_traits_unittest.cc b/media/mojo/mojom/video_frame_metadata_mojom_traits_unittest.cc
index a19524e5..61859cf 100644
--- a/media/mojo/mojom/video_frame_metadata_mojom_traits_unittest.cc
+++ b/media/mojo/mojom/video_frame_metadata_mojom_traits_unittest.cc
@@ -4,7 +4,7 @@
#include "media/mojo/mojom/video_frame_metadata_mojom_traits.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ref_counted.h"
#include "base/test/task_environment.h"
#include "build/build_config.h"
diff --git a/media/mojo/mojom/video_frame_mojom_traits.cc b/media/mojo/mojom/video_frame_mojom_traits.cc
index cdc4498..8587820 100644
--- a/media/mojo/mojom/video_frame_mojom_traits.cc
+++ b/media/mojo/mojom/video_frame_mojom_traits.cc
@@ -7,7 +7,7 @@
#include <utility>
#include <vector>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/unsafe_shared_memory_region.h"
#include "base/time/time.h"
diff --git a/media/mojo/mojom/video_frame_mojom_traits_unittest.cc b/media/mojo/mojom/video_frame_mojom_traits_unittest.cc
index 6839dfe..3ec98b2 100644
--- a/media/mojo/mojom/video_frame_mojom_traits_unittest.cc
+++ b/media/mojo/mojom/video_frame_mojom_traits_unittest.cc
@@ -4,7 +4,7 @@
#include "media/mojo/mojom/video_frame_mojom_traits.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ref_counted.h"
#include "base/test/task_environment.h"
#include "build/build_config.h"
diff --git a/media/mojo/services/android_mojo_media_client.cc b/media/mojo/services/android_mojo_media_client.cc
index 4870c763..4b46563d 100644
--- a/media/mojo/services/android_mojo_media_client.cc
+++ b/media/mojo/services/android_mojo_media_client.cc
@@ -8,7 +8,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/single_thread_task_runner.h"
#include "media/base/android/android_cdm_factory.h"
#include "media/base/audio_decoder.h"
diff --git a/media/mojo/services/cdm_service.cc b/media/mojo/services/cdm_service.cc
index 4cc301b..e584cbad 100644
--- a/media/mojo/services/cdm_service.cc
+++ b/media/mojo/services/cdm_service.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/media/mojo/services/cdm_service_broker_unittest.cc b/media/mojo/services/cdm_service_broker_unittest.cc
index 32e8f13..1df3c1ac 100644
--- a/media/mojo/services/cdm_service_broker_unittest.cc
+++ b/media/mojo/services/cdm_service_broker_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/test/task_environment.h"
#include "build/build_config.h"
diff --git a/media/mojo/services/cdm_service_unittest.cc b/media/mojo/services/cdm_service_unittest.cc
index c3da53a1..cb8e83c 100644
--- a/media/mojo/services/cdm_service_unittest.cc
+++ b/media/mojo/services/cdm_service_unittest.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <tuple>
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
diff --git a/media/mojo/services/deferred_destroy_unique_receiver_set.h b/media/mojo/services/deferred_destroy_unique_receiver_set.h
index 932eed5f..0b1ad2f 100644
--- a/media/mojo/services/deferred_destroy_unique_receiver_set.h
+++ b/media/mojo/services/deferred_destroy_unique_receiver_set.h
@@ -10,7 +10,7 @@
#include <map>
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/weak_ptr.h"
diff --git a/media/mojo/services/gpu_mojo_media_client.cc b/media/mojo/services/gpu_mojo_media_client.cc
index 9638640..b10f1db9 100644
--- a/media/mojo/services/gpu_mojo_media_client.cc
+++ b/media/mojo/services/gpu_mojo_media_client.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_functions.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/mojo/services/interface_factory_impl.cc b/media/mojo/services/interface_factory_impl.cc
index 749e6cc..c152866d0 100644
--- a/media/mojo/services/interface_factory_impl.cc
+++ b/media/mojo/services/interface_factory_impl.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/guid.h"
#include "base/logging.h"
#include "base/task/single_thread_task_runner.h"
@@ -29,7 +29,7 @@
#if BUILDFLAG(ENABLE_MOJO_RENDERER) || BUILDFLAG(ENABLE_CAST_RENDERER) || \
BUILDFLAG(IS_WIN)
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "media/base/renderer.h"
#include "media/mojo/services/mojo_renderer_service.h"
#endif
diff --git a/media/mojo/services/media_foundation_gpu_info_monitor.h b/media/mojo/services/media_foundation_gpu_info_monitor.h
index 4f1d017..4d5cf1a6 100644
--- a/media/mojo/services/media_foundation_gpu_info_monitor.h
+++ b/media/mojo/services/media_foundation_gpu_info_monitor.h
@@ -5,8 +5,8 @@
#ifndef MEDIA_MOJO_SERVICES_MEDIA_FOUNDATION_GPU_INFO_MONITOR_H_
#define MEDIA_MOJO_SERVICES_MEDIA_FOUNDATION_GPU_INFO_MONITOR_H_
-#include "base/callback.h"
#include "base/callback_list.h"
+#include "base/functional/callback.h"
#include "base/win/windows_types.h"
#include "gpu/config/gpu_info.h"
#include "media/mojo/services/media_mojo_export.h"
diff --git a/media/mojo/services/media_foundation_renderer_wrapper.cc b/media/mojo/services/media_foundation_renderer_wrapper.cc
index 7e2d15b..8d87012 100644
--- a/media/mojo/services/media_foundation_renderer_wrapper.cc
+++ b/media/mojo/services/media_foundation_renderer_wrapper.cc
@@ -4,7 +4,7 @@
#include "media/mojo/services/media_foundation_renderer_wrapper.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/sequenced_task_runner.h"
#include "media/base/win/mf_helpers.h"
#include "media/mojo/mojom/renderer_extensions.mojom.h"
diff --git a/media/mojo/services/media_foundation_renderer_wrapper.h b/media/mojo/services/media_foundation_renderer_wrapper.h
index 3e000ed..5eb4232 100644
--- a/media/mojo/services/media_foundation_renderer_wrapper.h
+++ b/media/mojo/services/media_foundation_renderer_wrapper.h
@@ -5,8 +5,8 @@
#ifndef MEDIA_MOJO_SERVICES_MEDIA_FOUNDATION_RENDERER_WRAPPER_H_
#define MEDIA_MOJO_SERVICES_MEDIA_FOUNDATION_RENDERER_WRAPPER_H_
-#include "base/callback.h"
#include "base/callback_list.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/mojo/services/media_foundation_service.cc b/media/mojo/services/media_foundation_service.cc
index 26c2c61..8f0caa6 100644
--- a/media/mojo/services/media_foundation_service.cc
+++ b/media/mojo/services/media_foundation_service.cc
@@ -7,10 +7,10 @@
#include <map>
#include <memory>
-#include "base/bind.h"
#include "base/check.h"
#include "base/feature_list.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/path_service.h"
diff --git a/media/mojo/services/media_foundation_service.h b/media/mojo/services/media_foundation_service.h
index d575629..4917b4fb 100644
--- a/media/mojo/services/media_foundation_service.h
+++ b/media/mojo/services/media_foundation_service.h
@@ -5,8 +5,8 @@
#ifndef MEDIA_MOJO_SERVICES_MEDIA_FOUNDATION_SERVICE_H_
#define MEDIA_MOJO_SERVICES_MEDIA_FOUNDATION_SERVICE_H_
-#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/functional/callback.h"
#include "gpu/config/gpu_info.h"
#include "media/mojo/mojom/frame_interface_factory.mojom.h"
#include "media/mojo/mojom/interface_factory.mojom.h"
diff --git a/media/mojo/services/media_foundation_service_broker.h b/media/mojo/services/media_foundation_service_broker.h
index 4d6c3d5..c7befcf 100644
--- a/media/mojo/services/media_foundation_service_broker.h
+++ b/media/mojo/services/media_foundation_service_broker.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/functional/callback.h"
#include "gpu/config/gpu_info.h"
#include "gpu/config/gpu_util.h"
#include "media/mojo/mojom/media_foundation_service.mojom.h"
diff --git a/media/mojo/services/media_metrics_provider_unittest.cc b/media/mojo/services/media_metrics_provider_unittest.cc
index 2c29fa0..9c77c49 100644
--- a/media/mojo/services/media_metrics_provider_unittest.cc
+++ b/media/mojo/services/media_metrics_provider_unittest.cc
@@ -5,8 +5,8 @@
#include <stddef.h>
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/test/test_message_loop.h"
diff --git a/media/mojo/services/media_resource_shim.cc b/media/mojo/services/media_resource_shim.cc
index 9230e3f..6a639cb 100644
--- a/media/mojo/services/media_resource_shim.cc
+++ b/media/mojo/services/media_resource_shim.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
namespace media {
diff --git a/media/mojo/services/media_resource_shim.h b/media/mojo/services/media_resource_shim.h
index 9827611..f7e51526 100644
--- a/media/mojo/services/media_resource_shim.h
+++ b/media/mojo/services/media_resource_shim.h
@@ -7,7 +7,7 @@
#include <stddef.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "media/base/media_resource.h"
#include "media/mojo/services/mojo_demuxer_stream_adapter.h"
diff --git a/media/mojo/services/media_service.cc b/media/mojo/services/media_service.cc
index cc3a2d2..f9806d8 100644
--- a/media/mojo/services/media_service.cc
+++ b/media/mojo/services/media_service.cc
@@ -4,8 +4,8 @@
#include "media/mojo/services/media_service.h"
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "media/media_buildflags.h"
#include "media/mojo/mojom/interface_factory.mojom.h"
#include "media/mojo/services/interface_factory_impl.h"
diff --git a/media/mojo/services/media_service_unittest.cc b/media/mojo/services/media_service_unittest.cc
index d2435b5..8e8901a0 100644
--- a/media/mojo/services/media_service_unittest.cc
+++ b/media/mojo/services/media_service_unittest.cc
@@ -8,8 +8,8 @@
#include <tuple>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/task_environment.h"
diff --git a/media/mojo/services/mojo_audio_decoder_service.cc b/media/mojo/services/mojo_audio_decoder_service.cc
index 2e2335c1..f419dc2 100644
--- a/media/mojo/services/mojo_audio_decoder_service.cc
+++ b/media/mojo/services/mojo_audio_decoder_service.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/types/optional_util.h"
#include "media/base/content_decryption_module.h"
diff --git a/media/mojo/services/mojo_audio_encoder_service.cc b/media/mojo/services/mojo_audio_encoder_service.cc
index 57f8e79..b51375bc 100644
--- a/media/mojo/services/mojo_audio_encoder_service.cc
+++ b/media/mojo/services/mojo_audio_encoder_service.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "media/mojo/common/media_type_converters.h"
diff --git a/media/mojo/services/mojo_audio_input_stream.cc b/media/mojo/services/mojo_audio_input_stream.cc
index 22afa18..a3f03b9 100644
--- a/media/mojo/services/mojo_audio_input_stream.cc
+++ b/media/mojo/services/mojo_audio_input_stream.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/read_only_shared_memory_region.h"
#include "base/sync_socket.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/mojo/services/mojo_audio_input_stream_unittest.cc b/media/mojo/services/mojo_audio_input_stream_unittest.cc
index 61ccd1f..b69a292 100644
--- a/media/mojo/services/mojo_audio_input_stream_unittest.cc
+++ b/media/mojo/services/mojo_audio_input_stream_unittest.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/read_only_shared_memory_region.h"
diff --git a/media/mojo/services/mojo_cdm_allocator.cc b/media/mojo/services/mojo_cdm_allocator.cc
index 1025f856..73493ff 100644
--- a/media/mojo/services/mojo_cdm_allocator.cc
+++ b/media/mojo/services/mojo_cdm_allocator.cc
@@ -7,9 +7,9 @@
#include <limits>
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/read_only_shared_memory_region.h"
#include "base/memory/shared_memory_mapping.h"
#include "base/numerics/safe_conversions.h"
diff --git a/media/mojo/services/mojo_cdm_file_io.cc b/media/mojo/services/mojo_cdm_file_io.cc
index a3b2aaa..dc07c11 100644
--- a/media/mojo/services/mojo_cdm_file_io.cc
+++ b/media/mojo/services/mojo_cdm_file_io.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/metrics/histogram_macros.h"
#include "base/task/single_thread_task_runner.h"
#include "base/trace_event/trace_event.h"
diff --git a/media/mojo/services/mojo_cdm_file_io.h b/media/mojo/services/mojo_cdm_file_io.h
index 176e440..0d8a32d 100644
--- a/media/mojo/services/mojo_cdm_file_io.h
+++ b/media/mojo/services/mojo_cdm_file_io.h
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "media/cdm/api/content_decryption_module.h"
diff --git a/media/mojo/services/mojo_cdm_helper_unittest.cc b/media/mojo/services/mojo_cdm_helper_unittest.cc
index b6985c4..ca93d82b2 100644
--- a/media/mojo/services/mojo_cdm_helper_unittest.cc
+++ b/media/mojo/services/mojo_cdm_helper_unittest.cc
@@ -4,7 +4,7 @@
#include "media/mojo/services/mojo_cdm_helper.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "build/build_config.h"
diff --git a/media/mojo/services/mojo_cdm_promise.cc b/media/mojo/services/mojo_cdm_promise.cc
index 05702fb3..906f4ae 100644
--- a/media/mojo/services/mojo_cdm_promise.cc
+++ b/media/mojo/services/mojo_cdm_promise.cc
@@ -8,8 +8,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "media/base/content_decryption_module.h"
#include "media/base/decryptor.h"
#include "media/mojo/mojom/content_decryption_module.mojom.h"
diff --git a/media/mojo/services/mojo_cdm_promise.h b/media/mojo/services/mojo_cdm_promise.h
index 19027a0..d09b1dba 100644
--- a/media/mojo/services/mojo_cdm_promise.h
+++ b/media/mojo/services/mojo_cdm_promise.h
@@ -7,7 +7,7 @@
#include <stdint.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "media/base/cdm_promise.h"
namespace media {
diff --git a/media/mojo/services/mojo_cdm_service.cc b/media/mojo/services/mojo_cdm_service.cc
index d6d1ecb..42df460 100644
--- a/media/mojo/services/mojo_cdm_service.cc
+++ b/media/mojo/services/mojo_cdm_service.cc
@@ -8,7 +8,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/synchronization/lock.h"
#include "base/types/optional_util.h"
#include "build/build_config.h"
diff --git a/media/mojo/services/mojo_cdm_service.h b/media/mojo/services/mojo_cdm_service.h
index bff9670c..f5d32f1 100644
--- a/media/mojo/services/mojo_cdm_service.h
+++ b/media/mojo/services/mojo_cdm_service.h
@@ -9,8 +9,8 @@
#include <memory>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/media/mojo/services/mojo_decryptor_service.cc b/media/mojo/services/mojo_decryptor_service.cc
index 9d12386..929fe7c4 100644
--- a/media/mojo/services/mojo_decryptor_service.cc
+++ b/media/mojo/services/mojo_decryptor_service.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/numerics/safe_conversions.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/cdm_context.h"
diff --git a/media/mojo/services/mojo_decryptor_service.h b/media/mojo/services/mojo_decryptor_service.h
index 5250d7b..4d043d54 100644
--- a/media/mojo/services/mojo_decryptor_service.h
+++ b/media/mojo/services/mojo_decryptor_service.h
@@ -8,8 +8,8 @@
#include <stddef.h>
#include <stdint.h>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/media/mojo/services/mojo_demuxer_stream_adapter.cc b/media/mojo/services/mojo_demuxer_stream_adapter.cc
index e705e8f9..d5dd403 100644
--- a/media/mojo/services/mojo_demuxer_stream_adapter.cc
+++ b/media/mojo/services/mojo_demuxer_stream_adapter.cc
@@ -9,8 +9,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/numerics/safe_conversions.h"
#include "media/base/decoder_buffer.h"
#include "media/mojo/common/media_type_converters.h"
diff --git a/media/mojo/services/mojo_media_drm_storage.cc b/media/mojo/services/mojo_media_drm_storage.cc
index 3dcf5c5..d9efabb 100644
--- a/media/mojo/services/mojo_media_drm_storage.cc
+++ b/media/mojo/services/mojo_media_drm_storage.cc
@@ -7,8 +7,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/unguessable_token.h"
#include "media/mojo/mojom/media_drm_storage.mojom.h"
#include "mojo/public/cpp/bindings/callback_helpers.h"
diff --git a/media/mojo/services/mojo_media_log.cc b/media/mojo/services/mojo_media_log.cc
index b8c54dfc..4eccb505 100644
--- a/media/mojo/services/mojo_media_log.cc
+++ b/media/mojo/services/mojo_media_log.cc
@@ -4,7 +4,7 @@
#include "media/mojo/services/mojo_media_log.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/mojo/services/mojo_provision_fetcher.cc b/media/mojo/services/mojo_provision_fetcher.cc
index e9f6de1..2d38c075 100644
--- a/media/mojo/services/mojo_provision_fetcher.cc
+++ b/media/mojo/services/mojo_provision_fetcher.cc
@@ -4,7 +4,7 @@
#include "media/mojo/services/mojo_provision_fetcher.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
namespace media {
diff --git a/media/mojo/services/mojo_renderer_service.cc b/media/mojo/services/mojo_renderer_service.cc
index e3cf1c1..52f1e89 100644
--- a/media/mojo/services/mojo_renderer_service.cc
+++ b/media/mojo/services/mojo_renderer_service.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/time/time.h"
#include "media/base/cdm_context.h"
diff --git a/media/mojo/services/mojo_renderer_service.h b/media/mojo/services/mojo_renderer_service.h
index 320de0f..2db458a0 100644
--- a/media/mojo/services/mojo_renderer_service.h
+++ b/media/mojo/services/mojo_renderer_service.h
@@ -8,8 +8,8 @@
#include <stdint.h>
#include <memory>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
diff --git a/media/mojo/services/mojo_video_decoder_service.cc b/media/mojo/services/mojo_video_decoder_service.cc
index baca7c3a..bc22e0ba 100644
--- a/media/mojo/services/mojo_video_decoder_service.cc
+++ b/media/mojo/services/mojo_video_decoder_service.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
#include "base/strings/stringprintf.h"
diff --git a/media/mojo/services/mojo_video_encode_accelerator_service_unittest.cc b/media/mojo/services/mojo_video_encode_accelerator_service_unittest.cc
index 530a69f..80f38b3e 100644
--- a/media/mojo/services/mojo_video_encode_accelerator_service_unittest.cc
+++ b/media/mojo/services/mojo_video_encode_accelerator_service_unittest.cc
@@ -4,8 +4,8 @@
#include <stddef.h>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/memory/unsafe_shared_memory_region.h"
#include "base/run_loop.h"
diff --git a/media/mojo/services/stable_video_decoder_factory_service.h b/media/mojo/services/stable_video_decoder_factory_service.h
index c46f2c2..62bdfcc7 100644
--- a/media/mojo/services/stable_video_decoder_factory_service.h
+++ b/media/mojo/services/stable_video_decoder_factory_service.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_MOJO_SERVICES_STABLE_VIDEO_DECODER_FACTORY_SERVICE_H_
#define MEDIA_MOJO_SERVICES_STABLE_VIDEO_DECODER_FACTORY_SERVICE_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/sequence_checker.h"
#include "media/mojo/mojom/stable/stable_video_decoder.mojom.h"
#include "media/mojo/services/media_mojo_export.h"
diff --git a/media/mojo/services/test_mojo_media_client.cc b/media/mojo/services/test_mojo_media_client.cc
index 1c019e8..207e650 100644
--- a/media/mojo/services/test_mojo_media_client.cc
+++ b/media/mojo/services/test_mojo_media_client.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
#include "build/build_config.h"
diff --git a/media/mojo/services/video_decode_perf_history.cc b/media/mojo/services/video_decode_perf_history.cc
index 945bdd7..b2f5dde 100644
--- a/media/mojo/services/video_decode_perf_history.cc
+++ b/media/mojo/services/video_decode_perf_history.cc
@@ -4,9 +4,9 @@
#include "media/mojo/services/video_decode_perf_history.h"
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/field_trial_params.h"
diff --git a/media/mojo/services/video_decode_perf_history.h b/media/mojo/services/video_decode_perf_history.h
index 5dea152..e3de77f 100644
--- a/media/mojo/services/video_decode_perf_history.h
+++ b/media/mojo/services/video_decode_perf_history.h
@@ -9,7 +9,7 @@
#include <memory>
#include <queue>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/metrics/field_trial_params.h"
#include "base/sequence_checker.h"
#include "base/supports_user_data.h"
diff --git a/media/mojo/services/video_decode_perf_history_unittest.cc b/media/mojo/services/video_decode_perf_history_unittest.cc
index eebcef7..09be127 100644
--- a/media/mojo/services/video_decode_perf_history_unittest.cc
+++ b/media/mojo/services/video_decode_perf_history_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/mojo/services/video_decode_stats_recorder.cc b/media/mojo/services/video_decode_stats_recorder.cc
index 084305f..966a83f 100644
--- a/media/mojo/services/video_decode_stats_recorder.cc
+++ b/media/mojo/services/video_decode_stats_recorder.cc
@@ -4,7 +4,7 @@
#include "media/mojo/services/video_decode_stats_recorder.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
#include "base/logging.h"
diff --git a/media/mojo/services/video_decode_stats_recorder_unittest.cc b/media/mojo/services/video_decode_stats_recorder_unittest.cc
index dc164be..657ce51f 100644
--- a/media/mojo/services/video_decode_stats_recorder_unittest.cc
+++ b/media/mojo/services/video_decode_stats_recorder_unittest.cc
@@ -5,7 +5,7 @@
#include <memory>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "media/base/video_codecs.h"
#include "media/learning/common/value.h"
diff --git a/media/mojo/services/watch_time_recorder.cc b/media/mojo/services/watch_time_recorder.cc
index 98f36ba..75f4420e1 100644
--- a/media/mojo/services/watch_time_recorder.cc
+++ b/media/mojo/services/watch_time_recorder.cc
@@ -6,9 +6,9 @@
#include <cmath>
-#include "base/callback.h"
#include "base/containers/contains.h"
#include "base/containers/flat_set.h"
+#include "base/functional/callback.h"
#include "base/hash/hash.h"
#include "base/metrics/histogram_functions.h"
#include "base/ranges/algorithm.h"
diff --git a/media/mojo/services/watch_time_recorder_unittest.cc b/media/mojo/services/watch_time_recorder_unittest.cc
index 56eaaeb..f6f6dc59 100644
--- a/media/mojo/services/watch_time_recorder_unittest.cc
+++ b/media/mojo/services/watch_time_recorder_unittest.cc
@@ -10,9 +10,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/hash/hash.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/mojo/services/webrtc_video_perf_history.cc b/media/mojo/services/webrtc_video_perf_history.cc
index c1775e3b..78146e13 100644
--- a/media/mojo/services/webrtc_video_perf_history.cc
+++ b/media/mojo/services/webrtc_video_perf_history.cc
@@ -6,9 +6,9 @@
#include <math.h>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/field_trial_params.h"
diff --git a/media/mojo/services/webrtc_video_perf_history.h b/media/mojo/services/webrtc_video_perf_history.h
index ce724ce..5cde43b4 100644
--- a/media/mojo/services/webrtc_video_perf_history.h
+++ b/media/mojo/services/webrtc_video_perf_history.h
@@ -9,7 +9,7 @@
#include <memory>
#include <queue>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/metrics/field_trial_params.h"
#include "base/sequence_checker.h"
#include "base/supports_user_data.h"
diff --git a/media/mojo/services/webrtc_video_perf_history_unittest.cc b/media/mojo/services/webrtc_video_perf_history_unittest.cc
index 1a9ea56..d5bbe2a 100644
--- a/media/mojo/services/webrtc_video_perf_history_unittest.cc
+++ b/media/mojo/services/webrtc_video_perf_history_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/mojo/services/webrtc_video_perf_recorder.cc b/media/mojo/services/webrtc_video_perf_recorder.cc
index a0cfacab..e1ea761 100644
--- a/media/mojo/services/webrtc_video_perf_recorder.cc
+++ b/media/mojo/services/webrtc_video_perf_recorder.cc
@@ -4,7 +4,7 @@
#include "media/mojo/services/webrtc_video_perf_recorder.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "mojo/public/cpp/bindings/self_owned_receiver.h"
diff --git a/media/mojo/services/webrtc_video_perf_recorder_unittest.cc b/media/mojo/services/webrtc_video_perf_recorder_unittest.cc
index 8d9a9ab..36e9349 100644
--- a/media/mojo/services/webrtc_video_perf_recorder_unittest.cc
+++ b/media/mojo/services/webrtc_video_perf_recorder_unittest.cc
@@ -4,7 +4,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "media/base/video_codecs.h"
#include "media/mojo/mojom/media_types.mojom.h"
#include "media/mojo/services/webrtc_video_perf_recorder.h"
diff --git a/media/mojo/test/mojo_video_decoder_integration_test.cc b/media/mojo/test/mojo_video_decoder_integration_test.cc
index 806635cf6..6e72151 100644
--- a/media/mojo/test/mojo_video_decoder_integration_test.cc
+++ b/media/mojo/test/mojo_video_decoder_integration_test.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/mojo/test/mojo_video_encode_accelerator_integration_test.cc b/media/mojo/test/mojo_video_encode_accelerator_integration_test.cc
index 886731f..cc916ff 100644
--- a/media/mojo/test/mojo_video_encode_accelerator_integration_test.cc
+++ b/media/mojo/test/mojo_video_encode_accelerator_integration_test.cc
@@ -5,7 +5,7 @@
#include <stddef.h>
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/read_only_shared_memory_region.h"
#include "base/memory/unsafe_shared_memory_region.h"
diff --git a/media/muxers/live_webm_muxer_delegate.h b/media/muxers/live_webm_muxer_delegate.h
index 02e3f606..37b605d9 100644
--- a/media/muxers/live_webm_muxer_delegate.h
+++ b/media/muxers/live_webm_muxer_delegate.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_MUXERS_LIVE_WEBM_MUXER_DELEGATE_H_
#define MEDIA_MUXERS_LIVE_WEBM_MUXER_DELEGATE_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/strings/string_piece.h"
#include "base/thread_annotations.h"
#include "media/base/media_export.h"
diff --git a/media/muxers/webm_muxer_fuzzertest.cc b/media/muxers/webm_muxer_fuzzertest.cc
index 02322f4..1fa9b3d 100644
--- a/media/muxers/webm_muxer_fuzzertest.cc
+++ b/media/muxers/webm_muxer_fuzzertest.cc
@@ -8,7 +8,7 @@
#include <memory>
#include <random>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/run_loop.h"
#include "base/strings/string_piece.h"
diff --git a/media/muxers/webm_muxer_unittest.cc b/media/muxers/webm_muxer_unittest.cc
index f3c2eaf..db4ebc7 100644
--- a/media/muxers/webm_muxer_unittest.cc
+++ b/media/muxers/webm_muxer_unittest.cc
@@ -9,7 +9,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
diff --git a/media/remoting/courier_renderer.cc b/media/remoting/courier_renderer.cc
index 8f750dc..eb93e17 100644
--- a/media/remoting/courier_renderer.cc
+++ b/media/remoting/courier_renderer.cc
@@ -9,8 +9,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/numerics/safe_math.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/remoting/courier_renderer.h b/media/remoting/courier_renderer.h
index b7c2231..4e4e0d4 100644
--- a/media/remoting/courier_renderer.h
+++ b/media/remoting/courier_renderer.h
@@ -9,8 +9,8 @@
#include <tuple>
#include <utility>
-#include "base/callback.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/media/remoting/courier_renderer_unittest.cc b/media/remoting/courier_renderer_unittest.cc
index 630abe54..44d88e1f 100644
--- a/media/remoting/courier_renderer_unittest.cc
+++ b/media/remoting/courier_renderer_unittest.cc
@@ -8,8 +8,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/simple_test_tick_clock.h"
diff --git a/media/remoting/demuxer_stream_adapter.cc b/media/remoting/demuxer_stream_adapter.cc
index 35427a4..d0d0a22 100644
--- a/media/remoting/demuxer_stream_adapter.cc
+++ b/media/remoting/demuxer_stream_adapter.cc
@@ -7,8 +7,8 @@
#include <utility>
#include "base/base64.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
#include "components/cast_streaming/public/remoting_proto_enum_utils.h"
diff --git a/media/remoting/demuxer_stream_adapter.h b/media/remoting/demuxer_stream_adapter.h
index 698bcee..04e4bb9 100644
--- a/media/remoting/demuxer_stream_adapter.h
+++ b/media/remoting/demuxer_stream_adapter.h
@@ -10,7 +10,7 @@
#include <memory>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/remoting/demuxer_stream_adapter_unittest.cc b/media/remoting/demuxer_stream_adapter_unittest.cc
index 7f67a7e..b017019 100644
--- a/media/remoting/demuxer_stream_adapter_unittest.cc
+++ b/media/remoting/demuxer_stream_adapter_unittest.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/task_environment.h"
diff --git a/media/remoting/end2end_test_renderer.cc b/media/remoting/end2end_test_renderer.cc
index cb9704c..471821c 100644
--- a/media/remoting/end2end_test_renderer.cc
+++ b/media/remoting/end2end_test_renderer.cc
@@ -7,10 +7,10 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/check.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/notreached.h"
#include "base/task/single_thread_task_runner.h"
#include "components/cast_streaming/public/remoting_proto_utils.h"
diff --git a/media/remoting/fake_media_resource.cc b/media/remoting/fake_media_resource.cc
index 49a6b9e..f98b145 100644
--- a/media/remoting/fake_media_resource.cc
+++ b/media/remoting/fake_media_resource.cc
@@ -6,7 +6,7 @@
#include <vector>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "media/base/decoder_buffer.h"
#include "media/base/media_util.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/remoting/fake_remoter.cc b/media/remoting/fake_remoter.cc
index cce2f9cc..55b5fd48 100644
--- a/media/remoting/fake_remoter.cc
+++ b/media/remoting/fake_remoter.cc
@@ -6,9 +6,9 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/single_thread_task_runner.h"
#include "build/buildflag.h"
#include "media/media_buildflags.h"
diff --git a/media/remoting/receiver.cc b/media/remoting/receiver.cc
index cf5da36a..f6bc430 100644
--- a/media/remoting/receiver.cc
+++ b/media/remoting/receiver.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/notreached.h"
#include "base/task/bind_post_task.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/remoting/receiver.h b/media/remoting/receiver.h
index de03679..a11bd95 100644
--- a/media/remoting/receiver.h
+++ b/media/remoting/receiver.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/media/remoting/renderer_controller.cc b/media/remoting/renderer_controller.cc
index b281917..b2310fe 100644
--- a/media/remoting/renderer_controller.cc
+++ b/media/remoting/renderer_controller.cc
@@ -4,8 +4,8 @@
#include "media/remoting/renderer_controller.h"
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/time/default_tick_clock.h"
#include "base/time/tick_clock.h"
diff --git a/media/remoting/renderer_controller.h b/media/remoting/renderer_controller.h
index bfef68f..dd365cb 100644
--- a/media/remoting/renderer_controller.h
+++ b/media/remoting/renderer_controller.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
diff --git a/media/remoting/renderer_controller_unittest.cc b/media/remoting/renderer_controller_unittest.cc
index 533e28f..9fbbee1 100644
--- a/media/remoting/renderer_controller_unittest.cc
+++ b/media/remoting/renderer_controller_unittest.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/run_loop.h"
#include "base/test/simple_test_tick_clock.h"
#include "base/test/task_environment.h"
diff --git a/media/remoting/stream_provider.cc b/media/remoting/stream_provider.cc
index 7f3dd65..f6e53c2 100644
--- a/media/remoting/stream_provider.cc
+++ b/media/remoting/stream_provider.cc
@@ -5,10 +5,10 @@
#include "media/remoting/stream_provider.h"
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/task/bind_post_task.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/remoting/stream_provider.h b/media/remoting/stream_provider.h
index d655469..8fff1b1 100644
--- a/media/remoting/stream_provider.h
+++ b/media/remoting/stream_provider.h
@@ -5,8 +5,8 @@
#ifndef MEDIA_REMOTING_STREAM_PROVIDER_H_
#define MEDIA_REMOTING_STREAM_PROVIDER_H_
-#include "base/callback_forward.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/media/renderers/audio_renderer_impl.cc b/media/renderers/audio_renderer_impl.cc
index 301f77f..8515895 100644
--- a/media/renderers/audio_renderer_impl.cc
+++ b/media/renderers/audio_renderer_impl.cc
@@ -10,10 +10,10 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/power_monitor/power_monitor.h"
diff --git a/media/renderers/audio_renderer_impl_unittest.cc b/media/renderers/audio_renderer_impl_unittest.cc
index d1d50e0..fe996dc81 100644
--- a/media/renderers/audio_renderer_impl_unittest.cc
+++ b/media/renderers/audio_renderer_impl_unittest.cc
@@ -8,9 +8,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/scoped_refptr.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
diff --git a/media/renderers/decrypting_renderer.cc b/media/renderers/decrypting_renderer.cc
index df26ad7..84e0576 100644
--- a/media/renderers/decrypting_renderer.cc
+++ b/media/renderers/decrypting_renderer.cc
@@ -4,8 +4,8 @@
#include "media/renderers/decrypting_renderer.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/sequenced_task_runner.h"
#include "media/base/cdm_context.h"
#include "media/base/demuxer_stream.h"
diff --git a/media/renderers/decrypting_renderer.h b/media/renderers/decrypting_renderer.h
index 9efa1960..678c70a4 100644
--- a/media/renderers/decrypting_renderer.h
+++ b/media/renderers/decrypting_renderer.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/media/renderers/decrypting_renderer_factory.h b/media/renderers/decrypting_renderer_factory.h
index 4be8a770..49f6358b 100644
--- a/media/renderers/decrypting_renderer_factory.h
+++ b/media/renderers/decrypting_renderer_factory.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_RENDERERS_DECRYPTING_RENDERER_FACTORY_H_
#define MEDIA_RENDERERS_DECRYPTING_RENDERER_FACTORY_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/task/sequenced_task_runner.h"
#include "media/base/media_export.h"
diff --git a/media/renderers/decrypting_renderer_unittest.cc b/media/renderers/decrypting_renderer_unittest.cc
index eb6b83e..f91c0d84 100644
--- a/media/renderers/decrypting_renderer_unittest.cc
+++ b/media/renderers/decrypting_renderer_unittest.cc
@@ -4,8 +4,8 @@
#include "media/renderers/decrypting_renderer.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/gmock_callback_support.h"
diff --git a/media/renderers/paint_canvas_video_renderer.cc b/media/renderers/paint_canvas_video_renderer.cc
index a2e471d1..670a61a 100644
--- a/media/renderers/paint_canvas_video_renderer.cc
+++ b/media/renderers/paint_canvas_video_renderer.cc
@@ -8,9 +8,9 @@
#include <limits>
#include "base/barrier_closure.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/renderers/paint_canvas_video_renderer_unittest.cc b/media/renderers/paint_canvas_video_renderer_unittest.cc
index b046aed..36a8b98 100644
--- a/media/renderers/paint_canvas_video_renderer_unittest.cc
+++ b/media/renderers/paint_canvas_video_renderer_unittest.cc
@@ -5,7 +5,7 @@
#include <GLES3/gl3.h>
#include <stdint.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/aligned_memory.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/renderers/renderer_impl.cc b/media/renderers/renderer_impl.cc
index 200bcf3..afc8b2e1 100644
--- a/media/renderers/renderer_impl.cc
+++ b/media/renderers/renderer_impl.cc
@@ -7,11 +7,11 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/renderers/renderer_impl_factory.cc b/media/renderers/renderer_impl_factory.cc
index 3340f3a..e7dd8da 100644
--- a/media/renderers/renderer_impl_factory.cc
+++ b/media/renderers/renderer_impl_factory.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "build/build_config.h"
#include "media/base/audio_buffer.h"
diff --git a/media/renderers/renderer_impl_factory.h b/media/renderers/renderer_impl_factory.h
index 77f81a41..c938b43 100644
--- a/media/renderers/renderer_impl_factory.h
+++ b/media/renderers/renderer_impl_factory.h
@@ -8,7 +8,7 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/task/sequenced_task_runner.h"
#include "build/build_config.h"
diff --git a/media/renderers/renderer_impl_unittest.cc b/media/renderers/renderer_impl_unittest.cc
index c383cbf7..88aefbd 100644
--- a/media/renderers/renderer_impl_unittest.cc
+++ b/media/renderers/renderer_impl_unittest.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/renderers/shared_image_video_frame_test_utils.h b/media/renderers/shared_image_video_frame_test_utils.h
index 9b0ba133..a2837b2 100644
--- a/media/renderers/shared_image_video_frame_test_utils.h
+++ b/media/renderers/shared_image_video_frame_test_utils.h
@@ -8,7 +8,7 @@
#include <GLES3/gl3.h>
#include <stdint.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "components/viz/common/gpu/context_provider.h"
#include "media/base/video_frame.h"
diff --git a/media/renderers/video_renderer_impl.cc b/media/renderers/video_renderer_impl.cc
index 3600ee9..87425a8 100644
--- a/media/renderers/video_renderer_impl.cc
+++ b/media/renderers/video_renderer_impl.cc
@@ -8,10 +8,10 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/metrics/histogram_macros.h"
#include "base/numerics/safe_conversions.h"
diff --git a/media/renderers/video_renderer_impl_unittest.cc b/media/renderers/video_renderer_impl_unittest.cc
index 8698c12..dfcab632 100644
--- a/media/renderers/video_renderer_impl_unittest.cc
+++ b/media/renderers/video_renderer_impl_unittest.cc
@@ -7,10 +7,10 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/media/renderers/video_resource_updater.cc b/media/renderers/video_resource_updater.cc
index 3f6a1fb..ac2637af 100644
--- a/media/renderers/video_resource_updater.cc
+++ b/media/renderers/video_resource_updater.cc
@@ -10,9 +10,9 @@
#include <string>
#include "base/atomic_sequence_num.h"
-#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/containers/cxx20_erase.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/shared_memory_mapping.h"
diff --git a/media/renderers/video_resource_updater_unittest.cc b/media/renderers/video_resource_updater_unittest.cc
index 9bc1b5d..93dbf94 100644
--- a/media/renderers/video_resource_updater_unittest.cc
+++ b/media/renderers/video_resource_updater_unittest.cc
@@ -7,7 +7,7 @@
#include <stddef.h>
#include <stdint.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/read_only_shared_memory_region.h"
#include "base/test/task_environment.h"
diff --git a/media/renderers/win/media_engine_notify_impl.h b/media/renderers/win/media_engine_notify_impl.h
index e25d239..877b2c9 100644
--- a/media/renderers/win/media_engine_notify_impl.h
+++ b/media/renderers/win/media_engine_notify_impl.h
@@ -8,7 +8,7 @@
#include <mfmediaengine.h>
#include <wrl.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/synchronization/lock.h"
#include "media/base/buffering_state.h"
#include "media/base/pipeline_status.h"
diff --git a/media/renderers/win/media_foundation_renderer.cc b/media/renderers/win/media_foundation_renderer.cc
index 8c56e067..6d659c6 100644
--- a/media/renderers/win/media_foundation_renderer.cc
+++ b/media/renderers/win/media_foundation_renderer.cc
@@ -12,7 +12,7 @@
#include <tuple>
#include <utility>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/guid.h"
#include "base/metrics/histogram_functions.h"
#include "base/numerics/clamped_math.h"
diff --git a/media/renderers/win/media_foundation_renderer.h b/media/renderers/win/media_foundation_renderer.h
index 48298a2b..e3e3f544 100644
--- a/media/renderers/win/media_foundation_renderer.h
+++ b/media/renderers/win/media_foundation_renderer.h
@@ -12,7 +12,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/media/renderers/win/media_foundation_renderer_extension.h b/media/renderers/win/media_foundation_renderer_extension.h
index 927abb4..7bc2557 100644
--- a/media/renderers/win/media_foundation_renderer_extension.h
+++ b/media/renderers/win/media_foundation_renderer_extension.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_RENDERERS_WIN_MEDIA_FOUNDATION_RENDERER_EXTENSION_H_
#define MEDIA_RENDERERS_WIN_MEDIA_FOUNDATION_RENDERER_EXTENSION_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/win/scoped_handle.h"
#include "media/base/media_export.h"
#include "media/renderers/win/media_foundation_rendering_mode.h"
diff --git a/media/renderers/win/media_foundation_renderer_unittest.cc b/media/renderers/win/media_foundation_renderer_unittest.cc
index dea0868..80f8a5c 100644
--- a/media/renderers/win/media_foundation_renderer_unittest.cc
+++ b/media/renderers/win/media_foundation_renderer_unittest.cc
@@ -9,8 +9,8 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/scoped_refptr.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/mock_callback.h"
diff --git a/media/renderers/win/media_foundation_stream_wrapper.cc b/media/renderers/win/media_foundation_stream_wrapper.cc
index 0410f55..c6c0b30 100644
--- a/media/renderers/win/media_foundation_stream_wrapper.cc
+++ b/media/renderers/win/media_foundation_stream_wrapper.cc
@@ -6,7 +6,7 @@
#include <mferror.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "media/base/video_codecs.h"
#include "media/base/win/mf_helpers.h"
diff --git a/media/renderers/win/media_foundation_texture_pool.h b/media/renderers/win/media_foundation_texture_pool.h
index 7c427fc..b2ff6955 100644
--- a/media/renderers/win/media_foundation_texture_pool.h
+++ b/media/renderers/win/media_foundation_texture_pool.h
@@ -9,8 +9,8 @@
#include <wrl/client.h>
#include <map>
-#include "base/callback.h"
#include "base/containers/flat_map.h"
+#include "base/functional/callback.h"
#include "base/unguessable_token.h"
#include "base/win/scoped_handle.h"
#include "media/base/media_export.h"
diff --git a/media/test/fake_encrypted_media.cc b/media/test/fake_encrypted_media.cc
index 7b00c22..ce822f2 100644
--- a/media/test/fake_encrypted_media.cc
+++ b/media/test/fake_encrypted_media.cc
@@ -4,7 +4,7 @@
#include "media/test/fake_encrypted_media.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "media/base/cdm_key_information.h"
#include "media/cdm/aes_decryptor.h"
diff --git a/media/test/pipeline_integration_fuzzertest.cc b/media/test/pipeline_integration_fuzzertest.cc
index 71f3aa0..80e8cc6 100644
--- a/media/test/pipeline_integration_fuzzertest.cc
+++ b/media/test/pipeline_integration_fuzzertest.cc
@@ -7,9 +7,9 @@
#include <vector>
#include "base/at_exit.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index 56406f0..0f01574 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -8,9 +8,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
#include "base/strings/string_split.h"
diff --git a/media/test/pipeline_integration_test_base.cc b/media/test/pipeline_integration_test_base.cc
index fdba15ac..08d5f299 100644
--- a/media/test/pipeline_integration_test_base.cc
+++ b/media/test/pipeline_integration_test_base.cc
@@ -7,9 +7,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/media/test/pipeline_integration_test_base.h b/media/test/pipeline_integration_test_base.h
index d2980b1..ca719b4 100644
--- a/media/test/pipeline_integration_test_base.h
+++ b/media/test/pipeline_integration_test_base.h
@@ -8,7 +8,7 @@
#include <stdint.h>
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/hash/md5.h"
#include "base/run_loop.h"
#include "base/test/scoped_run_loop_timeout.h"
diff --git a/media/test/run_all_unittests.cc b/media/test/run_all_unittests.cc
index 67240f1..13ad0c6 100644
--- a/media/test/run_all_unittests.cc
+++ b/media/test/run_all_unittests.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_discardable_memory_allocator.h"
#include "base/test/test_suite.h"
diff --git a/media/test/test_media_source.cc b/media/test/test_media_source.cc
index c510a512..bfa1785 100644
--- a/media/test/test_media_source.cc
+++ b/media/test/test_media_source.cc
@@ -4,8 +4,8 @@
#include "media/test/test_media_source.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/single_thread_task_runner.h"
#include "media/base/stream_parser.h"
#include "media/base/test_data_util.h"
diff --git a/media/video/fake_video_encode_accelerator.cc b/media/video/fake_video_encode_accelerator.cc
index 845db97..a1c39a6 100644
--- a/media/video/fake_video_encode_accelerator.cc
+++ b/media/video/fake_video_encode_accelerator.cc
@@ -4,8 +4,8 @@
#include "media/video/fake_video_encode_accelerator.h"
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/video/fake_video_encode_accelerator.h b/media/video/fake_video_encode_accelerator.h
index 1e657df..eab1ed5 100644
--- a/media/video/fake_video_encode_accelerator.h
+++ b/media/video/fake_video_encode_accelerator.h
@@ -11,8 +11,8 @@
#include <list>
#include <vector>
-#include "base/callback.h"
#include "base/containers/queue.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "media/base/bitrate.h"
diff --git a/media/video/gpu_memory_buffer_video_frame_pool.cc b/media/video/gpu_memory_buffer_video_frame_pool.cc
index 92b0aed..40e2d25 100644
--- a/media/video/gpu_memory_buffer_video_frame_pool.cc
+++ b/media/video/gpu_memory_buffer_video_frame_pool.cc
@@ -14,12 +14,12 @@
#include <utility>
#include "base/barrier_closure.h"
-#include "base/bind.h"
#include "base/bits.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/containers/circular_deque.h"
#include "base/containers/stack_container.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
diff --git a/media/video/gpu_memory_buffer_video_frame_pool_unittest.cc b/media/video/gpu_memory_buffer_video_frame_pool_unittest.cc
index d6bd66ba..33e8ae2c 100644
--- a/media/video/gpu_memory_buffer_video_frame_pool_unittest.cc
+++ b/media/video/gpu_memory_buffer_video_frame_pool_unittest.cc
@@ -5,7 +5,7 @@
#include <stdint.h>
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/simple_test_tick_clock.h"
diff --git a/media/video/mock_gpu_memory_buffer_video_frame_pool.cc b/media/video/mock_gpu_memory_buffer_video_frame_pool.cc
index 7783129..ea06bd8 100644
--- a/media/video/mock_gpu_memory_buffer_video_frame_pool.cc
+++ b/media/video/mock_gpu_memory_buffer_video_frame_pool.cc
@@ -4,7 +4,7 @@
#include "media/video/mock_gpu_memory_buffer_video_frame_pool.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
namespace media {
diff --git a/media/video/mock_gpu_memory_buffer_video_frame_pool.h b/media/video/mock_gpu_memory_buffer_video_frame_pool.h
index 9c86ed9..d54bcce 100644
--- a/media/video/mock_gpu_memory_buffer_video_frame_pool.h
+++ b/media/video/mock_gpu_memory_buffer_video_frame_pool.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_VIDEO_MOCK_GPU_MEMORY_BUFFER_VIDEO_FRAME_POOL_H_
#define MEDIA_VIDEO_MOCK_GPU_MEMORY_BUFFER_VIDEO_FRAME_POOL_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "media/video/gpu_memory_buffer_video_frame_pool.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/video/offloading_video_encoder_unittest.cc b/media/video/offloading_video_encoder_unittest.cc
index 2d0ac3c..e4a67a6 100644
--- a/media/video/offloading_video_encoder_unittest.cc
+++ b/media/video/offloading_video_encoder_unittest.cc
@@ -5,8 +5,8 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/video/picture.h b/media/video/picture.h
index 3e20a7e..4f3bf02 100644
--- a/media/video/picture.h
+++ b/media/video/picture.h
@@ -9,7 +9,7 @@
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "gpu/command_buffer/common/mailbox_holder.h"
#include "media/base/media_export.h"
diff --git a/media/video/renderable_gpu_memory_buffer_video_frame_pool.cc b/media/video/renderable_gpu_memory_buffer_video_frame_pool.cc
index 739f78e3..488a5bd 100644
--- a/media/video/renderable_gpu_memory_buffer_video_frame_pool.cc
+++ b/media/video/renderable_gpu_memory_buffer_video_frame_pool.cc
@@ -10,8 +10,8 @@
#include <list>
#include <utility>
-#include "base/bind.h"
#include "base/bits.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/task/bind_post_task.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/media/video/renderable_gpu_memory_buffer_video_frame_pool_unittest.cc b/media/video/renderable_gpu_memory_buffer_video_frame_pool_unittest.cc
index db2a67f2..c3acd03 100644
--- a/media/video/renderable_gpu_memory_buffer_video_frame_pool_unittest.cc
+++ b/media/video/renderable_gpu_memory_buffer_video_frame_pool_unittest.cc
@@ -4,7 +4,7 @@
#include "media/video/renderable_gpu_memory_buffer_video_frame_pool.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/weak_ptr.h"
#include "base/task/thread_pool.h"
#include "base/test/bind.h"
diff --git a/media/video/software_video_encoder_test.cc b/media/video/software_video_encoder_test.cc
index 72b3850..7a6727c 100644
--- a/media/video/software_video_encoder_test.cc
+++ b/media/video/software_video_encoder_test.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <string>
-#include "base/callback_helpers.h"
#include "base/feature_list.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/scoped_refptr.h"
#include "base/strings/string_number_conversions.h"
diff --git a/media/video/video_encode_accelerator.cc b/media/video/video_encode_accelerator.cc
index 27e87db..37d282d 100644
--- a/media/video/video_encode_accelerator.cc
+++ b/media/video/video_encode_accelerator.cc
@@ -6,7 +6,7 @@
#include <inttypes.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/ranges/algorithm.h"
#include "base/strings/stringprintf.h"
#include "build/build_config.h"
diff --git a/media/video/video_encode_accelerator.h b/media/video/video_encode_accelerator.h
index f37a1d50..638f24e 100644
--- a/media/video/video_encode_accelerator.h
+++ b/media/video/video_encode_accelerator.h
@@ -11,7 +11,7 @@
#include <memory>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/time/time.h"
#include "media/base/bitrate.h"
diff --git a/media/video/video_encode_accelerator_adapter.cc b/media/video/video_encode_accelerator_adapter.cc
index 43f6817..a7fefc5 100644
--- a/media/video/video_encode_accelerator_adapter.cc
+++ b/media/video/video_encode_accelerator_adapter.cc
@@ -7,7 +7,7 @@
#include <limits>
#include <vector>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/numerics/checked_math.h"
diff --git a/media/video/video_encode_accelerator_adapter.h b/media/video/video_encode_accelerator_adapter.h
index 1f9ca9c..4d389367 100644
--- a/media/video/video_encode_accelerator_adapter.h
+++ b/media/video/video_encode_accelerator_adapter.h
@@ -7,9 +7,9 @@
#include <memory>
-#include "base/callback_forward.h"
#include "base/containers/circular_deque.h"
#include "base/containers/queue.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/read_only_shared_memory_region.h"
#include "base/memory/scoped_refptr.h"
diff --git a/media/video/video_encode_accelerator_adapter_test.cc b/media/video/video_encode_accelerator_adapter_test.cc
index 4921715..41145af 100644
--- a/media/video/video_encode_accelerator_adapter_test.cc
+++ b/media/video/video_encode_accelerator_adapter_test.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <string>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
diff --git a/media/video/video_encoder_fallback_test.cc b/media/video/video_encoder_fallback_test.cc
index e2a748c..fd078de2 100644
--- a/media/video/video_encoder_fallback_test.cc
+++ b/media/video/video_encoder_fallback_test.cc
@@ -4,7 +4,7 @@
#include "media/video/video_encoder_fallback.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
diff --git a/media/webrtc/audio_processor.cc b/media/webrtc/audio_processor.cc
index 57ce2682..bfcf7ed 100644
--- a/media/webrtc/audio_processor.cc
+++ b/media/webrtc/audio_processor.cc
@@ -13,8 +13,8 @@
#include <memory>
#include <utility>
-#include "base/callback_helpers.h"
#include "base/feature_list.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/strings/stringprintf.h"
#include "base/task/thread_pool.h"
diff --git a/media/webrtc/audio_processor.h b/media/webrtc/audio_processor.h
index a21ef78..7215fffff 100644
--- a/media/webrtc/audio_processor.h
+++ b/media/webrtc/audio_processor.h
@@ -7,9 +7,9 @@
#include <memory>
-#include "base/callback.h"
#include "base/component_export.h"
#include "base/files/file.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/sequence_checker.h"
#include "base/thread_annotations.h"
diff --git a/mojo/core/channel_fuchsia.cc b/mojo/core/channel_fuchsia.cc
index 2ecc2c3..bba4b88 100644
--- a/mojo/core/channel_fuchsia.cc
+++ b/mojo/core/channel_fuchsia.cc
@@ -16,10 +16,10 @@
#include <memory>
#include <tuple>
-#include "base/bind.h"
#include "base/containers/circular_deque.h"
#include "base/files/scoped_file.h"
#include "base/fuchsia/fuchsia_logging.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/ref_counted.h"
#include "base/message_loop/message_pump_for_io.h"
diff --git a/mojo/core/channel_fuzzer.cc b/mojo/core/channel_fuzzer.cc
index c4c5798..3157aa6 100644
--- a/mojo/core/channel_fuzzer.cc
+++ b/mojo/core/channel_fuzzer.cc
@@ -4,7 +4,7 @@
#include <stdint.h>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/message_loop/message_pump_type.h"
#include "base/no_destructor.h"
#include "base/run_loop.h"
diff --git a/mojo/core/channel_linux.cc b/mojo/core/channel_linux.cc
index 71b50ca..eaf9b16 100644
--- a/mojo/core/channel_linux.cc
+++ b/mojo/core/channel_linux.cc
@@ -19,10 +19,10 @@
#include <limits>
#include <memory>
-#include "base/bind.h"
#include "base/bits.h"
-#include "base/callback.h"
#include "base/files/scoped_file.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/page_size.h"
diff --git a/mojo/core/channel_mac.cc b/mojo/core/channel_mac.cc
index 818cba1..1708e0b9 100644
--- a/mojo/core/channel_mac.cc
+++ b/mojo/core/channel_mac.cc
@@ -14,10 +14,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/containers/buffer_iterator.h"
#include "base/containers/circular_deque.h"
#include "base/containers/span.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/mac/mach_logging.h"
#include "base/mac/scoped_mach_msg_destroy.h"
diff --git a/mojo/core/channel_unittest.cc b/mojo/core/channel_unittest.cc
index 260fde56..f855528b 100644
--- a/mojo/core/channel_unittest.cc
+++ b/mojo/core/channel_unittest.cc
@@ -6,7 +6,7 @@
#include <atomic>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/page_size.h"
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_pump_type.h"
diff --git a/mojo/core/channel_win.cc b/mojo/core/channel_win.cc
index 0f56608d..b09eb8b 100644
--- a/mojo/core/channel_win.cc
+++ b/mojo/core/channel_win.cc
@@ -12,9 +12,9 @@
#include <memory>
#include <tuple>
-#include "base/bind.h"
#include "base/containers/queue.h"
#include "base/debug/activity_tracker.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
diff --git a/mojo/core/core.cc b/mojo/core/core.cc
index 2bc2aea..4e6f0ab 100644
--- a/mojo/core/core.cc
+++ b/mojo/core/core.cc
@@ -10,8 +10,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/containers/stack_container.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/mojo/core/core.h b/mojo/core/core.h
index 27f41b3..a573af34 100644
--- a/mojo/core/core.h
+++ b/mojo/core/core.h
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/synchronization/lock.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/mojo/core/core_unittest.cc b/mojo/core/core_unittest.cc
index 706cd63..e90d159 100644
--- a/mojo/core/core_unittest.cc
+++ b/mojo/core/core_unittest.cc
@@ -8,7 +8,7 @@
#include <limits>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/threading/platform_thread.h"
#include "build/build_config.h"
#include "mojo/core/core_test_base.h"
diff --git a/mojo/core/data_pipe_consumer_dispatcher.cc b/mojo/core/data_pipe_consumer_dispatcher.cc
index 8e69f31..19ad617 100644
--- a/mojo/core/data_pipe_consumer_dispatcher.cc
+++ b/mojo/core/data_pipe_consumer_dispatcher.cc
@@ -11,7 +11,7 @@
#include <limits>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/numerics/checked_math.h"
diff --git a/mojo/core/data_pipe_producer_dispatcher.cc b/mojo/core/data_pipe_producer_dispatcher.cc
index de890a7..e2022d6 100644
--- a/mojo/core/data_pipe_producer_dispatcher.cc
+++ b/mojo/core/data_pipe_producer_dispatcher.cc
@@ -9,7 +9,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/numerics/checked_math.h"
diff --git a/mojo/core/data_pipe_unittest.cc b/mojo/core/data_pipe_unittest.cc
index d2a0902..4cd6078 100644
--- a/mojo/core/data_pipe_unittest.cc
+++ b/mojo/core/data_pipe_unittest.cc
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/run_loop.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/mojo/core/embedder/process_error_callback.h b/mojo/core/embedder/process_error_callback.h
index 5e452cf..0b14502 100644
--- a/mojo/core/embedder/process_error_callback.h
+++ b/mojo/core/embedder/process_error_callback.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
namespace mojo {
namespace core {
diff --git a/mojo/core/embedder/scoped_ipc_support.cc b/mojo/core/embedder/scoped_ipc_support.cc
index 28a501e..31266ed8 100644
--- a/mojo/core/embedder/scoped_ipc_support.cc
+++ b/mojo/core/embedder/scoped_ipc_support.cc
@@ -4,8 +4,8 @@
#include "mojo/core/embedder/scoped_ipc_support.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/synchronization/waitable_event.h"
#include "base/task/single_thread_task_runner.h"
#include "base/threading/thread_restrictions.h"
diff --git a/mojo/core/embedder_unittest.cc b/mojo/core/embedder_unittest.cc
index 0317a24..7efc9c4 100644
--- a/mojo/core/embedder_unittest.cc
+++ b/mojo/core/embedder_unittest.cc
@@ -11,9 +11,9 @@
#include <utility>
#include "base/base_paths.h"
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/read_only_shared_memory_region.h"
#include "base/memory/unsafe_shared_memory_region.h"
diff --git a/mojo/core/invitation_unittest.cc b/mojo/core/invitation_unittest.cc
index 2aff455cd..0803243 100644
--- a/mojo/core/invitation_unittest.cc
+++ b/mojo/core/invitation_unittest.cc
@@ -7,12 +7,12 @@
#include "base/base_paths.h"
#include "base/base_switches.h"
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check_op.h"
#include "base/command_line.h"
#include "base/feature_list.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/notreached.h"
#include "base/path_service.h"
#include "base/process/process.h"
diff --git a/mojo/core/ipcz_driver/base_shared_memory_service.cc b/mojo/core/ipcz_driver/base_shared_memory_service.cc
index 39f6ae9..a5c5679 100644
--- a/mojo/core/ipcz_driver/base_shared_memory_service.cc
+++ b/mojo/core/ipcz_driver/base_shared_memory_service.cc
@@ -7,8 +7,8 @@
#include <tuple>
#include <utility>
-#include "base/bind.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/shared_memory_hooks.h"
#include "base/memory/shared_memory_mapping.h"
diff --git a/mojo/core/message_pipe_perftest.cc b/mojo/core/message_pipe_perftest.cc
index 8d5a856..b3e8a22 100644
--- a/mojo/core/message_pipe_perftest.cc
+++ b/mojo/core/message_pipe_perftest.cc
@@ -8,9 +8,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/strings/stringprintf.h"
#include "base/test/perf_time_logger.h"
#include "base/threading/thread.h"
diff --git a/mojo/core/message_unittest.cc b/mojo/core/message_unittest.cc
index 3824a27..7aff52f 100644
--- a/mojo/core/message_unittest.cc
+++ b/mojo/core/message_unittest.cc
@@ -6,8 +6,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
#include "base/numerics/safe_math.h"
#include "base/rand_util.h"
diff --git a/mojo/core/mojo_core.cc b/mojo/core/mojo_core.cc
index b6c26db..2aadd3e6 100644
--- a/mojo/core/mojo_core.cc
+++ b/mojo/core/mojo_core.cc
@@ -6,10 +6,10 @@
#include "base/at_exit.h"
#include "base/base_switches.h"
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/debug/stack_trace.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/message_loop/message_pump_type.h"
#include "base/metrics/field_trial.h"
diff --git a/mojo/core/multiprocess_message_pipe_unittest.cc b/mojo/core/multiprocess_message_pipe_unittest.cc
index 36d081c..badcd42 100644
--- a/mojo/core/multiprocess_message_pipe_unittest.cc
+++ b/mojo/core/multiprocess_message_pipe_unittest.cc
@@ -12,11 +12,11 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/scoped_file.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/run_loop.h"
#include "base/strings/string_split.h"
diff --git a/mojo/core/node_channel.cc b/mojo/core/node_channel.cc
index 34730504..bdf06bf 100644
--- a/mojo/core/node_channel.cc
+++ b/mojo/core/node_channel.cc
@@ -8,7 +8,7 @@
#include <limits>
#include <sstream>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/mojo/core/node_channel.h b/mojo/core/node_channel.h
index 9ac5ee7..3977151 100644
--- a/mojo/core/node_channel.h
+++ b/mojo/core/node_channel.h
@@ -8,8 +8,8 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
#include "base/containers/queue.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted_delete_on_sequence.h"
#include "base/process/process.h"
diff --git a/mojo/core/node_channel_fuzzer.cc b/mojo/core/node_channel_fuzzer.cc
index 9a3d160..ba8a8cf 100644
--- a/mojo/core/node_channel_fuzzer.cc
+++ b/mojo/core/node_channel_fuzzer.cc
@@ -6,7 +6,7 @@
#include <algorithm>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/message_loop/message_pump_type.h"
#include "base/no_destructor.h"
#include "base/run_loop.h"
diff --git a/mojo/core/node_channel_unittest.cc b/mojo/core/node_channel_unittest.cc
index 1286d2c8..d5be648 100644
--- a/mojo/core/node_channel_unittest.cc
+++ b/mojo/core/node_channel_unittest.cc
@@ -4,7 +4,7 @@
#include "mojo/core/node_channel.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/scoped_refptr.h"
#include "base/message_loop/message_pump_type.h"
diff --git a/mojo/core/node_controller.cc b/mojo/core/node_controller.cc
index 5f32225fd..b4998b0 100644
--- a/mojo/core/node_controller.cc
+++ b/mojo/core/node_controller.cc
@@ -7,8 +7,8 @@
#include <limits>
#include <vector>
-#include "base/bind.h"
#include "base/containers/queue.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/process/process_handle.h"
diff --git a/mojo/core/node_controller.h b/mojo/core/node_controller.h
index 1e390741..80651533 100644
--- a/mojo/core/node_controller.h
+++ b/mojo/core/node_controller.h
@@ -13,9 +13,9 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
#include "base/containers/queue.h"
#include "base/containers/span.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/writable_shared_memory_region.h"
#include "base/process/process.h"
diff --git a/mojo/core/ports/ports_unittest.cc b/mojo/core/ports/ports_unittest.cc
index a2d6c16..042a56693 100644
--- a/mojo/core/ports/ports_unittest.cc
+++ b/mojo/core/ports/ports_unittest.cc
@@ -11,9 +11,9 @@
#include <sstream>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/containers/queue.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
diff --git a/mojo/core/run_all_core_unittests.cc b/mojo/core/run_all_core_unittests.cc
index 2879b319..03ec406a 100644
--- a/mojo/core/run_all_core_unittests.cc
+++ b/mojo/core/run_all_core_unittests.cc
@@ -3,10 +3,10 @@
// found in the LICENSE file.
#include "base/base_switches.h"
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/scoped_feature_list.h"
diff --git a/mojo/core/test/mojo_test_base.h b/mojo/core/test/mojo_test_base.h
index 40c88f1..5eb22ed 100644
--- a/mojo/core/test/mojo_test_base.h
+++ b/mojo/core/test/mojo_test_base.h
@@ -9,8 +9,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "build/build_config.h"
#include "mojo/core/test/multiprocess_test_helper.h"
#include "mojo/public/c/system/trap.h"
diff --git a/mojo/core/test/multiprocess_test_helper.cc b/mojo/core/test/multiprocess_test_helper.cc
index 326932e..8d689db 100644
--- a/mojo/core/test/multiprocess_test_helper.cc
+++ b/mojo/core/test/multiprocess_test_helper.cc
@@ -11,11 +11,11 @@
#include "base/base_paths.h"
#include "base/base_switches.h"
-#include "base/bind.h"
#include "base/check.h"
#include "base/command_line.h"
#include "base/feature_list.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/memory/ref_counted.h"
#include "base/notreached.h"
diff --git a/mojo/core/test/multiprocess_test_helper.h b/mojo/core/test/multiprocess_test_helper.h
index 594cf4f..ecce85b 100644
--- a/mojo/core/test/multiprocess_test_helper.h
+++ b/mojo/core/test/multiprocess_test_helper.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/process/process.h"
#include "base/test/multiprocess_test.h"
#include "base/test/test_timeouts.h"
diff --git a/mojo/core/test/run_all_unittests.cc b/mojo/core/test/run_all_unittests.cc
index b1fa3cb..9f9a2c5d 100644
--- a/mojo/core/test/run_all_unittests.cc
+++ b/mojo/core/test/run_all_unittests.cc
@@ -4,7 +4,7 @@
#include <signal.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "build/build_config.h"
#include "mojo/core/test/mojo_test_suite_base.h"
diff --git a/mojo/core/trap_unittest.cc b/mojo/core/trap_unittest.cc
index 0c5471a..0fd449d 100644
--- a/mojo/core/trap_unittest.cc
+++ b/mojo/core/trap_unittest.cc
@@ -8,8 +8,8 @@
#include <memory>
#include <set>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
#include "base/rand_util.h"
#include "base/synchronization/waitable_event.h"
diff --git a/mojo/public/cpp/bindings/associated_group.h b/mojo/public/cpp/bindings/associated_group.h
index 5bc4516..f242e4bb 100644
--- a/mojo/public/cpp/bindings/associated_group.h
+++ b/mojo/public/cpp/bindings/associated_group.h
@@ -5,8 +5,8 @@
#ifndef MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_GROUP_H_
#define MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_GROUP_H_
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
namespace mojo {
diff --git a/mojo/public/cpp/bindings/associated_remote.h b/mojo/public/cpp/bindings/associated_remote.h
index a56cbf1..b8d9939 100644
--- a/mojo/public/cpp/bindings/associated_remote.h
+++ b/mojo/public/cpp/bindings/associated_remote.h
@@ -9,8 +9,8 @@
#include <tuple>
#include <utility>
-#include "base/callback_forward.h"
#include "base/check.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/task/sequenced_task_runner.h"
#include "mojo/public/cpp/bindings/associated_interface_ptr_info.h"
diff --git a/mojo/public/cpp/bindings/binder_map.h b/mojo/public/cpp/bindings/binder_map.h
index 372f21e5..cae812aa 100644
--- a/mojo/public/cpp/bindings/binder_map.h
+++ b/mojo/public/cpp/bindings/binder_map.h
@@ -9,8 +9,8 @@
#include <string>
#include <type_traits>
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/task/sequenced_task_runner.h"
#include "mojo/public/cpp/bindings/generic_pending_receiver.h"
diff --git a/mojo/public/cpp/bindings/callback_helpers.h b/mojo/public/cpp/bindings/callback_helpers.h
index 1d26d9f..b8572f11a 100644
--- a/mojo/public/cpp/bindings/callback_helpers.h
+++ b/mojo/public/cpp/bindings/callback_helpers.h
@@ -8,8 +8,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
// This is a helper utility to wrap a base::OnceCallback such that if the
diff --git a/mojo/public/cpp/bindings/connection_error_callback.h b/mojo/public/cpp/bindings/connection_error_callback.h
index d964c96..0e0cad6 100644
--- a/mojo/public/cpp/bindings/connection_error_callback.h
+++ b/mojo/public/cpp/bindings/connection_error_callback.h
@@ -5,7 +5,7 @@
#ifndef MOJO_PUBLIC_CPP_BINDINGS_CONNECTION_ERROR_CALLBACK_H_
#define MOJO_PUBLIC_CPP_BINDINGS_CONNECTION_ERROR_CALLBACK_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
namespace mojo {
diff --git a/mojo/public/cpp/bindings/connection_group.cc b/mojo/public/cpp/bindings/connection_group.cc
index 3403568..f0993594 100644
--- a/mojo/public/cpp/bindings/connection_group.cc
+++ b/mojo/public/cpp/bindings/connection_group.cc
@@ -4,7 +4,7 @@
#include "mojo/public/cpp/bindings/connection_group.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
namespace mojo {
diff --git a/mojo/public/cpp/bindings/connection_group.h b/mojo/public/cpp/bindings/connection_group.h
index 17d4a30..7040ad7 100644
--- a/mojo/public/cpp/bindings/connection_group.h
+++ b/mojo/public/cpp/bindings/connection_group.h
@@ -7,8 +7,8 @@
#include <atomic>
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/mojo/public/cpp/bindings/connector.h b/mojo/public/cpp/bindings/connector.h
index e24763c..1a3291a 100644
--- a/mojo/public/cpp/bindings/connector.h
+++ b/mojo/public/cpp/bindings/connector.h
@@ -9,9 +9,9 @@
#include <memory>
#include <utility>
-#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr_exclusion.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/mojo/public/cpp/bindings/interface_endpoint_client.h b/mojo/public/cpp/bindings/interface_endpoint_client.h
index 8b92c3b..052e410 100644
--- a/mojo/public/cpp/bindings/interface_endpoint_client.h
+++ b/mojo/public/cpp/bindings/interface_endpoint_client.h
@@ -11,10 +11,10 @@
#include <memory>
#include <utility>
-#include "base/callback.h"
#include "base/component_export.h"
#include "base/containers/span.h"
#include "base/dcheck_is_on.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
diff --git a/mojo/public/cpp/bindings/lib/associated_interface_ptr_state.h b/mojo/public/cpp/bindings/lib/associated_interface_ptr_state.h
index 7c47391..dbb4a86 100644
--- a/mojo/public/cpp/bindings/lib/associated_interface_ptr_state.h
+++ b/mojo/public/cpp/bindings/lib/associated_interface_ptr_state.h
@@ -12,9 +12,9 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_forward.h"
#include "base/component_export.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/ptr_util.h"
#include "base/memory/scoped_refptr.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/mojo/public/cpp/bindings/lib/binder_map_internal.h b/mojo/public/cpp/bindings/lib/binder_map_internal.h
index e377c429..9892cc6 100644
--- a/mojo/public/cpp/bindings/lib/binder_map_internal.h
+++ b/mojo/public/cpp/bindings/lib/binder_map_internal.h
@@ -7,8 +7,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/task/sequenced_task_runner.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/mojo/public/cpp/bindings/lib/binding_state.h b/mojo/public/cpp/bindings/lib/binding_state.h
index 2bddc55..af9b244a 100644
--- a/mojo/public/cpp/bindings/lib/binding_state.h
+++ b/mojo/public/cpp/bindings/lib/binding_state.h
@@ -10,11 +10,11 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check.h"
#include "base/component_export.h"
#include "base/containers/span.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
#include "base/memory/scoped_refptr.h"
#include "base/strings/string_piece.h"
diff --git a/mojo/public/cpp/bindings/lib/connector.cc b/mojo/public/cpp/bindings/lib/connector.cc
index 937cd8b..6577393 100644
--- a/mojo/public/cpp/bindings/lib/connector.cc
+++ b/mojo/public/cpp/bindings/lib/connector.cc
@@ -8,9 +8,9 @@
#include <memory>
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/mojo/public/cpp/bindings/lib/control_message_proxy.cc b/mojo/public/cpp/bindings/lib/control_message_proxy.cc
index 1529861..fc2ef91 100644
--- a/mojo/public/cpp/bindings/lib/control_message_proxy.cc
+++ b/mojo/public/cpp/bindings/lib/control_message_proxy.cc
@@ -8,8 +8,8 @@
#include <stdint.h>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/task/sequenced_task_runner.h"
#include "base/time/time.h"
diff --git a/mojo/public/cpp/bindings/lib/control_message_proxy.h b/mojo/public/cpp/bindings/lib/control_message_proxy.h
index 1b65e28..07b94138 100644
--- a/mojo/public/cpp/bindings/lib/control_message_proxy.h
+++ b/mojo/public/cpp/bindings/lib/control_message_proxy.h
@@ -7,8 +7,8 @@
#include <stdint.h>
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
namespace base {
diff --git a/mojo/public/cpp/bindings/lib/interface_endpoint_client.cc b/mojo/public/cpp/bindings/lib/interface_endpoint_client.cc
index c9f840b..95fac10 100644
--- a/mojo/public/cpp/bindings/lib/interface_endpoint_client.cc
+++ b/mojo/public/cpp/bindings/lib/interface_endpoint_client.cc
@@ -8,10 +8,10 @@
#include <tuple>
-#include "base/bind.h"
#include "base/check.h"
#include "base/containers/contains.h"
#include "base/containers/cxx20_erase.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/mojo/public/cpp/bindings/lib/interface_ptr_state.h b/mojo/public/cpp/bindings/lib/interface_ptr_state.h
index bee7a8d..b6b88ee 100644
--- a/mojo/public/cpp/bindings/lib/interface_ptr_state.h
+++ b/mojo/public/cpp/bindings/lib/interface_ptr_state.h
@@ -12,11 +12,11 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check.h"
#include "base/component_export.h"
#include "base/dcheck_is_on.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/task/sequenced_task_runner.h"
#include "base/time/time.h"
diff --git a/mojo/public/cpp/bindings/lib/message.cc b/mojo/public/cpp/bindings/lib/message.cc
index 065dddf..d488f18 100644
--- a/mojo/public/cpp/bindings/lib/message.cc
+++ b/mojo/public/cpp/bindings/lib/message.cc
@@ -12,8 +12,8 @@
#include <tuple>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/memory/ptr_util.h"
#include "base/numerics/safe_math.h"
diff --git a/mojo/public/cpp/bindings/lib/message_dumper.cc b/mojo/public/cpp/bindings/lib/message_dumper.cc
index 2fcdf69..09b803e 100644
--- a/mojo/public/cpp/bindings/lib/message_dumper.cc
+++ b/mojo/public/cpp/bindings/lib/message_dumper.cc
@@ -4,10 +4,10 @@
#include "mojo/public/cpp/bindings/message_dumper.h"
-#include "base/bind.h"
#include "base/files/file.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/no_destructor.h"
#include "base/process/process.h"
diff --git a/mojo/public/cpp/bindings/lib/message_internal.h b/mojo/public/cpp/bindings/lib/message_internal.h
index b2b31713..e38957aa 100644
--- a/mojo/public/cpp/bindings/lib/message_internal.h
+++ b/mojo/public/cpp/bindings/lib/message_internal.h
@@ -7,8 +7,8 @@
#include <stdint.h>
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/strings/string_piece.h"
#include "mojo/public/cpp/bindings/lib/bindings_internal.h"
diff --git a/mojo/public/cpp/bindings/lib/multiplex_router.cc b/mojo/public/cpp/bindings/lib/multiplex_router.cc
index 1ca2bbd0..ed69861 100644
--- a/mojo/public/cpp/bindings/lib/multiplex_router.cc
+++ b/mojo/public/cpp/bindings/lib/multiplex_router.cc
@@ -8,9 +8,9 @@
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/containers/flat_set.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/mojo/public/cpp/bindings/lib/scoped_interface_endpoint_handle.cc b/mojo/public/cpp/bindings/lib/scoped_interface_endpoint_handle.cc
index 0a7d65e0..a6838394 100644
--- a/mojo/public/cpp/bindings/lib/scoped_interface_endpoint_handle.cc
+++ b/mojo/public/cpp/bindings/lib/scoped_interface_endpoint_handle.cc
@@ -6,8 +6,8 @@
#include <string>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/synchronization/lock.h"
#include "base/task/sequenced_task_runner.h"
#include "mojo/public/cpp/bindings/associated_group_controller.h"
diff --git a/mojo/public/cpp/bindings/lib/sequence_local_sync_event_watcher.cc b/mojo/public/cpp/bindings/lib/sequence_local_sync_event_watcher.cc
index f41248c6..f367934 100644
--- a/mojo/public/cpp/bindings/lib/sequence_local_sync_event_watcher.cc
+++ b/mojo/public/cpp/bindings/lib/sequence_local_sync_event_watcher.cc
@@ -8,8 +8,8 @@
#include <memory>
#include <set>
-#include "base/bind.h"
#include "base/containers/flat_set.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
diff --git a/mojo/public/cpp/bindings/lib/test_random_mojo_delays.cc b/mojo/public/cpp/bindings/lib/test_random_mojo_delays.cc
index 5b9b525..49ff8e6 100644
--- a/mojo/public/cpp/bindings/lib/test_random_mojo_delays.cc
+++ b/mojo/public/cpp/bindings/lib/test_random_mojo_delays.cc
@@ -4,7 +4,7 @@
#include <list>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/no_destructor.h"
diff --git a/mojo/public/cpp/bindings/lib/validation_errors.h b/mojo/public/cpp/bindings/lib/validation_errors.h
index 2a3a041..f61c7ff 100644
--- a/mojo/public/cpp/bindings/lib/validation_errors.h
+++ b/mojo/public/cpp/bindings/lib/validation_errors.h
@@ -5,8 +5,8 @@
#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATION_ERRORS_H_
#define MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATION_ERRORS_H_
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
namespace mojo {
diff --git a/mojo/public/cpp/bindings/message.h b/mojo/public/cpp/bindings/message.h
index 28fe63f6..5c1e559 100644
--- a/mojo/public/cpp/bindings/message.h
+++ b/mojo/public/cpp/bindings/message.h
@@ -12,10 +12,10 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
#include "base/check_op.h"
#include "base/component_export.h"
#include "base/containers/span.h"
+#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/strings/string_piece.h"
diff --git a/mojo/public/cpp/bindings/receiver_set.cc b/mojo/public/cpp/bindings/receiver_set.cc
index 6c08432..9148d11 100644
--- a/mojo/public/cpp/bindings/receiver_set.cc
+++ b/mojo/public/cpp/bindings/receiver_set.cc
@@ -7,9 +7,9 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr_exclusion.h"
#include "base/memory/weak_ptr.h"
#include "mojo/public/cpp/bindings/message.h"
diff --git a/mojo/public/cpp/bindings/receiver_set.h b/mojo/public/cpp/bindings/receiver_set.h
index 48fbf1ab..138ba38 100644
--- a/mojo/public/cpp/bindings/receiver_set.h
+++ b/mojo/public/cpp/bindings/receiver_set.h
@@ -10,10 +10,10 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/component_export.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr_exclusion.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/mojo/public/cpp/bindings/remote.h b/mojo/public/cpp/bindings/remote.h
index 0ff0a2d..20d2d936 100644
--- a/mojo/public/cpp/bindings/remote.h
+++ b/mojo/public/cpp/bindings/remote.h
@@ -9,8 +9,8 @@
#include <tuple>
#include <utility>
-#include "base/callback_forward.h"
#include "base/check.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/task/sequenced_task_runner.h"
#include "base/time/time.h"
diff --git a/mojo/public/cpp/bindings/remote_set.h b/mojo/public/cpp/bindings/remote_set.h
index b0d2a70..6d25546 100644
--- a/mojo/public/cpp/bindings/remote_set.h
+++ b/mojo/public/cpp/bindings/remote_set.h
@@ -9,9 +9,9 @@
#include <set>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/task/sequenced_task_runner.h"
#include "base/types/id_type.h"
diff --git a/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h b/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h
index a406941..9acfe5275 100644
--- a/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h
+++ b/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h
@@ -5,8 +5,8 @@
#ifndef MOJO_PUBLIC_CPP_BINDINGS_SCOPED_INTERFACE_ENDPOINT_HANDLE_H_
#define MOJO_PUBLIC_CPP_BINDINGS_SCOPED_INTERFACE_ENDPOINT_HANDLE_H_
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/strings/string_piece.h"
#include "mojo/public/cpp/bindings/disconnect_reason.h"
diff --git a/mojo/public/cpp/bindings/sequence_local_sync_event_watcher.h b/mojo/public/cpp/bindings/sequence_local_sync_event_watcher.h
index 3bcf6e0..2d84811 100644
--- a/mojo/public/cpp/bindings/sequence_local_sync_event_watcher.h
+++ b/mojo/public/cpp/bindings/sequence_local_sync_event_watcher.h
@@ -5,8 +5,8 @@
#ifndef MOJO_PUBLIC_CPP_BINDINGS_SEQUENCE_LOCAL_SYNC_EVENT_WATCHER_H_
#define MOJO_PUBLIC_CPP_BINDINGS_SEQUENCE_LOCAL_SYNC_EVENT_WATCHER_H_
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
namespace mojo {
diff --git a/mojo/public/cpp/bindings/service_factory.cc b/mojo/public/cpp/bindings/service_factory.cc
index bf82ea9e..b8109a3a 100644
--- a/mojo/public/cpp/bindings/service_factory.cc
+++ b/mojo/public/cpp/bindings/service_factory.cc
@@ -4,8 +4,8 @@
#include "mojo/public/cpp/bindings/service_factory.h"
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
namespace mojo {
diff --git a/mojo/public/cpp/bindings/service_factory.h b/mojo/public/cpp/bindings/service_factory.h
index 83256fb..b3d454f 100644
--- a/mojo/public/cpp/bindings/service_factory.h
+++ b/mojo/public/cpp/bindings/service_factory.h
@@ -8,11 +8,11 @@
#include <map>
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/component_export.h"
#include "base/containers/flat_set.h"
#include "base/containers/unique_ptr_adapters.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "mojo/public/cpp/bindings/generic_pending_receiver.h"
#include "mojo/public/cpp/system/message_pipe.h"
diff --git a/mojo/public/cpp/bindings/shared_remote.h b/mojo/public/cpp/bindings/shared_remote.h
index 7e40a94..7271489 100644
--- a/mojo/public/cpp/bindings/shared_remote.h
+++ b/mojo/public/cpp/bindings/shared_remote.h
@@ -8,7 +8,7 @@
#include <memory>
#include <tuple>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/synchronization/waitable_event.h"
diff --git a/mojo/public/cpp/bindings/sync_event_watcher.h b/mojo/public/cpp/bindings/sync_event_watcher.h
index 54311dd6..c369a04 100644
--- a/mojo/public/cpp/bindings/sync_event_watcher.h
+++ b/mojo/public/cpp/bindings/sync_event_watcher.h
@@ -7,8 +7,8 @@
#include <stddef.h>
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/sequence_checker.h"
diff --git a/mojo/public/cpp/bindings/sync_handle_registry.h b/mojo/public/cpp/bindings/sync_handle_registry.h
index e977361..f7cd0eb5 100644
--- a/mojo/public/cpp/bindings/sync_handle_registry.h
+++ b/mojo/public/cpp/bindings/sync_handle_registry.h
@@ -8,10 +8,10 @@
#include <map>
#include <memory>
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/callback_list.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ref_counted.h"
#include "base/sequence_checker.h"
#include "base/synchronization/waitable_event.h"
diff --git a/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc b/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc
index 9ce05bd..4e57b94 100644
--- a/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc
@@ -10,9 +10,9 @@
#include <tuple>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc b/mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc
index ae634a0..18dd5ae 100644
--- a/mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc
@@ -5,9 +5,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/containers/queue.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/synchronization/lock.h"
#include "base/synchronization/waitable_event.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/mojo/public/cpp/bindings/tests/binder_map_unittest.cc b/mojo/public/cpp/bindings/tests/binder_map_unittest.cc
index d38cfac..22f48d6 100644
--- a/mojo/public/cpp/bindings/tests/binder_map_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/binder_map_unittest.cc
@@ -4,7 +4,7 @@
#include "mojo/public/cpp/bindings/binder_map.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/thread_pool.h"
diff --git a/mojo/public/cpp/bindings/tests/bindings_perftest.cc b/mojo/public/cpp/bindings/tests/bindings_perftest.cc
index e3bcc9a..66de30e 100644
--- a/mojo/public/cpp/bindings/tests/bindings_perftest.cc
+++ b/mojo/public/cpp/bindings/tests/bindings_perftest.cc
@@ -5,7 +5,7 @@
#include <stddef.h>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/mojo/public/cpp/bindings/tests/callback_helpers_unittest.cc b/mojo/public/cpp/bindings/tests/callback_helpers_unittest.cc
index 7880bca..31fcb28 100644
--- a/mojo/public/cpp/bindings/tests/callback_helpers_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/callback_helpers_unittest.cc
@@ -8,9 +8,9 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/mojo/public/cpp/bindings/tests/connection_group_unittest.cc b/mojo/public/cpp/bindings/tests/connection_group_unittest.cc
index b85c61de..d97348f 100644
--- a/mojo/public/cpp/bindings/tests/connection_group_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/connection_group_unittest.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/callback_helpers.h"
#include "base/check.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/sequenced_task_runner.h"
#include "base/test/bind.h"
#include "base/test/task_environment.h"
diff --git a/mojo/public/cpp/bindings/tests/connector_unittest.cc b/mojo/public/cpp/bindings/tests/connector_unittest.cc
index f20ebc0..295e042a 100644
--- a/mojo/public/cpp/bindings/tests/connector_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/connector_unittest.cc
@@ -10,8 +10,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/mojo/public/cpp/bindings/tests/e2e_perftest.cc b/mojo/public/cpp/bindings/tests/e2e_perftest.cc
index b1e6ddb..3f9ecb0 100644
--- a/mojo/public/cpp/bindings/tests/e2e_perftest.cc
+++ b/mojo/public/cpp/bindings/tests/e2e_perftest.cc
@@ -5,8 +5,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
diff --git a/mojo/public/cpp/bindings/tests/enum_default_unittest.cc b/mojo/public/cpp/bindings/tests/enum_default_unittest.cc
index 141389b..3ace66f 100644
--- a/mojo/public/cpp/bindings/tests/enum_default_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/enum_default_unittest.cc
@@ -9,7 +9,7 @@
#include <utility>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/run_loop.h"
#include "base/test/bind.h"
#include "base/test/task_environment.h"
diff --git a/mojo/public/cpp/bindings/tests/flush_async_unittest.cc b/mojo/public/cpp/bindings/tests/flush_async_unittest.cc
index 3f77e67..87f8480 100644
--- a/mojo/public/cpp/bindings/tests/flush_async_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/flush_async_unittest.cc
@@ -7,9 +7,9 @@
#include <vector>
#include "base/barrier_closure.h"
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/containers/flat_map.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/synchronization/lock.h"
diff --git a/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc b/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc
index bdd8f90..343a634 100644
--- a/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc
@@ -5,7 +5,7 @@
#include <stdint.h>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "mojo/public/cpp/bindings/receiver.h"
diff --git a/mojo/public/cpp/bindings/tests/idle_tracking_unittest.cc b/mojo/public/cpp/bindings/tests/idle_tracking_unittest.cc
index 977bc374..12f7e7d 100644
--- a/mojo/public/cpp/bindings/tests/idle_tracking_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/idle_tracking_unittest.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/callback_helpers.h"
#include "base/check.h"
+#include "base/functional/callback_helpers.h"
#include "base/notreached.h"
#include "base/run_loop.h"
#include "base/test/bind.h"
diff --git a/mojo/public/cpp/bindings/tests/lazy_serialization_unittest.cc b/mojo/public/cpp/bindings/tests/lazy_serialization_unittest.cc
index b70b03b..7e57c19 100644
--- a/mojo/public/cpp/bindings/tests/lazy_serialization_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/lazy_serialization_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/bind.h"
#include "base/test/task_environment.h"
diff --git a/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc b/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc
index a3c2f239..9253eeb9 100644
--- a/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
diff --git a/mojo/public/cpp/bindings/tests/native_struct_unittest.cc b/mojo/public/cpp/bindings/tests/native_struct_unittest.cc
index b2ce5f5..c40fc0e 100644
--- a/mojo/public/cpp/bindings/tests/native_struct_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/native_struct_unittest.cc
@@ -6,7 +6,7 @@
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "ipc/ipc_param_traits.h"
diff --git a/mojo/public/cpp/bindings/tests/new_endpoint_types_unittest.cc b/mojo/public/cpp/bindings/tests/new_endpoint_types_unittest.cc
index 59ae0c3e..e15179755 100644
--- a/mojo/public/cpp/bindings/tests/new_endpoint_types_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/new_endpoint_types_unittest.cc
@@ -7,8 +7,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "mojo/public/cpp/bindings/associated_receiver.h"
diff --git a/mojo/public/cpp/bindings/tests/pickle_unittest.cc b/mojo/public/cpp/bindings/tests/pickle_unittest.cc
index 9a67cf0c..42b91748 100644
--- a/mojo/public/cpp/bindings/tests/pickle_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/pickle_unittest.cc
@@ -5,8 +5,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/mojo/public/cpp/bindings/tests/receiver_callback_unittest.cc b/mojo/public/cpp/bindings/tests/receiver_callback_unittest.cc
index ee282bc0..169b7c6 100644
--- a/mojo/public/cpp/bindings/tests/receiver_callback_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/receiver_callback_unittest.cc
@@ -4,9 +4,9 @@
#include <stdint.h>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/run_loop.h"
#include "base/test/bind.h"
#include "base/test/gtest_util.h"
diff --git a/mojo/public/cpp/bindings/tests/receiver_set_unittest.cc b/mojo/public/cpp/bindings/tests/receiver_set_unittest.cc
index 50b98a5..59233ee 100644
--- a/mojo/public/cpp/bindings/tests/receiver_set_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/receiver_set_unittest.cc
@@ -5,8 +5,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/test/bind.h"
#include "mojo/public/cpp/bindings/associated_receiver_set.h"
diff --git a/mojo/public/cpp/bindings/tests/receiver_unittest.cc b/mojo/public/cpp/bindings/tests/receiver_unittest.cc
index 37e2c9a4..fa82fc2 100644
--- a/mojo/public/cpp/bindings/tests/receiver_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/receiver_unittest.cc
@@ -5,9 +5,9 @@
#include <stdint.h>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/mojo/public/cpp/bindings/tests/remote_unittest.cc b/mojo/public/cpp/bindings/tests/remote_unittest.cc
index 445381f..3eb2a28f 100644
--- a/mojo/public/cpp/bindings/tests/remote_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/remote_unittest.cc
@@ -8,10 +8,10 @@
#include <utility>
#include "base/barrier_closure.h"
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/debug/dump_without_crashing.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/mojo/public/cpp/bindings/tests/report_bad_message_unittest.cc b/mojo/public/cpp/bindings/tests/report_bad_message_unittest.cc
index 8fb0ca07..a479ac6 100644
--- a/mojo/public/cpp/bindings/tests/report_bad_message_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/report_bad_message_unittest.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/test/bind.h"
#include "mojo/public/cpp/bindings/message.h"
diff --git a/mojo/public/cpp/bindings/tests/request_response_unittest.cc b/mojo/public/cpp/bindings/tests/request_response_unittest.cc
index a22ffdb9..3645739 100644
--- a/mojo/public/cpp/bindings/tests/request_response_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/request_response_unittest.cc
@@ -5,7 +5,7 @@
#include <stdint.h>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/bind.h"
#include "mojo/public/cpp/bindings/receiver.h"
diff --git a/mojo/public/cpp/bindings/tests/router_test_util.h b/mojo/public/cpp/bindings/tests/router_test_util.h
index 8939284..0c18364 100644
--- a/mojo/public/cpp/bindings/tests/router_test_util.h
+++ b/mojo/public/cpp/bindings/tests/router_test_util.h
@@ -10,7 +10,7 @@
#include <string>
#include <utility>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "mojo/public/cpp/bindings/message.h"
diff --git a/mojo/public/cpp/bindings/tests/service_factory_unittest.cc b/mojo/public/cpp/bindings/tests/service_factory_unittest.cc
index 3df296754..19393397 100644
--- a/mojo/public/cpp/bindings/tests/service_factory_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/service_factory_unittest.cc
@@ -4,8 +4,8 @@
#include "mojo/public/cpp/bindings/service_factory.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/test/bind.h"
#include "base/test/task_environment.h"
diff --git a/mojo/public/cpp/bindings/tests/struct_traits_unittest.cc b/mojo/public/cpp/bindings/tests/struct_traits_unittest.cc
index 005d927..7395550 100644
--- a/mojo/public/cpp/bindings/tests/struct_traits_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/struct_traits_unittest.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
diff --git a/mojo/public/cpp/bindings/tests/sync_handle_registry_unittest.cc b/mojo/public/cpp/bindings/tests/sync_handle_registry_unittest.cc
index d89d965..f2c8c7dd 100644
--- a/mojo/public/cpp/bindings/tests/sync_handle_registry_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/sync_handle_registry_unittest.cc
@@ -4,10 +4,10 @@
#include <memory>
-#include "mojo/public/cpp/bindings/sync_handle_registry.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted.h"
#include "base/synchronization/waitable_event.h"
+#include "mojo/public/cpp/bindings/sync_handle_registry.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace mojo {
diff --git a/mojo/public/cpp/bindings/tests/sync_method_unittest.cc b/mojo/public/cpp/bindings/tests/sync_method_unittest.cc
index 0c434ab..7bf0450 100644
--- a/mojo/public/cpp/bindings/tests/sync_method_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/sync_method_unittest.cc
@@ -6,8 +6,8 @@
#include <utility>
#include "base/barrier_closure.h"
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/sequence_token.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/mojo/public/cpp/bindings/tests/union_unittest.cc b/mojo/public/cpp/bindings/tests/union_unittest.cc
index 08a5c4c..24a586e 100644
--- a/mojo/public/cpp/bindings/tests/union_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/union_unittest.cc
@@ -7,8 +7,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/containers/flat_map.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "mojo/public/cpp/bindings/lib/array_internal.h"
diff --git a/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc b/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc
index 02f1098..250e518 100644
--- a/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "mojo/public/cpp/bindings/lib/message_fragment.h"
diff --git a/mojo/public/cpp/system/data_pipe_drainer.cc b/mojo/public/cpp/system/data_pipe_drainer.cc
index 54a926d..c16a766 100644
--- a/mojo/public/cpp/system/data_pipe_drainer.cc
+++ b/mojo/public/cpp/system/data_pipe_drainer.cc
@@ -8,7 +8,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
namespace mojo {
diff --git a/mojo/public/cpp/system/data_pipe_producer.cc b/mojo/public/cpp/system/data_pipe_producer.cc
index 8902ee16..69cd8b3e 100644
--- a/mojo/public/cpp/system/data_pipe_producer.cc
+++ b/mojo/public/cpp/system/data_pipe_producer.cc
@@ -9,8 +9,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/memory/ref_counted_delete_on_sequence.h"
#include "base/numerics/safe_conversions.h"
diff --git a/mojo/public/cpp/system/data_pipe_producer.h b/mojo/public/cpp/system/data_pipe_producer.h
index 232933a..36a13ba 100644
--- a/mojo/public/cpp/system/data_pipe_producer.h
+++ b/mojo/public/cpp/system/data_pipe_producer.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback_forward.h"
#include "base/containers/span.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "mojo/public/cpp/system/data_pipe.h"
diff --git a/mojo/public/cpp/system/data_pipe_utils.cc b/mojo/public/cpp/system/data_pipe_utils.cc
index ee5f101..f72a358 100644
--- a/mojo/public/cpp/system/data_pipe_utils.cc
+++ b/mojo/public/cpp/system/data_pipe_utils.cc
@@ -4,8 +4,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "mojo/public/cpp/system/data_pipe_utils.h"
#include "mojo/public/cpp/system/wait.h"
diff --git a/mojo/public/cpp/system/functions.cc b/mojo/public/cpp/system/functions.cc
index bb10081..7556921 100644
--- a/mojo/public/cpp/system/functions.cc
+++ b/mojo/public/cpp/system/functions.cc
@@ -4,7 +4,7 @@
#include "mojo/public/cpp/system/functions.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/no_destructor.h"
#include "mojo/public/c/system/invitation.h"
diff --git a/mojo/public/cpp/system/functions.h b/mojo/public/cpp/system/functions.h
index e4d3601..1d5532f 100644
--- a/mojo/public/cpp/system/functions.h
+++ b/mojo/public/cpp/system/functions.h
@@ -13,7 +13,7 @@
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "mojo/public/c/system/functions.h"
#include "mojo/public/cpp/system/system_export.h"
diff --git a/mojo/public/cpp/system/handle_signal_tracker.cc b/mojo/public/cpp/system/handle_signal_tracker.cc
index 41354c7..1b64831 100644
--- a/mojo/public/cpp/system/handle_signal_tracker.cc
+++ b/mojo/public/cpp/system/handle_signal_tracker.cc
@@ -4,7 +4,7 @@
#include "mojo/public/cpp/system/handle_signal_tracker.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/synchronization/lock.h"
#include "base/task/sequenced_task_runner.h"
#include "mojo/public/cpp/system/handle_signals_state.h"
diff --git a/mojo/public/cpp/system/handle_signal_tracker.h b/mojo/public/cpp/system/handle_signal_tracker.h
index 201a2580..45e3635f 100644
--- a/mojo/public/cpp/system/handle_signal_tracker.h
+++ b/mojo/public/cpp/system/handle_signal_tracker.h
@@ -5,7 +5,7 @@
#ifndef MOJO_PUBLIC_CPP_SYSTEM_HANDLE_SIGNAL_TRACKER_H_
#define MOJO_PUBLIC_CPP_SYSTEM_HANDLE_SIGNAL_TRACKER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/task/sequenced_task_runner.h"
#include "mojo/public/c/system/types.h"
#include "mojo/public/cpp/system/handle.h"
diff --git a/mojo/public/cpp/system/invitation.h b/mojo/public/cpp/system/invitation.h
index b208a4f..8dbb8591 100644
--- a/mojo/public/cpp/system/invitation.h
+++ b/mojo/public/cpp/system/invitation.h
@@ -8,8 +8,8 @@
#include <cstdint>
#include <string>
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/process/process_handle.h"
#include "base/strings/string_piece.h"
#include "mojo/public/c/system/invitation.h"
diff --git a/mojo/public/cpp/system/scope_to_message_pipe.h b/mojo/public/cpp/system/scope_to_message_pipe.h
index 40a92541..e00e3ee1 100644
--- a/mojo/public/cpp/system/scope_to_message_pipe.h
+++ b/mojo/public/cpp/system/scope_to_message_pipe.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "mojo/public/cpp/system/message_pipe.h"
#include "mojo/public/cpp/system/simple_watcher.h"
#include "mojo/public/cpp/system/system_export.h"
diff --git a/mojo/public/cpp/system/simple_watcher.cc b/mojo/public/cpp/system/simple_watcher.cc
index f061eddb..ad2cfb9 100644
--- a/mojo/public/cpp/system/simple_watcher.cc
+++ b/mojo/public/cpp/system/simple_watcher.cc
@@ -4,7 +4,7 @@
#include "mojo/public/cpp/system/simple_watcher.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/synchronization/lock.h"
#include "base/task/common/task_annotator.h"
diff --git a/mojo/public/cpp/system/simple_watcher.h b/mojo/public/cpp/system/simple_watcher.h
index efc0e0b..b061474 100644
--- a/mojo/public/cpp/system/simple_watcher.h
+++ b/mojo/public/cpp/system/simple_watcher.h
@@ -5,8 +5,8 @@
#ifndef MOJO_PUBLIC_CPP_SYSTEM_SIMPLE_WATCHER_H_
#define MOJO_PUBLIC_CPP_SYSTEM_SIMPLE_WATCHER_H_
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/mojo/public/cpp/system/tests/data_pipe_drainer_unittest.cc b/mojo/public/cpp/system/tests/data_pipe_drainer_unittest.cc
index 6ba98c3..91cfa2a 100644
--- a/mojo/public/cpp/system/tests/data_pipe_drainer_unittest.cc
+++ b/mojo/public/cpp/system/tests/data_pipe_drainer_unittest.cc
@@ -4,8 +4,8 @@
#include "mojo/public/cpp/system/data_pipe_drainer.h"
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "base/values.h"
diff --git a/mojo/public/cpp/system/tests/data_pipe_producer_unittest.cc b/mojo/public/cpp/system/tests/data_pipe_producer_unittest.cc
index b9d1b86..49d5a90d 100644
--- a/mojo/public/cpp/system/tests/data_pipe_producer_unittest.cc
+++ b/mojo/public/cpp/system/tests/data_pipe_producer_unittest.cc
@@ -7,11 +7,11 @@
#include <memory>
#include <string>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/files/file.h"
#include "base/files/file_path.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
diff --git a/mojo/public/cpp/system/tests/handle_signal_tracker_unittest.cc b/mojo/public/cpp/system/tests/handle_signal_tracker_unittest.cc
index 77178c9..2006e46 100644
--- a/mojo/public/cpp/system/tests/handle_signal_tracker_unittest.cc
+++ b/mojo/public/cpp/system/tests/handle_signal_tracker_unittest.cc
@@ -4,7 +4,7 @@
#include "mojo/public/cpp/system/handle_signal_tracker.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "mojo/core/embedder/embedder.h"
diff --git a/mojo/public/cpp/system/tests/invitation_unittest.cc b/mojo/public/cpp/system/tests/invitation_unittest.cc
index af4d14a..5a92c7d 100644
--- a/mojo/public/cpp/system/tests/invitation_unittest.cc
+++ b/mojo/public/cpp/system/tests/invitation_unittest.cc
@@ -8,11 +8,11 @@
#include "base/base_paths.h"
#include "base/base_switches.h"
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check_op.h"
#include "base/command_line.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/path_service.h"
#include "base/run_loop.h"
#include "base/strings/string_piece.h"
diff --git a/mojo/public/cpp/system/tests/scope_to_message_pipe_unittest.cc b/mojo/public/cpp/system/tests/scope_to_message_pipe_unittest.cc
index ed1ca4f39..360e378 100644
--- a/mojo/public/cpp/system/tests/scope_to_message_pipe_unittest.cc
+++ b/mojo/public/cpp/system/tests/scope_to_message_pipe_unittest.cc
@@ -4,8 +4,8 @@
#include "mojo/public/cpp/system/scope_to_message_pipe.h"
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/run_loop.h"
#include "base/test/bind.h"
#include "base/test/task_environment.h"
diff --git a/mojo/public/cpp/system/tests/simple_watcher_unittest.cc b/mojo/public/cpp/system/tests/simple_watcher_unittest.cc
index d2fc06f..e94579d 100644
--- a/mojo/public/cpp/system/tests/simple_watcher_unittest.cc
+++ b/mojo/public/cpp/system/tests/simple_watcher_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/run_loop.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/mojo/public/cpp/system/tests/string_data_source_unittest.cc b/mojo/public/cpp/system/tests/string_data_source_unittest.cc
index fab4c3a..8348ce2 100644
--- a/mojo/public/cpp/system/tests/string_data_source_unittest.cc
+++ b/mojo/public/cpp/system/tests/string_data_source_unittest.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <string>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/run_loop.h"
#include "base/strings/string_piece.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/mojo/public/cpp/system/tests/wait_set_unittest.cc b/mojo/public/cpp/system/tests/wait_set_unittest.cc
index a7c3870dd..d847f61e 100644
--- a/mojo/public/cpp/system/tests/wait_set_unittest.cc
+++ b/mojo/public/cpp/system/tests/wait_set_unittest.cc
@@ -7,8 +7,8 @@
#include <set>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/platform_thread.h"
diff --git a/mojo/public/cpp/system/tests/wait_unittest.cc b/mojo/public/cpp/system/tests/wait_unittest.cc
index 35b5ff4..54210d5 100644
--- a/mojo/public/cpp/system/tests/wait_unittest.cc
+++ b/mojo/public/cpp/system/tests/wait_unittest.cc
@@ -7,8 +7,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/strings/string_piece.h"
#include "base/threading/platform_thread.h"
#include "base/threading/simple_thread.h"
diff --git a/mojo/public/cpp/test_support/lib/test_utils.cc b/mojo/public/cpp/test_support/lib/test_utils.cc
index 3b199333..6344e2e 100644
--- a/mojo/public/cpp/test_support/lib/test_utils.cc
+++ b/mojo/public/cpp/test_support/lib/test_utils.cc
@@ -9,8 +9,8 @@
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/ranges/algorithm.h"
#include "mojo/public/cpp/system/functions.h"
#include "mojo/public/cpp/system/message_pipe.h"
diff --git a/mojo/public/java/system/base_run_loop.cc b/mojo/public/java/system/base_run_loop.cc
index 2406aa4..e90ee9c9 100644
--- a/mojo/public/java/system/base_run_loop.cc
+++ b/mojo/public/java/system/base_run_loop.cc
@@ -6,7 +6,7 @@
#include "base/android/jni_android.h"
#include "base/android/scoped_java_ref.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_executor.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/mojo/public/java/system/javatests/mojo_test_rule.cc b/mojo/public/java/system/javatests/mojo_test_rule.cc
index e9fddd3..da925286 100644
--- a/mojo/public/java/system/javatests/mojo_test_rule.cc
+++ b/mojo/public/java/system/javatests/mojo_test_rule.cc
@@ -5,7 +5,7 @@
#include "base/android/jni_android.h"
#include "base/android/scoped_java_ref.h"
#include "base/at_exit.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_executor.h"
diff --git a/mojo/public/java/system/watcher_impl.cc b/mojo/public/java/system/watcher_impl.cc
index 67678b8..3fa1835 100644
--- a/mojo/public/java/system/watcher_impl.cc
+++ b/mojo/public/java/system/watcher_impl.cc
@@ -7,7 +7,7 @@
#include "base/android/jni_android.h"
#include "base/android/scoped_java_ref.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "mojo/public/cpp/system/handle.h"
#include "mojo/public/cpp/system/simple_watcher.h"
diff --git a/mojo/public/tools/bindings/generators/mojolpm_templates/mojolpm.cc.tmpl b/mojo/public/tools/bindings/generators/mojolpm_templates/mojolpm.cc.tmpl
index 5c9cbb2c..e2d32d8 100644
--- a/mojo/public/tools/bindings/generators/mojolpm_templates/mojolpm.cc.tmpl
+++ b/mojo/public/tools/bindings/generators/mojolpm_templates/mojolpm.cc.tmpl
@@ -6,7 +6,7 @@
#include <functional>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "mojo/public/cpp/bindings/default_construct_traits.h"
{% for extra_traits_header in all_extra_traits_headers %}
diff --git a/mojo/public/tools/fuzzers/mojo_fuzzer_message_dump.cc b/mojo/public/tools/fuzzers/mojo_fuzzer_message_dump.cc
index e0a7103..c4af210 100644
--- a/mojo/public/tools/fuzzers/mojo_fuzzer_message_dump.cc
+++ b/mojo/public/tools/fuzzers/mojo_fuzzer_message_dump.cc
@@ -5,9 +5,9 @@
#include <stddef.h>
#include <stdint.h>
-#include "base/bind.h"
#include "base/containers/flat_map.h"
#include "base/files/file.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
#include "base/task/single_thread_task_executor.h"
diff --git a/mojo/public/tools/fuzzers/mojo_parse_message_fuzzer.cc b/mojo/public/tools/fuzzers/mojo_parse_message_fuzzer.cc
index 0628b40..7bbdae6 100644
--- a/mojo/public/tools/fuzzers/mojo_parse_message_fuzzer.cc
+++ b/mojo/public/tools/fuzzers/mojo_parse_message_fuzzer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/message_loop/message_pump_type.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_executor.h"
diff --git a/mojo/public/tools/fuzzers/mojo_parse_message_proto_fuzzer.cc b/mojo/public/tools/fuzzers/mojo_parse_message_proto_fuzzer.cc
index c74b218..cd9c5c2 100644
--- a/mojo/public/tools/fuzzers/mojo_parse_message_proto_fuzzer.cc
+++ b/mojo/public/tools/fuzzers/mojo_parse_message_proto_fuzzer.cc
@@ -5,7 +5,7 @@
// Implementation of a proto version of mojo_parse_message_fuzzer that sends
// multiple messages per run.
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/message_loop/message_pump_type.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_executor.h"