Update header includes for /base/functional in /d*, /e*, /f*
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: I6ce44f5813ff87215cb0df1d13bb649885a54c6a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4152775
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Auto-Submit: Avi Drissman <avi@chromium.org>
Owners-Override: Avi Drissman <avi@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Owners-Override: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1091122}
diff --git a/dbus/bus.cc b/dbus/bus.cc
index 35b1eda..0bd29c0b 100644
--- a/dbus/bus.cc
+++ b/dbus/bus.cc
@@ -8,8 +8,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/files/file_descriptor_watcher_posix.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/dbus/bus.h b/dbus/bus.h
index 6e85905..139a8ae2 100644
--- a/dbus/bus.h
+++ b/dbus/bus.h
@@ -14,7 +14,7 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/synchronization/waitable_event.h"
diff --git a/dbus/bus_unittest.cc b/dbus/bus_unittest.cc
index ec10880..6ef46e5 100644
--- a/dbus/bus_unittest.cc
+++ b/dbus/bus_unittest.cc
@@ -6,9 +6,9 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/files/file_descriptor_watcher_posix.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ref_counted.h"
#include "base/message_loop/message_pump_type.h"
#include "base/run_loop.h"
diff --git a/dbus/end_to_end_async_unittest.cc b/dbus/end_to_end_async_unittest.cc
index c038633a..30f3f07 100644
--- a/dbus/end_to_end_async_unittest.cc
+++ b/dbus/end_to_end_async_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/memory/raw_ptr.h"
#include "base/message_loop/message_pump_type.h"
#include "base/run_loop.h"
diff --git a/dbus/exported_object.cc b/dbus/exported_object.cc
index b9c990ac..65f7c44d 100644
--- a/dbus/exported_object.cc
+++ b/dbus/exported_object.cc
@@ -7,7 +7,7 @@
#include <stdint.h>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/metrics/histogram_macros.h"
diff --git a/dbus/exported_object.h b/dbus/exported_object.h
index ee96037..0c4b966 100644
--- a/dbus/exported_object.h
+++ b/dbus/exported_object.h
@@ -12,7 +12,7 @@
#include <string>
#include <utility>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/platform_thread.h"
diff --git a/dbus/mock_unittest.cc b/dbus/mock_unittest.cc
index 8be177c..5adbe06 100644
--- a/dbus/mock_unittest.cc
+++ b/dbus/mock_unittest.cc
@@ -4,7 +4,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
diff --git a/dbus/object_manager.cc b/dbus/object_manager.cc
index f57167a..cc3104c 100644
--- a/dbus/object_manager.cc
+++ b/dbus/object_manager.cc
@@ -6,8 +6,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/location.h"
#include "base/logging.h"
#include "base/metrics/histogram.h"
diff --git a/dbus/object_manager_unittest.cc b/dbus/object_manager_unittest.cc
index 6329aea..859220a 100644
--- a/dbus/object_manager_unittest.cc
+++ b/dbus/object_manager_unittest.cc
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/message_loop/message_pump_type.h"
#include "base/run_loop.h"
diff --git a/dbus/object_proxy.cc b/dbus/object_proxy.cc
index 3314ebbf..9e1a0c93 100644
--- a/dbus/object_proxy.cc
+++ b/dbus/object_proxy.cc
@@ -7,10 +7,10 @@
#include <stddef.h>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/debug/alias.h"
#include "base/debug/leak_annotations.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/string_piece.h"
diff --git a/dbus/object_proxy.h b/dbus/object_proxy.h
index 59186fc..fcfe816 100644
--- a/dbus/object_proxy.h
+++ b/dbus/object_proxy.h
@@ -13,7 +13,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "base/strings/string_piece.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/dbus/object_proxy_unittest.cc b/dbus/object_proxy_unittest.cc
index 6d88e342..c5760613 100644
--- a/dbus/object_proxy_unittest.cc
+++ b/dbus/object_proxy_unittest.cc
@@ -4,7 +4,7 @@
#include "dbus/object_proxy.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
diff --git a/dbus/property.cc b/dbus/property.cc
index ad88ea5..37f5e06c 100644
--- a/dbus/property.cc
+++ b/dbus/property.cc
@@ -8,7 +8,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "dbus/message.h"
diff --git a/dbus/property.h b/dbus/property.h
index f6a4ba2..a49d672 100644
--- a/dbus/property.h
+++ b/dbus/property.h
@@ -12,8 +12,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/raw_ptr.h"
#include "dbus/dbus_export.h"
#include "dbus/message.h"
diff --git a/dbus/property_unittest.cc b/dbus/property_unittest.cc
index eef44ba..f08e5f7 100644
--- a/dbus/property_unittest.cc
+++ b/dbus/property_unittest.cc
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/message_loop/message_pump_type.h"
#include "base/run_loop.h"
diff --git a/dbus/signal_sender_verification_unittest.cc b/dbus/signal_sender_verification_unittest.cc
index c412fbeb..18036b58 100644
--- a/dbus/signal_sender_verification_unittest.cc
+++ b/dbus/signal_sender_verification_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/message_loop/message_pump_type.h"
#include "base/metrics/histogram_macros.h"
diff --git a/dbus/test_service.cc b/dbus/test_service.cc
index a779536..5bd0d90 100644
--- a/dbus/test_service.cc
+++ b/dbus/test_service.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/guid.h"
#include "base/logging.h"
#include "base/message_loop/message_pump_type.h"
diff --git a/device/base/device_monitor_linux.cc b/device/base/device_monitor_linux.cc
index 9f75f5b..d356a81 100644
--- a/device/base/device_monitor_linux.cc
+++ b/device/base/device_monitor_linux.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/observer_list.h"
diff --git a/device/base/device_monitor_win.cc b/device/base/device_monitor_win.cc
index 3cb8b543..403e519 100644
--- a/device/base/device_monitor_win.cc
+++ b/device/base/device_monitor_win.cc
@@ -13,8 +13,8 @@
#include <memory>
#include "base/at_exit.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/strings/string_util.h"
#include "base/strings/sys_string_conversions.h"
diff --git a/device/base/event_utils_winrt.h b/device/base/event_utils_winrt.h
index 3278e7a..d07b146 100644
--- a/device/base/event_utils_winrt.h
+++ b/device/base/event_utils_winrt.h
@@ -12,8 +12,8 @@
#include <ios>
#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/logging.h"
#include "base/memory/scoped_refptr.h"
diff --git a/device/bluetooth/adapter.cc b/device/bluetooth/adapter.cc
index e19dda2..b8bbc20 100644
--- a/device/bluetooth/adapter.cc
+++ b/device/bluetooth/adapter.cc
@@ -8,9 +8,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/memory/ptr_util.h"
#include "base/metrics/histogram_functions.h"
#include "build/build_config.h"
diff --git a/device/bluetooth/adapter_unittest.cc b/device/bluetooth/adapter_unittest.cc
index 07ae420..cc43ba0 100644
--- a/device/bluetooth/adapter_unittest.cc
+++ b/device/bluetooth/adapter_unittest.cc
@@ -4,8 +4,8 @@
#include "device/bluetooth/adapter.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/thread_pool.h"
diff --git a/device/bluetooth/advertisement.cc b/device/bluetooth/advertisement.cc
index 5b552d68..32a4db69 100644
--- a/device/bluetooth/advertisement.cc
+++ b/device/bluetooth/advertisement.cc
@@ -4,8 +4,8 @@
#include "device/bluetooth/advertisement.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
namespace bluetooth {
diff --git a/device/bluetooth/bluetooth_adapter.cc b/device/bluetooth/bluetooth_adapter.cc
index 5cc8ba4e..c9199f6 100644
--- a/device/bluetooth/bluetooth_adapter.cc
+++ b/device/bluetooth/bluetooth_adapter.cc
@@ -8,8 +8,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/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
diff --git a/device/bluetooth/bluetooth_adapter.h b/device/bluetooth/bluetooth_adapter.h
index 97cc160..9505f0a 100644
--- a/device/bluetooth/bluetooth_adapter.h
+++ b/device/bluetooth/bluetooth_adapter.h
@@ -15,8 +15,8 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
#include "base/containers/queue.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
diff --git a/device/bluetooth/bluetooth_adapter_android.cc b/device/bluetooth/bluetooth_adapter_android.cc
index 15a0a6e..8a051ac 100644
--- a/device/bluetooth/bluetooth_adapter_android.cc
+++ b/device/bluetooth/bluetooth_adapter_android.cc
@@ -10,8 +10,8 @@
#include "base/android/jni_android.h"
#include "base/android/jni_array.h"
#include "base/android/jni_string.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 "device/bluetooth/android/wrappers.h"
diff --git a/device/bluetooth/bluetooth_adapter_android_unittest.cc b/device/bluetooth/bluetooth_adapter_android_unittest.cc
index 808fe9a..d737eb8 100644
--- a/device/bluetooth/bluetooth_adapter_android_unittest.cc
+++ b/device/bluetooth/bluetooth_adapter_android_unittest.cc
@@ -4,7 +4,7 @@
#include "device/bluetooth/bluetooth_adapter_android.h"
#include "base/android/jni_string.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "device/bluetooth/android/wrappers.h"
#include "device/bluetooth/bluetooth_discovery_filter.h"
diff --git a/device/bluetooth/bluetooth_adapter_factory.cc b/device/bluetooth/bluetooth_adapter_factory.cc
index 617bfe76d..4b76da7 100644
--- a/device/bluetooth/bluetooth_adapter_factory.cc
+++ b/device/bluetooth/bluetooth_adapter_factory.cc
@@ -8,8 +8,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/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
diff --git a/device/bluetooth/bluetooth_adapter_factory.h b/device/bluetooth/bluetooth_adapter_factory.h
index 63b4751..a3ee043 100644
--- a/device/bluetooth/bluetooth_adapter_factory.h
+++ b/device/bluetooth/bluetooth_adapter_factory.h
@@ -5,7 +5,7 @@
#ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_FACTORY_H_
#define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_FACTORY_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "build/build_config.h"
diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm
index 2414f91..0c4121f1 100644
--- a/device/bluetooth/bluetooth_adapter_mac.mm
+++ b/device/bluetooth/bluetooth_adapter_mac.mm
@@ -15,8 +15,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/mac/foundation_util.h"
diff --git a/device/bluetooth/bluetooth_adapter_mac_unittest.mm b/device/bluetooth/bluetooth_adapter_mac_unittest.mm
index eb97950..63c4dfd 100644
--- a/device/bluetooth/bluetooth_adapter_mac_unittest.mm
+++ b/device/bluetooth/bluetooth_adapter_mac_unittest.mm
@@ -11,10 +11,10 @@
#include <memory>
-#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/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/device/bluetooth/bluetooth_adapter_unittest.cc b/device/bluetooth/bluetooth_adapter_unittest.cc
index adbcbd1..1da5c99 100644
--- a/device/bluetooth/bluetooth_adapter_unittest.cc
+++ b/device/bluetooth/bluetooth_adapter_unittest.cc
@@ -12,8 +12,8 @@
#include <vector>
#include "base/barrier_closure.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/ref_counted.h"
#include "base/run_loop.h"
diff --git a/device/bluetooth/bluetooth_adapter_win.cc b/device/bluetooth/bluetooth_adapter_win.cc
index 11fc7133..31ceac0 100644
--- a/device/bluetooth/bluetooth_adapter_win.cc
+++ b/device/bluetooth/bluetooth_adapter_win.cc
@@ -8,9 +8,9 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/check.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/notreached.h"
diff --git a/device/bluetooth/bluetooth_adapter_win_unittest.cc b/device/bluetooth/bluetooth_adapter_win_unittest.cc
index 6568505..dcbc4e7 100644
--- a/device/bluetooth/bluetooth_adapter_win_unittest.cc
+++ b/device/bluetooth/bluetooth_adapter_win_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/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
diff --git a/device/bluetooth/bluetooth_adapter_winrt.cc b/device/bluetooth/bluetooth_adapter_winrt.cc
index 42060d4..d0cea6e3 100644
--- a/device/bluetooth/bluetooth_adapter_winrt.cc
+++ b/device/bluetooth/bluetooth_adapter_winrt.cc
@@ -13,12 +13,12 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
#include "base/containers/cxx20_erase.h"
#include "base/containers/span.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/scoped_refptr.h"
diff --git a/device/bluetooth/bluetooth_adapter_winrt.h b/device/bluetooth/bluetooth_adapter_winrt.h
index 139fa3e..b87fcf6 100644
--- a/device/bluetooth/bluetooth_adapter_winrt.h
+++ b/device/bluetooth/bluetooth_adapter_winrt.h
@@ -14,8 +14,8 @@
#include <string>
#include <vector>
-#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/scoped_refptr.h"
#include "base/threading/thread_checker.h"
#include "device/bluetooth/bluetooth_adapter.h"
diff --git a/device/bluetooth/bluetooth_advertisement.h b/device/bluetooth/bluetooth_advertisement.h
index 686d6be..c3722e3 100644
--- a/device/bluetooth/bluetooth_advertisement.h
+++ b/device/bluetooth/bluetooth_advertisement.h
@@ -12,7 +12,7 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "base/observer_list.h"
#include "build/build_config.h"
diff --git a/device/bluetooth/bluetooth_advertisement_mac.mm b/device/bluetooth/bluetooth_advertisement_mac.mm
index daa85ca..0014beef 100644
--- a/device/bluetooth/bluetooth_advertisement_mac.mm
+++ b/device/bluetooth/bluetooth_advertisement_mac.mm
@@ -4,7 +4,7 @@
#include "device/bluetooth/bluetooth_advertisement_mac.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#import "base/task/single_thread_task_runner.h"
#include "device/bluetooth/bluetooth_adapter_mac.h"
diff --git a/device/bluetooth/bluetooth_advertisement_winrt.cc b/device/bluetooth/bluetooth_advertisement_winrt.cc
index eb75e4db..873d609 100644
--- a/device/bluetooth/bluetooth_advertisement_winrt.cc
+++ b/device/bluetooth/bluetooth_advertisement_winrt.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/strings/string_piece.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/device/bluetooth/bluetooth_classic_device_mac.mm b/device/bluetooth/bluetooth_classic_device_mac.mm
index 7310b6fe..97bd68a7 100644
--- a/device/bluetooth/bluetooth_classic_device_mac.mm
+++ b/device/bluetooth/bluetooth_classic_device_mac.mm
@@ -6,7 +6,7 @@
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/hash/hash.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
diff --git a/device/bluetooth/bluetooth_device.h b/device/bluetooth/bluetooth_device.h
index f314669..382cf8a7 100644
--- a/device/bluetooth/bluetooth_device.h
+++ b/device/bluetooth/bluetooth_device.h
@@ -15,9 +15,9 @@
#include <unordered_set>
#include <vector>
-#include "base/callback.h"
#include "base/containers/flat_map.h"
#include "base/containers/flat_set.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_refptr.h"
#include "base/strings/string_piece_forward.h"
diff --git a/device/bluetooth/bluetooth_device_unittest.cc b/device/bluetooth/bluetooth_device_unittest.cc
index c945fdd..8834f34 100644
--- a/device/bluetooth/bluetooth_device_unittest.cc
+++ b/device/bluetooth/bluetooth_device_unittest.cc
@@ -6,8 +6,8 @@
#include <stddef.h>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/device/bluetooth/bluetooth_device_win.cc b/device/bluetooth/bluetooth_device_win.cc
index 44b6407..5565deaa 100644
--- a/device/bluetooth/bluetooth_device_win.cc
+++ b/device/bluetooth/bluetooth_device_win.cc
@@ -7,8 +7,8 @@
#include <string>
#include <unordered_map>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/notreached.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/device/bluetooth/bluetooth_device_win_unittest.cc b/device/bluetooth/bluetooth_device_win_unittest.cc
index cfee90d..4f5c12a90 100644
--- a/device/bluetooth/bluetooth_device_win_unittest.cc
+++ b/device/bluetooth/bluetooth_device_win_unittest.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.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/device/bluetooth/bluetooth_device_winrt.cc b/device/bluetooth/bluetooth_device_winrt.cc
index 0751cec..2d30969 100644
--- a/device/bluetooth/bluetooth_device_winrt.cc
+++ b/device/bluetooth/bluetooth_device_winrt.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/logging.h"
#include "base/strings/string_piece.h"
#include "base/strings/stringprintf.h"
diff --git a/device/bluetooth/bluetooth_device_winrt.h b/device/bluetooth/bluetooth_device_winrt.h
index 675f445..02c93c83 100644
--- a/device/bluetooth/bluetooth_device_winrt.h
+++ b/device/bluetooth/bluetooth_device_winrt.h
@@ -14,8 +14,8 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
#include "base/feature_list.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "base/win/windows_version.h"
diff --git a/device/bluetooth/bluetooth_discovery_session.cc b/device/bluetooth/bluetooth_discovery_session.cc
index 14a0e14..539cb20 100644
--- a/device/bluetooth/bluetooth_discovery_session.cc
+++ b/device/bluetooth/bluetooth_discovery_session.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/logging.h"
#include "device/bluetooth/bluetooth_adapter.h"
#include "device/bluetooth/bluetooth_discovery_filter.h"
diff --git a/device/bluetooth/bluetooth_discovery_session.h b/device/bluetooth/bluetooth_discovery_session.h
index b7e7972b..ca092b5 100644
--- a/device/bluetooth/bluetooth_discovery_session.h
+++ b/device/bluetooth/bluetooth_discovery_session.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "device/bluetooth/bluetooth_adapter.h"
diff --git a/device/bluetooth/bluetooth_gatt_characteristic.h b/device/bluetooth/bluetooth_gatt_characteristic.h
index f15999a..406d85f 100644
--- a/device/bluetooth/bluetooth_gatt_characteristic.h
+++ b/device/bluetooth/bluetooth_gatt_characteristic.h
@@ -8,8 +8,8 @@
#include <stdint.h>
#include <string>
-#include "base/callback.h"
-#include "base/callback_forward.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_forward.h"
#include "device/bluetooth/bluetooth_export.h"
#include "device/bluetooth/bluetooth_gatt_service.h"
#include "device/bluetooth/public/cpp/bluetooth_uuid.h"
diff --git a/device/bluetooth/bluetooth_gatt_connection.h b/device/bluetooth/bluetooth_gatt_connection.h
index 818a5df3..df2bb6a 100644
--- a/device/bluetooth/bluetooth_gatt_connection.h
+++ b/device/bluetooth/bluetooth_gatt_connection.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/bluetooth_gatt_descriptor.h b/device/bluetooth/bluetooth_gatt_descriptor.h
index bafc259f..699ca7980 100644
--- a/device/bluetooth/bluetooth_gatt_descriptor.h
+++ b/device/bluetooth/bluetooth_gatt_descriptor.h
@@ -7,8 +7,8 @@
#include <string>
-#include "base/callback.h"
-#include "base/callback_forward.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_forward.h"
#include "device/bluetooth/bluetooth_export.h"
#include "device/bluetooth/bluetooth_gatt_characteristic.h"
#include "device/bluetooth/bluetooth_gatt_service.h"
diff --git a/device/bluetooth/bluetooth_gatt_discoverer_winrt.cc b/device/bluetooth/bluetooth_gatt_discoverer_winrt.cc
index 389b3e43..7fe12d0 100644
--- a/device/bluetooth/bluetooth_gatt_discoverer_winrt.cc
+++ b/device/bluetooth/bluetooth_gatt_discoverer_winrt.cc
@@ -8,8 +8,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/strings/stringprintf.h"
#include "base/win/post_async_results.h"
diff --git a/device/bluetooth/bluetooth_gatt_discoverer_winrt.h b/device/bluetooth/bluetooth_gatt_discoverer_winrt.h
index 5bed7c9..86fc599 100644
--- a/device/bluetooth/bluetooth_gatt_discoverer_winrt.h
+++ b/device/bluetooth/bluetooth_gatt_discoverer_winrt.h
@@ -14,8 +14,8 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
#include "base/containers/flat_map.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "device/bluetooth/bluetooth_device.h"
diff --git a/device/bluetooth/bluetooth_gatt_notify_session.cc b/device/bluetooth/bluetooth_gatt_notify_session.cc
index ec83b52..1f5dd75 100644
--- a/device/bluetooth/bluetooth_gatt_notify_session.cc
+++ b/device/bluetooth/bluetooth_gatt_notify_session.cc
@@ -4,8 +4,8 @@
#include "device/bluetooth/bluetooth_gatt_notify_session.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 "device/bluetooth/bluetooth_remote_gatt_characteristic.h"
diff --git a/device/bluetooth/bluetooth_gatt_notify_session.h b/device/bluetooth/bluetooth_gatt_notify_session.h
index fd877614..6d3c73e7 100644
--- a/device/bluetooth/bluetooth_gatt_notify_session.h
+++ b/device/bluetooth/bluetooth_gatt_notify_session.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/bluetooth_gatt_service.h b/device/bluetooth/bluetooth_gatt_service.h
index cb95a0d..02244a24 100644
--- a/device/bluetooth/bluetooth_gatt_service.h
+++ b/device/bluetooth/bluetooth_gatt_service.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "device/bluetooth/bluetooth_export.h"
#include "device/bluetooth/public/cpp/bluetooth_uuid.h"
diff --git a/device/bluetooth/bluetooth_local_gatt_service.h b/device/bluetooth/bluetooth_local_gatt_service.h
index 89513e6..fd17b1c6 100644
--- a/device/bluetooth/bluetooth_local_gatt_service.h
+++ b/device/bluetooth/bluetooth_local_gatt_service.h
@@ -8,8 +8,8 @@
#include <stdint.h>
#include <vector>
-#include "base/callback.h"
-#include "base/callback_forward.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/weak_ptr.h"
#include "device/bluetooth/bluetooth_adapter.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/bluetooth_low_energy_advertisement_manager_mac.mm b/device/bluetooth/bluetooth_low_energy_advertisement_manager_mac.mm
index 9d0ce124..12807b2 100644
--- a/device/bluetooth/bluetooth_low_energy_advertisement_manager_mac.mm
+++ b/device/bluetooth/bluetooth_low_energy_advertisement_manager_mac.mm
@@ -4,7 +4,7 @@
#include "device/bluetooth/bluetooth_low_energy_advertisement_manager_mac.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/mac/scoped_nsobject.h"
#include "base/strings/sys_string_conversions.h"
diff --git a/device/bluetooth/bluetooth_low_energy_advertisement_manager_mac_unittest.mm b/device/bluetooth/bluetooth_low_energy_advertisement_manager_mac_unittest.mm
index ddd4991..aff5b2c 100644
--- a/device/bluetooth/bluetooth_low_energy_advertisement_manager_mac_unittest.mm
+++ b/device/bluetooth/bluetooth_low_energy_advertisement_manager_mac_unittest.mm
@@ -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/memory/ref_counted.h"
#include "base/test/bind.h"
#include "base/test/test_simple_task_runner.h"
diff --git a/device/bluetooth/bluetooth_low_energy_device_watcher_mac.h b/device/bluetooth/bluetooth_low_energy_device_watcher_mac.h
index 8497b40..ba076a0 100644
--- a/device/bluetooth/bluetooth_low_energy_device_watcher_mac.h
+++ b/device/bluetooth/bluetooth_low_energy_device_watcher_mac.h
@@ -9,9 +9,9 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/files/file_path.h"
#include "base/files/file_path_watcher.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "base/sequence_checker.h"
#include "base/task/cancelable_task_tracker.h"
diff --git a/device/bluetooth/bluetooth_low_energy_device_watcher_mac.mm b/device/bluetooth/bluetooth_low_energy_device_watcher_mac.mm
index 70d8f7b..7104a83 100644
--- a/device/bluetooth/bluetooth_low_energy_device_watcher_mac.mm
+++ b/device/bluetooth/bluetooth_low_energy_device_watcher_mac.mm
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/strings/sys_string_conversions.h"
#import "base/task/sequenced_task_runner.h"
diff --git a/device/bluetooth/bluetooth_pairing_winrt.cc b/device/bluetooth/bluetooth_pairing_winrt.cc
index 5679e50b..eb4eac83 100644
--- a/device/bluetooth/bluetooth_pairing_winrt.cc
+++ b/device/bluetooth/bluetooth_pairing_winrt.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic.cc b/device/bluetooth/bluetooth_remote_gatt_characteristic.cc
index dda38573..6afc016 100644
--- a/device/bluetooth/bluetooth_remote_gatt_characteristic.cc
+++ b/device/bluetooth/bluetooth_remote_gatt_characteristic.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/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic.h b/device/bluetooth/bluetooth_remote_gatt_characteristic.h
index 94eb80d..7539330 100644
--- a/device/bluetooth/bluetooth_remote_gatt_characteristic.h
+++ b/device/bluetooth/bluetooth_remote_gatt_characteristic.h
@@ -12,10 +12,10 @@
#include <string>
#include <vector>
-#include "base/callback.h"
-#include "base/callback_forward.h"
#include "base/containers/flat_map.h"
#include "base/containers/queue.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_android.cc b/device/bluetooth/bluetooth_remote_gatt_characteristic_android.cc
index 06e19f6..e45349c 100644
--- a/device/bluetooth/bluetooth_remote_gatt_characteristic_android.cc
+++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_android.cc
@@ -9,8 +9,8 @@
#include "base/android/jni_android.h"
#include "base/android/jni_array.h"
#include "base/android/jni_string.h"
-#include "base/bind.h"
#include "base/containers/contains.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/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm b/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
index c4c76ff..4f38440 100644
--- a/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
+++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
@@ -4,7 +4,7 @@
#include "device/bluetooth/bluetooth_remote_gatt_characteristic_mac.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/strings/sys_string_conversions.h"
diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_unittest.cc b/device/bluetooth/bluetooth_remote_gatt_characteristic_unittest.cc
index 4a624fe..db20f10 100644
--- a/device/bluetooth/bluetooth_remote_gatt_characteristic_unittest.cc
+++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_unittest.cc
@@ -9,7 +9,7 @@
#include <functional>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_win.cc b/device/bluetooth/bluetooth_remote_gatt_characteristic_win.cc
index 79d78856..d600e91c 100644
--- a/device/bluetooth/bluetooth_remote_gatt_characteristic_win.cc
+++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_win.cc
@@ -6,7 +6,7 @@
#include <memory>
-#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/device/bluetooth/bluetooth_remote_gatt_characteristic_winrt.cc b/device/bluetooth/bluetooth_remote_gatt_characteristic_winrt.cc
index b7aa2aa..711a5de 100644
--- a/device/bluetooth/bluetooth_remote_gatt_characteristic_winrt.cc
+++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_winrt.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/ptr_util.h"
#include "base/strings/stringprintf.h"
diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_winrt.h b/device/bluetooth/bluetooth_remote_gatt_characteristic_winrt.h
index f2d80c3..c0fb509 100644
--- a/device/bluetooth/bluetooth_remote_gatt_characteristic_winrt.h
+++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_winrt.h
@@ -14,7 +14,7 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "device/bluetooth/bluetooth_export.h"
#include "device/bluetooth/bluetooth_remote_gatt_characteristic.h"
diff --git a/device/bluetooth/bluetooth_remote_gatt_descriptor.h b/device/bluetooth/bluetooth_remote_gatt_descriptor.h
index 62f017f..fab635c 100644
--- a/device/bluetooth/bluetooth_remote_gatt_descriptor.h
+++ b/device/bluetooth/bluetooth_remote_gatt_descriptor.h
@@ -8,8 +8,8 @@
#include <stdint.h>
#include <vector>
-#include "base/callback.h"
-#include "base/callback_forward.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_forward.h"
#include "device/bluetooth/bluetooth_export.h"
#include "device/bluetooth/bluetooth_gatt_descriptor.h"
#include "device/bluetooth/public/cpp/bluetooth_uuid.h"
diff --git a/device/bluetooth/bluetooth_remote_gatt_descriptor_android.cc b/device/bluetooth/bluetooth_remote_gatt_descriptor_android.cc
index 925e898..8b999d7 100644
--- a/device/bluetooth/bluetooth_remote_gatt_descriptor_android.cc
+++ b/device/bluetooth/bluetooth_remote_gatt_descriptor_android.cc
@@ -9,7 +9,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/location.h"
#include "base/notreached.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/device/bluetooth/bluetooth_remote_gatt_descriptor_mac.mm b/device/bluetooth/bluetooth_remote_gatt_descriptor_mac.mm
index 2a2aa4a..e44175c55 100644
--- a/device/bluetooth/bluetooth_remote_gatt_descriptor_mac.mm
+++ b/device/bluetooth/bluetooth_remote_gatt_descriptor_mac.mm
@@ -4,7 +4,7 @@
#include "device/bluetooth/bluetooth_remote_gatt_descriptor_mac.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#import "base/mac/foundation_util.h"
#include "base/strings/sys_string_conversions.h"
#import "base/task/single_thread_task_runner.h"
diff --git a/device/bluetooth/bluetooth_remote_gatt_descriptor_win.cc b/device/bluetooth/bluetooth_remote_gatt_descriptor_win.cc
index 9b673a57..61b139ee 100644
--- a/device/bluetooth/bluetooth_remote_gatt_descriptor_win.cc
+++ b/device/bluetooth/bluetooth_remote_gatt_descriptor_win.cc
@@ -4,7 +4,7 @@
#include "device/bluetooth/bluetooth_remote_gatt_descriptor_win.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "device/bluetooth/bluetooth_adapter_win.h"
#include "device/bluetooth/bluetooth_remote_gatt_characteristic_win.h"
diff --git a/device/bluetooth/bluetooth_remote_gatt_descriptor_winrt.cc b/device/bluetooth/bluetooth_remote_gatt_descriptor_winrt.cc
index 51d778a6..3c8d780 100644
--- a/device/bluetooth/bluetooth_remote_gatt_descriptor_winrt.cc
+++ b/device/bluetooth/bluetooth_remote_gatt_descriptor_winrt.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h"
diff --git a/device/bluetooth/bluetooth_remote_gatt_descriptor_winrt.h b/device/bluetooth/bluetooth_remote_gatt_descriptor_winrt.h
index 9b37f3f..fe71e10 100644
--- a/device/bluetooth/bluetooth_remote_gatt_descriptor_winrt.h
+++ b/device/bluetooth/bluetooth_remote_gatt_descriptor_winrt.h
@@ -14,7 +14,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 "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/bluetooth_remote_gatt_service_win.cc b/device/bluetooth/bluetooth_remote_gatt_service_win.cc
index 82fd2bc..f96f45b 100644
--- a/device/bluetooth/bluetooth_remote_gatt_service_win.cc
+++ b/device/bluetooth/bluetooth_remote_gatt_service_win.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/task/sequenced_task_runner.h"
#include "device/bluetooth/bluetooth_adapter_win.h"
diff --git a/device/bluetooth/bluetooth_socket.h b/device/bluetooth/bluetooth_socket.h
index aa230bd..c546818 100644
--- a/device/bluetooth/bluetooth_socket.h
+++ b/device/bluetooth/bluetooth_socket.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/bluetooth_socket_mac.mm b/device/bluetooth/bluetooth_socket_mac.mm
index c05dd1a..229593c 100644
--- a/device/bluetooth/bluetooth_socket_mac.mm
+++ b/device/bluetooth/bluetooth_socket_mac.mm
@@ -15,10 +15,10 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/containers/queue.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/memory/ref_counted.h"
#include "base/numerics/safe_conversions.h"
diff --git a/device/bluetooth/bluetooth_socket_net.cc b/device/bluetooth/bluetooth_socket_net.cc
index b79582f..745d171 100644
--- a/device/bluetooth/bluetooth_socket_net.cc
+++ b/device/bluetooth/bluetooth_socket_net.cc
@@ -8,10 +8,10 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check.h"
#include "base/containers/queue.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/ref_counted.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/device/bluetooth/bluetooth_socket_win.cc b/device/bluetooth/bluetooth_socket_win.cc
index 81156f2..e58a9da 100644
--- a/device/bluetooth/bluetooth_socket_win.cc
+++ b/device/bluetooth/bluetooth_socket_win.cc
@@ -10,8 +10,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/memory/ref_counted.h"
#include "base/strings/string_util.h"
diff --git a/device/bluetooth/bluetooth_task_manager_win.cc b/device/bluetooth/bluetooth_task_manager_win.cc
index 7f7e24b..6a1e3274 100644
--- a/device/bluetooth/bluetooth_task_manager_win.cc
+++ b/device/bluetooth/bluetooth_task_manager_win.cc
@@ -11,7 +11,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
diff --git a/device/bluetooth/bluetooth_task_manager_win_unittest.cc b/device/bluetooth/bluetooth_task_manager_win_unittest.cc
index 0da74d43..9fd90b05 100644
--- a/device/bluetooth/bluetooth_task_manager_win_unittest.cc
+++ b/device/bluetooth/bluetooth_task_manager_win_unittest.cc
@@ -4,8 +4,8 @@
#include <stddef.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/test/test_pending_task.h"
#include "base/test/test_simple_task_runner.h"
diff --git a/device/bluetooth/bluez/bluetooth_adapter_bluez.cc b/device/bluetooth/bluez/bluetooth_adapter_bluez.cc
index 23fb523..496d6ee 100644
--- a/device/bluetooth/bluez/bluetooth_adapter_bluez.cc
+++ b/device/bluetooth/bluez/bluetooth_adapter_bluez.cc
@@ -12,10 +12,10 @@
#include <string>
#include <utility>
-#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/location.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/device/bluetooth/bluez/bluetooth_adapter_profile_bluez.cc b/device/bluetooth/bluez/bluetooth_adapter_profile_bluez.cc
index 32cd144..584d7d5 100644
--- a/device/bluetooth/bluez/bluetooth_adapter_profile_bluez.cc
+++ b/device/bluetooth/bluez/bluetooth_adapter_profile_bluez.cc
@@ -8,8 +8,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/strings/string_util.h"
#include "dbus/bus.h"
diff --git a/device/bluetooth/bluez/bluetooth_adapter_profile_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_adapter_profile_bluez_unittest.cc
index 6c575dd..75dc1a3 100644
--- a/device/bluetooth/bluez/bluetooth_adapter_profile_bluez_unittest.cc
+++ b/device/bluetooth/bluez/bluetooth_adapter_profile_bluez_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/run_loop.h"
#include "base/test/bind.h"
diff --git a/device/bluetooth/bluez/bluetooth_advertisement_bluez.cc b/device/bluetooth/bluez/bluetooth_advertisement_bluez.cc
index 7867381..bb027aa 100644
--- a/device/bluetooth/bluez/bluetooth_advertisement_bluez.cc
+++ b/device/bluetooth/bluez/bluetooth_advertisement_bluez.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/guid.h"
#include "base/logging.h"
#include "base/observer_list.h"
diff --git a/device/bluetooth/bluez/bluetooth_advertisement_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_advertisement_bluez_unittest.cc
index 52ab94e..311f657 100644
--- a/device/bluetooth/bluez/bluetooth_advertisement_bluez_unittest.cc
+++ b/device/bluetooth/bluez/bluetooth_advertisement_bluez_unittest.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <vector>
-#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/device/bluetooth/bluez/bluetooth_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_bluez_unittest.cc
index 6e5f72d6..2c1f69f9 100644
--- a/device/bluetooth/bluez/bluetooth_bluez_unittest.cc
+++ b/device/bluetooth/bluez/bluetooth_bluez_unittest.cc
@@ -9,10 +9,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
#include "base/debug/dump_without_crashing.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/utf_string_conversions.h"
diff --git a/device/bluetooth/bluez/bluetooth_device_bluez.cc b/device/bluetooth/bluez/bluetooth_device_bluez.cc
index 33a7bc7..31645df 100644
--- a/device/bluetooth/bluez/bluetooth_device_bluez.cc
+++ b/device/bluetooth/bluez/bluetooth_device_bluez.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/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/string_number_conversions.h"
diff --git a/device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc
index 08579dc5..7572466 100644
--- a/device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc
+++ b/device/bluetooth/bluez/bluetooth_gatt_bluez_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/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/test/bind.h"
diff --git a/device/bluetooth/bluez/bluetooth_gatt_connection_bluez.cc b/device/bluetooth/bluez/bluetooth_gatt_connection_bluez.cc
index 88c9ffc..037902fa 100644
--- a/device/bluetooth/bluez/bluetooth_gatt_connection_bluez.cc
+++ b/device/bluetooth/bluez/bluetooth_gatt_connection_bluez.cc
@@ -4,7 +4,7 @@
#include "device/bluetooth/bluez/bluetooth_gatt_connection_bluez.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "device/bluetooth/bluetooth_adapter.h"
#include "device/bluetooth/bluetooth_device.h"
diff --git a/device/bluetooth/bluez/bluetooth_gatt_connection_bluez.h b/device/bluetooth/bluez/bluetooth_gatt_connection_bluez.h
index b952faf5..b0a258a 100644
--- a/device/bluetooth/bluez/bluetooth_gatt_connection_bluez.h
+++ b/device/bluetooth/bluez/bluetooth_gatt_connection_bluez.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "dbus/object_path.h"
#include "device/bluetooth/bluetooth_gatt_connection.h"
diff --git a/device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.h b/device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.h
index a82da83..ae086d1 100644
--- a/device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.h
+++ b/device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.h
@@ -8,7 +8,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 "device/bluetooth/bluetooth_local_gatt_service.h"
diff --git a/device/bluetooth/bluez/bluetooth_low_energy_scan_session_bluez.cc b/device/bluetooth/bluez/bluetooth_low_energy_scan_session_bluez.cc
index 1e39a1d..48032bf6 100644
--- a/device/bluetooth/bluez/bluetooth_low_energy_scan_session_bluez.cc
+++ b/device/bluetooth/bluez/bluetooth_low_energy_scan_session_bluez.cc
@@ -4,8 +4,8 @@
#include "device/bluetooth/bluez/bluetooth_low_energy_scan_session_bluez.h"
-#include "base/callback.h"
#include "base/debug/dump_without_crashing.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "device/bluetooth/bluez/bluetooth_adapter_bluez.h"
diff --git a/device/bluetooth/bluez/bluetooth_low_energy_scan_session_bluez.h b/device/bluetooth/bluez/bluetooth_low_energy_scan_session_bluez.h
index 16a57717..125d49a 100644
--- a/device/bluetooth/bluez/bluetooth_low_energy_scan_session_bluez.h
+++ b/device/bluetooth/bluez/bluetooth_low_energy_scan_session_bluez.h
@@ -8,7 +8,7 @@
#include <stddef.h>
#include <stdint.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "device/bluetooth/bluetooth_low_energy_scan_session.h"
#include "device/bluetooth/bluez/bluetooth_adapter_bluez.h"
#include "device/bluetooth/dbus/bluetooth_advertisement_monitor_application_service_provider.h"
diff --git a/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.cc b/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.cc
index 97448c2..bf533faa 100644
--- a/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.cc
+++ b/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.cc
@@ -8,9 +8,9 @@
#include <limits>
#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/strings/stringprintf.h"
diff --git a/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.h b/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.h
index 78c1164..4a77cfe 100644
--- a/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.h
+++ b/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.h
@@ -14,7 +14,7 @@
#include <utility>
#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 "dbus/object_path.h"
diff --git a/device/bluetooth/bluez/bluetooth_remote_gatt_descriptor_bluez.cc b/device/bluetooth/bluez/bluetooth_remote_gatt_descriptor_bluez.cc
index 68dae5d1..69ebf7df 100644
--- a/device/bluetooth/bluez/bluetooth_remote_gatt_descriptor_bluez.cc
+++ b/device/bluetooth/bluez/bluetooth_remote_gatt_descriptor_bluez.cc
@@ -8,8 +8,8 @@
#include <ostream>
#include <base/callback_helpers.h>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/strings/stringprintf.h"
#include "dbus/property.h"
diff --git a/device/bluetooth/bluez/bluetooth_remote_gatt_descriptor_bluez.h b/device/bluetooth/bluez/bluetooth_remote_gatt_descriptor_bluez.h
index 7326d53..98423089 100644
--- a/device/bluetooth/bluez/bluetooth_remote_gatt_descriptor_bluez.h
+++ b/device/bluetooth/bluez/bluetooth_remote_gatt_descriptor_bluez.h
@@ -9,7 +9,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 "dbus/object_path.h"
diff --git a/device/bluetooth/bluez/bluetooth_service_record_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_service_record_bluez_unittest.cc
index b9be6e7..a5f0f5c 100644
--- a/device/bluetooth/bluez/bluetooth_service_record_bluez_unittest.cc
+++ b/device/bluetooth/bluez/bluetooth_service_record_bluez_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/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
diff --git a/device/bluetooth/bluez/bluetooth_socket_bluez.cc b/device/bluetooth/bluez/bluetooth_socket_bluez.cc
index d6f9782..d6085eb 100644
--- a/device/bluetooth/bluez/bluetooth_socket_bluez.cc
+++ b/device/bluetooth/bluez/bluetooth_socket_bluez.cc
@@ -11,8 +11,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/location.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
diff --git a/device/bluetooth/bluez/bluetooth_socket_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_socket_bluez_unittest.cc
index 37d0b2e..fdc17de 100644
--- a/device/bluetooth/bluez/bluetooth_socket_bluez_unittest.cc
+++ b/device/bluetooth/bluez/bluetooth_socket_bluez_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/run_loop.h"
diff --git a/device/bluetooth/cast/bluetooth_adapter_cast.cc b/device/bluetooth/cast/bluetooth_adapter_cast.cc
index a4233c9..f1be4fae 100644
--- a/device/bluetooth/cast/bluetooth_adapter_cast.cc
+++ b/device/bluetooth/cast/bluetooth_adapter_cast.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/logging.h"
#include "base/no_destructor.h"
diff --git a/device/bluetooth/cast/bluetooth_adapter_cast_unittest.cc b/device/bluetooth/cast/bluetooth_adapter_cast_unittest.cc
index 52dd3c8..c4ac669 100644
--- a/device/bluetooth/cast/bluetooth_adapter_cast_unittest.cc
+++ b/device/bluetooth/cast/bluetooth_adapter_cast_unittest.cc
@@ -4,7 +4,7 @@
#include "device/bluetooth/cast/bluetooth_adapter_cast.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/test/gtest_util.h"
#include "base/test/mock_callback.h"
#include "base/test/task_environment.h"
diff --git a/device/bluetooth/cast/bluetooth_device_cast.cc b/device/bluetooth/cast/bluetooth_device_cast.cc
index 2baacd62..75254a15 100644
--- a/device/bluetooth/cast/bluetooth_device_cast.cc
+++ b/device/bluetooth/cast/bluetooth_device_cast.cc
@@ -9,7 +9,7 @@
#include <unordered_set>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "chromecast/device/bluetooth/bluetooth_util.h"
#include "chromecast/device/bluetooth/le/remote_characteristic.h"
diff --git a/device/bluetooth/cast/bluetooth_device_cast.h b/device/bluetooth/cast/bluetooth_device_cast.h
index 0c89306..e1edbb6 100644
--- a/device/bluetooth/cast/bluetooth_device_cast.h
+++ b/device/bluetooth/cast/bluetooth_device_cast.h
@@ -12,7 +12,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/device/bluetooth/cast/bluetooth_remote_gatt_characteristic_cast.cc b/device/bluetooth/cast/bluetooth_remote_gatt_characteristic_cast.cc
index 27e5505..5d37149 100644
--- a/device/bluetooth/cast/bluetooth_remote_gatt_characteristic_cast.cc
+++ b/device/bluetooth/cast/bluetooth_remote_gatt_characteristic_cast.cc
@@ -6,9 +6,9 @@
#include <memory>
-#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/weak_ptr.h"
#include "chromecast/device/bluetooth/le/remote_characteristic.h"
diff --git a/device/bluetooth/cast/bluetooth_remote_gatt_characteristic_cast.h b/device/bluetooth/cast/bluetooth_remote_gatt_characteristic_cast.h
index fe949e7..dd9e7c8 100644
--- a/device/bluetooth/cast/bluetooth_remote_gatt_characteristic_cast.h
+++ b/device/bluetooth/cast/bluetooth_remote_gatt_characteristic_cast.h
@@ -12,7 +12,7 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "device/bluetooth/bluetooth_remote_gatt_characteristic.h"
diff --git a/device/bluetooth/cast/bluetooth_remote_gatt_descriptor_cast.cc b/device/bluetooth/cast/bluetooth_remote_gatt_descriptor_cast.cc
index e2fc0a4..9372410 100644
--- a/device/bluetooth/cast/bluetooth_remote_gatt_descriptor_cast.cc
+++ b/device/bluetooth/cast/bluetooth_remote_gatt_descriptor_cast.cc
@@ -7,8 +7,8 @@
#include <stdint.h>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "chromecast/device/bluetooth/le/remote_descriptor.h"
#include "device/bluetooth/bluetooth_gatt_service.h"
#include "device/bluetooth/cast/bluetooth_remote_gatt_characteristic_cast.h"
diff --git a/device/bluetooth/cast/bluetooth_remote_gatt_descriptor_cast.h b/device/bluetooth/cast/bluetooth_remote_gatt_descriptor_cast.h
index 3d33e7fe..05d898c 100644
--- a/device/bluetooth/cast/bluetooth_remote_gatt_descriptor_cast.h
+++ b/device/bluetooth/cast/bluetooth_remote_gatt_descriptor_cast.h
@@ -9,7 +9,7 @@
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "device/bluetooth/bluetooth_remote_gatt_descriptor.h"
diff --git a/device/bluetooth/cast/bluetooth_remote_gatt_service_cast.cc b/device/bluetooth/cast/bluetooth_remote_gatt_service_cast.cc
index ba5d66b2..4abca92 100644
--- a/device/bluetooth/cast/bluetooth_remote_gatt_service_cast.cc
+++ b/device/bluetooth/cast/bluetooth_remote_gatt_service_cast.cc
@@ -7,7 +7,7 @@
#include <string>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "chromecast/device/bluetooth/le/remote_characteristic.h"
#include "chromecast/device/bluetooth/le/remote_service.h"
#include "device/bluetooth/cast/bluetooth_device_cast.h"
diff --git a/device/bluetooth/chromeos/bluetooth_utils_unittest.cc b/device/bluetooth/chromeos/bluetooth_utils_unittest.cc
index dc1e56c..3c0c89c5 100644
--- a/device/bluetooth/chromeos/bluetooth_utils_unittest.cc
+++ b/device/bluetooth/chromeos/bluetooth_utils_unittest.cc
@@ -4,8 +4,8 @@
#include "device/bluetooth/chromeos/bluetooth_utils.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/test/task_environment.h"
diff --git a/device/bluetooth/dbus/bluetooth_adapter_client.cc b/device/bluetooth/dbus/bluetooth_adapter_client.cc
index 336641d..f811ae7 100644
--- a/device/bluetooth/dbus/bluetooth_adapter_client.cc
+++ b/device/bluetooth/dbus/bluetooth_adapter_client.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/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/device/bluetooth/dbus/bluetooth_adapter_client.h b/device/bluetooth/dbus/bluetooth_adapter_client.h
index b59ce8f..7c31a986f 100644
--- a/device/bluetooth/dbus/bluetooth_adapter_client.h
+++ b/device/bluetooth/dbus/bluetooth_adapter_client.h
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "dbus/object_path.h"
#include "dbus/property.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/dbus/bluetooth_admin_policy_client.cc b/device/bluetooth/dbus/bluetooth_admin_policy_client.cc
index 62ecd0a..ba06e1e 100644
--- a/device/bluetooth/dbus/bluetooth_admin_policy_client.cc
+++ b/device/bluetooth/dbus/bluetooth_admin_policy_client.cc
@@ -4,7 +4,7 @@
#include "device/bluetooth/dbus/bluetooth_admin_policy_client.h"
-#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/device/bluetooth/dbus/bluetooth_admin_policy_client.h b/device/bluetooth/dbus/bluetooth_admin_policy_client.h
index 430a112..a665f01 100644
--- a/device/bluetooth/dbus/bluetooth_admin_policy_client.h
+++ b/device/bluetooth/dbus/bluetooth_admin_policy_client.h
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "dbus/object_path.h"
#include "dbus/property.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/dbus/bluetooth_advertisement_monitor_application_service_provider_impl.cc b/device/bluetooth/dbus/bluetooth_advertisement_monitor_application_service_provider_impl.cc
index d23a4759..b2c9736 100644
--- a/device/bluetooth/dbus/bluetooth_advertisement_monitor_application_service_provider_impl.cc
+++ b/device/bluetooth/dbus/bluetooth_advertisement_monitor_application_service_provider_impl.cc
@@ -4,8 +4,8 @@
#include "device/bluetooth/dbus/bluetooth_advertisement_monitor_application_service_provider_impl.h"
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
diff --git a/device/bluetooth/dbus/bluetooth_advertisement_monitor_application_service_provider_unittest.cc b/device/bluetooth/dbus/bluetooth_advertisement_monitor_application_service_provider_unittest.cc
index b04ec77..7648fe4 100644
--- a/device/bluetooth/dbus/bluetooth_advertisement_monitor_application_service_provider_unittest.cc
+++ b/device/bluetooth/dbus/bluetooth_advertisement_monitor_application_service_provider_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
#include <vector>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/time/time.h"
#include "dbus/bus.h"
diff --git a/device/bluetooth/dbus/bluetooth_advertisement_monitor_manager_client.cc b/device/bluetooth/dbus/bluetooth_advertisement_monitor_manager_client.cc
index 30c19d83..170d2fce 100644
--- a/device/bluetooth/dbus/bluetooth_advertisement_monitor_manager_client.cc
+++ b/device/bluetooth/dbus/bluetooth_advertisement_monitor_manager_client.cc
@@ -4,9 +4,9 @@
#include "device/bluetooth/dbus/bluetooth_advertisement_monitor_manager_client.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/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/device/bluetooth/dbus/bluetooth_advertisement_monitor_manager_client.h b/device/bluetooth/dbus/bluetooth_advertisement_monitor_manager_client.h
index 706e1e77..e788bde 100644
--- a/device/bluetooth/dbus/bluetooth_advertisement_monitor_manager_client.h
+++ b/device/bluetooth/dbus/bluetooth_advertisement_monitor_manager_client.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/observer_list_types.h"
#include "dbus/object_path.h"
#include "dbus/property.h"
diff --git a/device/bluetooth/dbus/bluetooth_advertisement_monitor_service_provider_impl.cc b/device/bluetooth/dbus/bluetooth_advertisement_monitor_service_provider_impl.cc
index f6dc369..f46600a 100644
--- a/device/bluetooth/dbus/bluetooth_advertisement_monitor_service_provider_impl.cc
+++ b/device/bluetooth/dbus/bluetooth_advertisement_monitor_service_provider_impl.cc
@@ -4,7 +4,7 @@
#include "device/bluetooth/dbus/bluetooth_advertisement_monitor_service_provider_impl.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
diff --git a/device/bluetooth/dbus/bluetooth_advertisement_monitor_service_provider_unittest.cc b/device/bluetooth/dbus/bluetooth_advertisement_monitor_service_provider_unittest.cc
index 61995bde..4ecdfba4 100644
--- a/device/bluetooth/dbus/bluetooth_advertisement_monitor_service_provider_unittest.cc
+++ b/device/bluetooth/dbus/bluetooth_advertisement_monitor_service_provider_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
#include <vector>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "dbus/bus.h"
#include "dbus/message.h"
#include "dbus/mock_bus.h"
diff --git a/device/bluetooth/dbus/bluetooth_agent_manager_client.cc b/device/bluetooth/dbus/bluetooth_agent_manager_client.cc
index c93599a99..46ab0e3 100644
--- a/device/bluetooth/dbus/bluetooth_agent_manager_client.cc
+++ b/device/bluetooth/dbus/bluetooth_agent_manager_client.cc
@@ -4,9 +4,9 @@
#include "device/bluetooth/dbus/bluetooth_agent_manager_client.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/observer_list.h"
#include "dbus/bus.h"
diff --git a/device/bluetooth/dbus/bluetooth_agent_manager_client.h b/device/bluetooth/dbus/bluetooth_agent_manager_client.h
index f0a02c531..fd072550 100644
--- a/device/bluetooth/dbus/bluetooth_agent_manager_client.h
+++ b/device/bluetooth/dbus/bluetooth_agent_manager_client.h
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/observer_list_types.h"
#include "dbus/object_path.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/dbus/bluetooth_agent_service_provider.cc b/device/bluetooth/dbus/bluetooth_agent_service_provider.cc
index 9586435..2da1f08a 100644
--- a/device/bluetooth/dbus/bluetooth_agent_service_provider.cc
+++ b/device/bluetooth/dbus/bluetooth_agent_service_provider.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/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
diff --git a/device/bluetooth/dbus/bluetooth_agent_service_provider.h b/device/bluetooth/dbus/bluetooth_agent_service_provider.h
index a3aa8b9..8cfff80 100644
--- a/device/bluetooth/dbus/bluetooth_agent_service_provider.h
+++ b/device/bluetooth/dbus/bluetooth_agent_service_provider.h
@@ -8,7 +8,7 @@
#include <cstdint>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "dbus/bus.h"
#include "dbus/object_path.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/dbus/bluetooth_battery_client.cc b/device/bluetooth/dbus/bluetooth_battery_client.cc
index 72532967..62c0e0b5 100644
--- a/device/bluetooth/dbus/bluetooth_battery_client.cc
+++ b/device/bluetooth/dbus/bluetooth_battery_client.cc
@@ -4,7 +4,7 @@
#include "device/bluetooth/dbus/bluetooth_battery_client.h"
-#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/device/bluetooth/dbus/bluetooth_battery_client.h b/device/bluetooth/dbus/bluetooth_battery_client.h
index 834be23..641e716 100644
--- a/device/bluetooth/dbus/bluetooth_battery_client.h
+++ b/device/bluetooth/dbus/bluetooth_battery_client.h
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "dbus/object_path.h"
#include "dbus/property.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/dbus/bluetooth_debug_manager_client.cc b/device/bluetooth/dbus/bluetooth_debug_manager_client.cc
index 1627404..6737ade 100644
--- a/device/bluetooth/dbus/bluetooth_debug_manager_client.cc
+++ b/device/bluetooth/dbus/bluetooth_debug_manager_client.cc
@@ -4,9 +4,9 @@
#include "device/bluetooth/dbus/bluetooth_debug_manager_client.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 "dbus/bus.h"
#include "dbus/message.h"
diff --git a/device/bluetooth/dbus/bluetooth_debug_manager_client.h b/device/bluetooth/dbus/bluetooth_debug_manager_client.h
index 6b55fec..faa5b92 100644
--- a/device/bluetooth/dbus/bluetooth_debug_manager_client.h
+++ b/device/bluetooth/dbus/bluetooth_debug_manager_client.h
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "dbus/object_path.h"
#include "device/bluetooth/bluetooth_export.h"
#include "device/bluetooth/dbus/bluez_dbus_client.h"
diff --git a/device/bluetooth/dbus/bluetooth_device_client.cc b/device/bluetooth/dbus/bluetooth_device_client.cc
index 7a203ff..0d0f945 100644
--- a/device/bluetooth/dbus/bluetooth_device_client.cc
+++ b/device/bluetooth/dbus/bluetooth_device_client.cc
@@ -7,7 +7,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/device/bluetooth/dbus/bluetooth_device_client.h b/device/bluetooth/dbus/bluetooth_device_client.h
index 4ffda62b3..d3bab557 100644
--- a/device/bluetooth/dbus/bluetooth_device_client.h
+++ b/device/bluetooth/dbus/bluetooth_device_client.h
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "dbus/object_path.h"
#include "dbus/property.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/dbus/bluetooth_gatt_application_service_provider_impl.cc b/device/bluetooth/dbus/bluetooth_gatt_application_service_provider_impl.cc
index 62d0366..0eac657f 100644
--- a/device/bluetooth/dbus/bluetooth_gatt_application_service_provider_impl.cc
+++ b/device/bluetooth/dbus/bluetooth_gatt_application_service_provider_impl.cc
@@ -4,7 +4,7 @@
#include "device/bluetooth/dbus/bluetooth_gatt_application_service_provider_impl.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
diff --git a/device/bluetooth/dbus/bluetooth_gatt_application_service_provider_unittest.cc b/device/bluetooth/dbus/bluetooth_gatt_application_service_provider_unittest.cc
index cf0ce98..aac663c 100644
--- a/device/bluetooth/dbus/bluetooth_gatt_application_service_provider_unittest.cc
+++ b/device/bluetooth/dbus/bluetooth_gatt_application_service_provider_unittest.cc
@@ -5,7 +5,7 @@
#include <string>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "dbus/bus.h"
#include "dbus/message.h"
diff --git a/device/bluetooth/dbus/bluetooth_gatt_attribute_value_delegate.h b/device/bluetooth/dbus/bluetooth_gatt_attribute_value_delegate.h
index b71696a..8dffefc 100644
--- a/device/bluetooth/dbus/bluetooth_gatt_attribute_value_delegate.h
+++ b/device/bluetooth/dbus/bluetooth_gatt_attribute_value_delegate.h
@@ -8,7 +8,7 @@
#include <cstdint>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "device/bluetooth/bluetooth_gatt_characteristic.h"
#include "device/bluetooth/bluetooth_local_gatt_service.h"
diff --git a/device/bluetooth/dbus/bluetooth_gatt_characteristic_client.cc b/device/bluetooth/dbus/bluetooth_gatt_characteristic_client.cc
index 1818523..a7f1ea27 100644
--- a/device/bluetooth/dbus/bluetooth_gatt_characteristic_client.cc
+++ b/device/bluetooth/dbus/bluetooth_gatt_characteristic_client.cc
@@ -6,7 +6,7 @@
#include <stddef.h>
-#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/device/bluetooth/dbus/bluetooth_gatt_characteristic_client.h b/device/bluetooth/dbus/bluetooth_gatt_characteristic_client.h
index 9443767..023e379 100644
--- a/device/bluetooth/dbus/bluetooth_gatt_characteristic_client.h
+++ b/device/bluetooth/dbus/bluetooth_gatt_characteristic_client.h
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "dbus/object_path.h"
#include "dbus/property.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/dbus/bluetooth_gatt_characteristic_delegate_wrapper.h b/device/bluetooth/dbus/bluetooth_gatt_characteristic_delegate_wrapper.h
index 45993864..ed4e72b8 100644
--- a/device/bluetooth/dbus/bluetooth_gatt_characteristic_delegate_wrapper.h
+++ b/device/bluetooth/dbus/bluetooth_gatt_characteristic_delegate_wrapper.h
@@ -8,7 +8,7 @@
#include <cstdint>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "device/bluetooth/bluetooth_gatt_characteristic.h"
#include "device/bluetooth/bluetooth_local_gatt_service.h"
diff --git a/device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider_impl.cc b/device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider_impl.cc
index f69e097..0051f8b 100644
--- a/device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider_impl.cc
+++ b/device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider_impl.cc
@@ -6,8 +6,8 @@
#include <cstddef>
-#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_util.h"
#include "device/bluetooth/bluetooth_gatt_characteristic.h"
diff --git a/device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider_unittest.cc b/device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider_unittest.cc
index 6fe7525..95ff888 100644
--- a/device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider_unittest.cc
+++ b/device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider_unittest.cc
@@ -7,7 +7,7 @@
#include <string>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/test/bind.h"
#include "dbus/bus.h"
#include "dbus/message.h"
diff --git a/device/bluetooth/dbus/bluetooth_gatt_descriptor_client.cc b/device/bluetooth/dbus/bluetooth_gatt_descriptor_client.cc
index 92dfd37..6af0997 100644
--- a/device/bluetooth/dbus/bluetooth_gatt_descriptor_client.cc
+++ b/device/bluetooth/dbus/bluetooth_gatt_descriptor_client.cc
@@ -6,7 +6,7 @@
#include <stddef.h>
-#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/device/bluetooth/dbus/bluetooth_gatt_descriptor_client.h b/device/bluetooth/dbus/bluetooth_gatt_descriptor_client.h
index 7f4540c4..07b3a09 100644
--- a/device/bluetooth/dbus/bluetooth_gatt_descriptor_client.h
+++ b/device/bluetooth/dbus/bluetooth_gatt_descriptor_client.h
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "dbus/object_path.h"
#include "dbus/property.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/dbus/bluetooth_gatt_descriptor_delegate_wrapper.h b/device/bluetooth/dbus/bluetooth_gatt_descriptor_delegate_wrapper.h
index 376642b..7a7231e 100644
--- a/device/bluetooth/dbus/bluetooth_gatt_descriptor_delegate_wrapper.h
+++ b/device/bluetooth/dbus/bluetooth_gatt_descriptor_delegate_wrapper.h
@@ -8,7 +8,7 @@
#include <cstdint>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "device/bluetooth/bluetooth_gatt_characteristic.h"
#include "device/bluetooth/bluetooth_local_gatt_service.h"
diff --git a/device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider_impl.cc b/device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider_impl.cc
index 9930143..f0e2fc6 100644
--- a/device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider_impl.cc
+++ b/device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider_impl.cc
@@ -6,8 +6,8 @@
#include <cstddef>
-#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_util.h"
#include "device/bluetooth/bluetooth_gatt_service.h"
diff --git a/device/bluetooth/dbus/bluetooth_gatt_manager_client.cc b/device/bluetooth/dbus/bluetooth_gatt_manager_client.cc
index a21a5a1..d7248f1e 100644
--- a/device/bluetooth/dbus/bluetooth_gatt_manager_client.cc
+++ b/device/bluetooth/dbus/bluetooth_gatt_manager_client.cc
@@ -4,8 +4,8 @@
#include "device/bluetooth/dbus/bluetooth_gatt_manager_client.h"
-#include "base/bind.h"
#include "base/check.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/device/bluetooth/dbus/bluetooth_gatt_manager_client.h b/device/bluetooth/dbus/bluetooth_gatt_manager_client.h
index 00b6517..254cde9 100644
--- a/device/bluetooth/dbus/bluetooth_gatt_manager_client.h
+++ b/device/bluetooth/dbus/bluetooth_gatt_manager_client.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "dbus/object_path.h"
#include "device/bluetooth/bluetooth_export.h"
#include "device/bluetooth/dbus/bluez_dbus_client.h"
diff --git a/device/bluetooth/dbus/bluetooth_gatt_service_client.cc b/device/bluetooth/dbus/bluetooth_gatt_service_client.cc
index 0cf2dcd..7e31d7a 100644
--- a/device/bluetooth/dbus/bluetooth_gatt_service_client.cc
+++ b/device/bluetooth/dbus/bluetooth_gatt_service_client.cc
@@ -4,7 +4,7 @@
#include "device/bluetooth/dbus/bluetooth_gatt_service_client.h"
-#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/device/bluetooth/dbus/bluetooth_gatt_service_service_provider_impl.cc b/device/bluetooth/dbus/bluetooth_gatt_service_service_provider_impl.cc
index 6927ec0..c390d83 100644
--- a/device/bluetooth/dbus/bluetooth_gatt_service_service_provider_impl.cc
+++ b/device/bluetooth/dbus/bluetooth_gatt_service_service_provider_impl.cc
@@ -4,7 +4,7 @@
#include "device/bluetooth/dbus/bluetooth_gatt_service_service_provider_impl.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
diff --git a/device/bluetooth/dbus/bluetooth_input_client.cc b/device/bluetooth/dbus/bluetooth_input_client.cc
index ea408d4..2c9e1fb 100644
--- a/device/bluetooth/dbus/bluetooth_input_client.cc
+++ b/device/bluetooth/dbus/bluetooth_input_client.cc
@@ -6,8 +6,8 @@
#include <map>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/observer_list.h"
#include "dbus/bus.h"
diff --git a/device/bluetooth/dbus/bluetooth_input_client.h b/device/bluetooth/dbus/bluetooth_input_client.h
index b7fd007..d6737a6 100644
--- a/device/bluetooth/dbus/bluetooth_input_client.h
+++ b/device/bluetooth/dbus/bluetooth_input_client.h
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "dbus/object_path.h"
#include "dbus/property.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc b/device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc
index edc462d..bb72736 100644
--- a/device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc
+++ b/device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc
@@ -7,7 +7,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/device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.h b/device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.h
index 55e4d7a..de6b194 100644
--- a/device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.h
+++ b/device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.h
@@ -12,7 +12,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "dbus/bus.h"
#include "dbus/object_path.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/dbus/bluetooth_le_advertising_manager_client.cc b/device/bluetooth/dbus/bluetooth_le_advertising_manager_client.cc
index a07322d2..fe22e485 100644
--- a/device/bluetooth/dbus/bluetooth_le_advertising_manager_client.cc
+++ b/device/bluetooth/dbus/bluetooth_le_advertising_manager_client.cc
@@ -4,8 +4,8 @@
#include "device/bluetooth/dbus/bluetooth_le_advertising_manager_client.h"
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/observer_list.h"
#include "dbus/bus.h"
diff --git a/device/bluetooth/dbus/bluetooth_le_advertising_manager_client.h b/device/bluetooth/dbus/bluetooth_le_advertising_manager_client.h
index 09515957..0cc126e 100644
--- a/device/bluetooth/dbus/bluetooth_le_advertising_manager_client.h
+++ b/device/bluetooth/dbus/bluetooth_le_advertising_manager_client.h
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "dbus/object_path.h"
#include "device/bluetooth/bluetooth_export.h"
#include "device/bluetooth/dbus/bluez_dbus_client.h"
diff --git a/device/bluetooth/dbus/bluetooth_profile_manager_client.cc b/device/bluetooth/dbus/bluetooth_profile_manager_client.cc
index 5945df6..b0a96377 100644
--- a/device/bluetooth/dbus/bluetooth_profile_manager_client.cc
+++ b/device/bluetooth/dbus/bluetooth_profile_manager_client.cc
@@ -4,8 +4,8 @@
#include "device/bluetooth/dbus/bluetooth_profile_manager_client.h"
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/time/time.h"
#include "dbus/bus.h"
diff --git a/device/bluetooth/dbus/bluetooth_profile_manager_client.h b/device/bluetooth/dbus/bluetooth_profile_manager_client.h
index 7a516a9..08ab6cfd 100644
--- a/device/bluetooth/dbus/bluetooth_profile_manager_client.h
+++ b/device/bluetooth/dbus/bluetooth_profile_manager_client.h
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "dbus/object_path.h"
#include "device/bluetooth/bluetooth_export.h"
#include "device/bluetooth/dbus/bluez_dbus_client.h"
diff --git a/device/bluetooth/dbus/bluetooth_profile_service_provider.cc b/device/bluetooth/dbus/bluetooth_profile_service_provider.cc
index d4377863..199e03f 100644
--- a/device/bluetooth/dbus/bluetooth_profile_service_provider.cc
+++ b/device/bluetooth/dbus/bluetooth_profile_service_provider.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#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/device/bluetooth/dbus/bluetooth_profile_service_provider.h b/device/bluetooth/dbus/bluetooth_profile_service_provider.h
index 7a6f83f..73ed8f5 100644
--- a/device/bluetooth/dbus/bluetooth_profile_service_provider.h
+++ b/device/bluetooth/dbus/bluetooth_profile_service_provider.h
@@ -7,8 +7,8 @@
#include <stdint.h>
-#include "base/callback.h"
#include "base/files/scoped_file.h"
+#include "base/functional/callback.h"
#include "dbus/bus.h"
#include "dbus/object_path.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/dbus/bluez_dbus_manager.cc b/device/bluetooth/dbus/bluez_dbus_manager.cc
index ddaa864..9992cac 100644
--- a/device/bluetooth/dbus/bluez_dbus_manager.cc
+++ b/device/bluetooth/dbus/bluez_dbus_manager.cc
@@ -7,9 +7,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/system/sys_info.h"
diff --git a/device/bluetooth/dbus/bluez_dbus_manager.h b/device/bluetooth/dbus/bluez_dbus_manager.h
index 692155d..fe3275966 100644
--- a/device/bluetooth/dbus/bluez_dbus_manager.h
+++ b/device/bluetooth/dbus/bluez_dbus_manager.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/memory/weak_ptr.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/dbus/bluez_dbus_thread_manager.h b/device/bluetooth/dbus/bluez_dbus_thread_manager.h
index 6c734355..0e9abc5e8 100644
--- a/device/bluetooth/dbus/bluez_dbus_thread_manager.h
+++ b/device/bluetooth/dbus/bluez_dbus_thread_manager.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_adapter_client.cc b/device/bluetooth/dbus/fake_bluetooth_adapter_client.cc
index b03b3c84..66c45d5 100644
--- a/device/bluetooth/dbus/fake_bluetooth_adapter_client.cc
+++ b/device/bluetooth/dbus/fake_bluetooth_adapter_client.cc
@@ -8,7 +8,7 @@
#include <memory>
#include <utility>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/observer_list.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_adapter_client.h b/device/bluetooth/dbus/fake_bluetooth_adapter_client.h
index a0824ec3..148396c 100644
--- a/device/bluetooth/dbus/fake_bluetooth_adapter_client.h
+++ b/device/bluetooth/dbus/fake_bluetooth_adapter_client.h
@@ -10,8 +10,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/observer_list.h"
#include "dbus/object_path.h"
#include "dbus/property.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_advertisement_monitor_manager_client.cc b/device/bluetooth/dbus/fake_bluetooth_advertisement_monitor_manager_client.cc
index e35bf2f..fc3c2d2b 100644
--- a/device/bluetooth/dbus/fake_bluetooth_advertisement_monitor_manager_client.cc
+++ b/device/bluetooth/dbus/fake_bluetooth_advertisement_monitor_manager_client.cc
@@ -4,7 +4,7 @@
#include "device/bluetooth/dbus/fake_bluetooth_advertisement_monitor_manager_client.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/notreached.h"
#include "base/observer_list.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_advertisement_monitor_manager_client.h b/device/bluetooth/dbus/fake_bluetooth_advertisement_monitor_manager_client.h
index 6db39f9..b019bd20 100644
--- a/device/bluetooth/dbus/fake_bluetooth_advertisement_monitor_manager_client.h
+++ b/device/bluetooth/dbus/fake_bluetooth_advertisement_monitor_manager_client.h
@@ -8,8 +8,8 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
#include "base/containers/flat_set.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_agent_manager_client.h b/device/bluetooth/dbus/fake_bluetooth_agent_manager_client.h
index 95646fb..a24ed2c 100644
--- a/device/bluetooth/dbus/fake_bluetooth_agent_manager_client.h
+++ b/device/bluetooth/dbus/fake_bluetooth_agent_manager_client.h
@@ -5,8 +5,8 @@
#ifndef DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_AGENT_MANAGER_CLIENT_H_
#define DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_AGENT_MANAGER_CLIENT_H_
-#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/observer_list.h"
#include "dbus/object_path.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_agent_service_provider.h b/device/bluetooth/dbus/fake_bluetooth_agent_service_provider.h
index 3cde9ec..7ecafc99 100644
--- a/device/bluetooth/dbus/fake_bluetooth_agent_service_provider.h
+++ b/device/bluetooth/dbus/fake_bluetooth_agent_service_provider.h
@@ -7,8 +7,8 @@
#include <stdint.h>
-#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 "dbus/object_path.h"
#include "dbus/property.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_debug_manager_client.h b/device/bluetooth/dbus/fake_bluetooth_debug_manager_client.h
index b548ce6..d5038b6 100644
--- a/device/bluetooth/dbus/fake_bluetooth_debug_manager_client.h
+++ b/device/bluetooth/dbus/fake_bluetooth_debug_manager_client.h
@@ -5,8 +5,8 @@
#ifndef DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_DEBUG_MANAGER_CLIENT_H_
#define DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_DEBUG_MANAGER_CLIENT_H_
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "dbus/object_path.h"
#include "dbus/property.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_device_client.cc b/device/bluetooth/dbus/fake_bluetooth_device_client.cc
index ea9eb68..32eb9fd2 100644
--- a/device/bluetooth/dbus/fake_bluetooth_device_client.cc
+++ b/device/bluetooth/dbus/fake_bluetooth_device_client.cc
@@ -15,8 +15,8 @@
#include <utility>
#include "base/base64.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_device_client.h b/device/bluetooth/dbus/fake_bluetooth_device_client.h
index e63a0c184..c9e6f90 100644
--- a/device/bluetooth/dbus/fake_bluetooth_device_client.h
+++ b/device/bluetooth/dbus/fake_bluetooth_device_client.h
@@ -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/observer_list.h"
#include "dbus/object_path.h"
#include "dbus/property.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_client.cc b/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_client.cc
index 563916b8..53e9e50 100644
--- a/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_client.cc
+++ b/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_client.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/observer_list.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_service_provider.cc b/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_service_provider.cc
index b13c680..30a5025 100644
--- a/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_service_provider.cc
+++ b/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_service_provider.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include <iterator>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/strings/string_util.h"
#include "device/bluetooth/bluetooth_adapter.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_service_provider.h b/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_service_provider.h
index ab731f2..ee92dc8 100644
--- a/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_service_provider.h
+++ b/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_service_provider.h
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "dbus/object_path.h"
#include "device/bluetooth/bluetooth_export.h"
#include "device/bluetooth/bluetooth_local_gatt_service.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_gatt_descriptor_client.cc b/device/bluetooth/dbus/fake_bluetooth_gatt_descriptor_client.cc
index 5e44140..13008ae 100644
--- a/device/bluetooth/dbus/fake_bluetooth_gatt_descriptor_client.cc
+++ b/device/bluetooth/dbus/fake_bluetooth_gatt_descriptor_client.cc
@@ -6,8 +6,8 @@
#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/observer_list.h"
#include "dbus/bus.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_gatt_descriptor_service_provider.cc b/device/bluetooth/dbus/fake_bluetooth_gatt_descriptor_service_provider.cc
index 3993738d..b078f43 100644
--- a/device/bluetooth/dbus/fake_bluetooth_gatt_descriptor_service_provider.cc
+++ b/device/bluetooth/dbus/fake_bluetooth_gatt_descriptor_service_provider.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include <iterator>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/strings/string_util.h"
#include "device/bluetooth/dbus/bluetooth_gatt_attribute_value_delegate.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_gatt_descriptor_service_provider.h b/device/bluetooth/dbus/fake_bluetooth_gatt_descriptor_service_provider.h
index d5459702..15139fd 100644
--- a/device/bluetooth/dbus/fake_bluetooth_gatt_descriptor_service_provider.h
+++ b/device/bluetooth/dbus/fake_bluetooth_gatt_descriptor_service_provider.h
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "dbus/object_path.h"
#include "device/bluetooth/bluetooth_export.h"
#include "device/bluetooth/bluetooth_local_gatt_service.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_gatt_manager_client.cc b/device/bluetooth/dbus/fake_bluetooth_gatt_manager_client.cc
index fab0372..35d9532 100644
--- a/device/bluetooth/dbus/fake_bluetooth_gatt_manager_client.cc
+++ b/device/bluetooth/dbus/fake_bluetooth_gatt_manager_client.cc
@@ -7,7 +7,7 @@
#include <set>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/strings/string_util.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_gatt_manager_client.h b/device/bluetooth/dbus/fake_bluetooth_gatt_manager_client.h
index c60a8a2..ad926c1 100644
--- a/device/bluetooth/dbus/fake_bluetooth_gatt_manager_client.h
+++ b/device/bluetooth/dbus/fake_bluetooth_gatt_manager_client.h
@@ -9,7 +9,7 @@
#include <set>
#include <utility>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "dbus/bus.h"
#include "dbus/object_path.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_gatt_service_client.cc b/device/bluetooth/dbus/fake_bluetooth_gatt_service_client.cc
index a5ae252..eca414a 100644
--- a/device/bluetooth/dbus/fake_bluetooth_gatt_service_client.cc
+++ b/device/bluetooth/dbus/fake_bluetooth_gatt_service_client.cc
@@ -4,7 +4,7 @@
#include "device/bluetooth/dbus/fake_bluetooth_gatt_service_client.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/observer_list.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_input_client.cc b/device/bluetooth/dbus/fake_bluetooth_input_client.cc
index a64460a66..7be9d52 100644
--- a/device/bluetooth/dbus/fake_bluetooth_input_client.cc
+++ b/device/bluetooth/dbus/fake_bluetooth_input_client.cc
@@ -6,7 +6,7 @@
#include <map>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/observer_list.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_input_client.h b/device/bluetooth/dbus/fake_bluetooth_input_client.h
index 250fa10..c5506bc 100644
--- a/device/bluetooth/dbus/fake_bluetooth_input_client.h
+++ b/device/bluetooth/dbus/fake_bluetooth_input_client.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/observer_list.h"
#include "dbus/object_path.h"
#include "dbus/property.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_le_advertisement_service_provider.h b/device/bluetooth/dbus/fake_bluetooth_le_advertisement_service_provider.h
index 5c39bb5..f965d79b 100644
--- a/device/bluetooth/dbus/fake_bluetooth_le_advertisement_service_provider.h
+++ b/device/bluetooth/dbus/fake_bluetooth_le_advertisement_service_provider.h
@@ -5,8 +5,8 @@
#ifndef DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_LE_ADVERTISEMENT_SERVICE_PROVIDER_H_
#define DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_LE_ADVERTISEMENT_SERVICE_PROVIDER_H_
-#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 "dbus/object_path.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.h b/device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.h
index d8655045..3ff39c3f 100644
--- a/device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.h
+++ b/device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.h
@@ -8,8 +8,8 @@
#include <map>
#include <string>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "dbus/object_path.h"
#include "dbus/property.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_profile_manager_client.h b/device/bluetooth/dbus/fake_bluetooth_profile_manager_client.h
index 5e35335..abff624 100644
--- a/device/bluetooth/dbus/fake_bluetooth_profile_manager_client.h
+++ b/device/bluetooth/dbus/fake_bluetooth_profile_manager_client.h
@@ -8,8 +8,8 @@
#include <map>
#include <string>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "dbus/object_path.h"
#include "dbus/property.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/dbus/fake_bluetooth_profile_service_provider.h b/device/bluetooth/dbus/fake_bluetooth_profile_service_provider.h
index 4b1ad92..5d7f21f2 100644
--- a/device/bluetooth/dbus/fake_bluetooth_profile_service_provider.h
+++ b/device/bluetooth/dbus/fake_bluetooth_profile_service_provider.h
@@ -5,8 +5,8 @@
#ifndef DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_PROFILE_SERVICE_PROVIDER_H_
#define DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_PROFILE_SERVICE_PROVIDER_H_
-#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 "dbus/object_path.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/device.cc b/device/bluetooth/device.cc
index bf72e8b4..20c7b0b 100644
--- a/device/bluetooth/device.cc
+++ b/device/bluetooth/device.cc
@@ -5,8 +5,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/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "device/bluetooth/device.h"
diff --git a/device/bluetooth/device_unittest.cc b/device/bluetooth/device_unittest.cc
index 25eb9a3..db9f171 100644
--- a/device/bluetooth/device_unittest.cc
+++ b/device/bluetooth/device_unittest.cc
@@ -8,7 +8,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/weak_ptr.h"
#include "base/run_loop.h"
diff --git a/device/bluetooth/discovery_session.cc b/device/bluetooth/discovery_session.cc
index d637fe0..3061389 100644
--- a/device/bluetooth/discovery_session.cc
+++ b/device/bluetooth/discovery_session.cc
@@ -4,8 +4,8 @@
#include "device/bluetooth/discovery_session.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
namespace bluetooth {
DiscoverySession::DiscoverySession(
diff --git a/device/bluetooth/event_utils_winrt.h b/device/bluetooth/event_utils_winrt.h
index a202bb4..b911257 100644
--- a/device/bluetooth/event_utils_winrt.h
+++ b/device/bluetooth/event_utils_winrt.h
@@ -12,7 +12,7 @@
#include <type_traits>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/task/single_thread_task_runner.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/device/bluetooth/floss/bluetooth_adapter_floss.cc b/device/bluetooth/floss/bluetooth_adapter_floss.cc
index b38ffc4..5541540 100644
--- a/device/bluetooth/floss/bluetooth_adapter_floss.cc
+++ b/device/bluetooth/floss/bluetooth_adapter_floss.cc
@@ -4,8 +4,8 @@
#include "device/bluetooth/floss/bluetooth_adapter_floss.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/device/bluetooth/floss/bluetooth_adapter_floss.h b/device/bluetooth/floss/bluetooth_adapter_floss.h
index c0f34d9..9a0b992 100644
--- a/device/bluetooth/floss/bluetooth_adapter_floss.h
+++ b/device/bluetooth/floss/bluetooth_adapter_floss.h
@@ -9,7 +9,7 @@
#include <string>
#include <unordered_map>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "build/chromeos_buildflags.h"
#include "device/bluetooth/bluetooth_adapter.h"
diff --git a/device/bluetooth/floss/bluetooth_advertisement_floss.cc b/device/bluetooth/floss/bluetooth_advertisement_floss.cc
index 8a0d885..7689a9f 100644
--- a/device/bluetooth/floss/bluetooth_advertisement_floss.cc
+++ b/device/bluetooth/floss/bluetooth_advertisement_floss.cc
@@ -6,9 +6,9 @@
#include <iomanip>
-#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/guid.h"
#include "base/logging.h"
#include "base/observer_list.h"
diff --git a/device/bluetooth/floss/bluetooth_device_floss.cc b/device/bluetooth/floss/bluetooth_device_floss.cc
index 02c8db0..72ef53d 100644
--- a/device/bluetooth/floss/bluetooth_device_floss.cc
+++ b/device/bluetooth/floss/bluetooth_device_floss.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/notreached.h"
#include "base/task/sequenced_task_runner.h"
#include "components/device_event_log/device_event_log.h"
diff --git a/device/bluetooth/floss/bluetooth_gatt_connection_floss.cc b/device/bluetooth/floss/bluetooth_gatt_connection_floss.cc
index 280b5c44..09b0915 100644
--- a/device/bluetooth/floss/bluetooth_gatt_connection_floss.cc
+++ b/device/bluetooth/floss/bluetooth_gatt_connection_floss.cc
@@ -4,7 +4,7 @@
#include "device/bluetooth/floss/bluetooth_gatt_connection_floss.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "device/bluetooth/bluetooth_adapter.h"
#include "device/bluetooth/bluetooth_device.h"
diff --git a/device/bluetooth/floss/bluetooth_gatt_connection_floss.h b/device/bluetooth/floss/bluetooth_gatt_connection_floss.h
index 50a54a8..b33701e 100644
--- a/device/bluetooth/floss/bluetooth_gatt_connection_floss.h
+++ b/device/bluetooth/floss/bluetooth_gatt_connection_floss.h
@@ -5,7 +5,7 @@
#ifndef DEVICE_BLUETOOTH_FLOSS_BLUETOOTH_GATT_CONNECTION_FLOSS_H_
#define DEVICE_BLUETOOTH_FLOSS_BLUETOOTH_GATT_CONNECTION_FLOSS_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "device/bluetooth/bluetooth_gatt_connection.h"
#include "device/bluetooth/floss/floss_adapter_client.h"
diff --git a/device/bluetooth/floss/bluetooth_low_energy_scan_session_floss.h b/device/bluetooth/floss/bluetooth_low_energy_scan_session_floss.h
index 3fd2f45..fc5d2ab 100644
--- a/device/bluetooth/floss/bluetooth_low_energy_scan_session_floss.h
+++ b/device/bluetooth/floss/bluetooth_low_energy_scan_session_floss.h
@@ -5,7 +5,7 @@
#ifndef DEVICE_BLUETOOTH_FLOSS_BLUETOOTH_LOW_ENERGY_SCAN_SESSION_FLOSS_H_
#define DEVICE_BLUETOOTH_FLOSS_BLUETOOTH_LOW_ENERGY_SCAN_SESSION_FLOSS_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "device/bluetooth/bluetooth_device.h"
#include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/floss/bluetooth_socket_floss_unittest.cc b/device/bluetooth/floss/bluetooth_socket_floss_unittest.cc
index 52dd1239..cfcecbfc 100644
--- a/device/bluetooth/floss/bluetooth_socket_floss_unittest.cc
+++ b/device/bluetooth/floss/bluetooth_socket_floss_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/run_loop.h"
diff --git a/device/bluetooth/floss/exported_callback_manager.h b/device/bluetooth/floss/exported_callback_manager.h
index e49da3d..5fc2740 100644
--- a/device/bluetooth/floss/exported_callback_manager.h
+++ b/device/bluetooth/floss/exported_callback_manager.h
@@ -9,9 +9,9 @@
#include <unordered_map>
#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/logging.h"
#include "dbus/bus.h"
#include "dbus/exported_object.h"
diff --git a/device/bluetooth/floss/floss_adapter_client.cc b/device/bluetooth/floss/floss_adapter_client.cc
index bdbee7c8..0e462b6 100644
--- a/device/bluetooth/floss/floss_adapter_client.cc
+++ b/device/bluetooth/floss/floss_adapter_client.cc
@@ -6,8 +6,8 @@
#include <algorithm>
#include <map>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/observer_list.h"
#include "dbus/bus.h"
diff --git a/device/bluetooth/floss/floss_adapter_client.h b/device/bluetooth/floss/floss_adapter_client.h
index bb6f26d..fe71308 100644
--- a/device/bluetooth/floss/floss_adapter_client.h
+++ b/device/bluetooth/floss/floss_adapter_client.h
@@ -7,7 +7,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/device/bluetooth/floss/floss_admin_client.h b/device/bluetooth/floss/floss_admin_client.h
index eaf604c..c4dc0dd 100644
--- a/device/bluetooth/floss/floss_admin_client.h
+++ b/device/bluetooth/floss/floss_admin_client.h
@@ -6,7 +6,7 @@
#include <queue>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "dbus/exported_object.h"
diff --git a/device/bluetooth/floss/floss_battery_manager_client.h b/device/bluetooth/floss/floss_battery_manager_client.h
index 319d499..31cab09b 100644
--- a/device/bluetooth/floss/floss_battery_manager_client.h
+++ b/device/bluetooth/floss/floss_battery_manager_client.h
@@ -6,7 +6,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "dbus/exported_object.h"
diff --git a/device/bluetooth/floss/floss_dbus_client.h b/device/bluetooth/floss/floss_dbus_client.h
index 7688a933..da552cc 100644
--- a/device/bluetooth/floss/floss_dbus_client.h
+++ b/device/bluetooth/floss/floss_dbus_client.h
@@ -8,8 +8,8 @@
#include <ostream>
#include <string>
-#include "base/callback.h"
#include "base/containers/contains.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/no_destructor.h"
#include "base/types/expected.h"
diff --git a/device/bluetooth/floss/floss_dbus_manager.h b/device/bluetooth/floss/floss_dbus_manager.h
index c2eae89a..e6b0f987 100644
--- a/device/bluetooth/floss/floss_dbus_manager.h
+++ b/device/bluetooth/floss/floss_dbus_manager.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/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/device/bluetooth/floss/floss_gatt_client.h b/device/bluetooth/floss/floss_gatt_client.h
index 196f2dca..d940f4c 100644
--- a/device/bluetooth/floss/floss_gatt_client.h
+++ b/device/bluetooth/floss/floss_gatt_client.h
@@ -6,7 +6,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
diff --git a/device/bluetooth/floss/floss_lescan_client.cc b/device/bluetooth/floss/floss_lescan_client.cc
index f732905..91d7d42 100644
--- a/device/bluetooth/floss/floss_lescan_client.cc
+++ b/device/bluetooth/floss/floss_lescan_client.cc
@@ -6,9 +6,9 @@
#include <algorithm>
#include <map>
-#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/logging.h"
#include "base/observer_list.h"
#include "base/strings/string_number_conversions.h"
diff --git a/device/bluetooth/floss/floss_lescan_client.h b/device/bluetooth/floss/floss_lescan_client.h
index c4433db..3e3200e 100644
--- a/device/bluetooth/floss/floss_lescan_client.h
+++ b/device/bluetooth/floss/floss_lescan_client.h
@@ -7,7 +7,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/device/bluetooth/floss/floss_manager_client.cc b/device/bluetooth/floss/floss_manager_client.cc
index 0290712e..cce63301 100644
--- a/device/bluetooth/floss/floss_manager_client.cc
+++ b/device/bluetooth/floss/floss_manager_client.cc
@@ -9,11 +9,11 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.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.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/observer_list.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/device/bluetooth/floss/floss_manager_client.h b/device/bluetooth/floss/floss_manager_client.h
index e83a8e02..fef4da1 100644
--- a/device/bluetooth/floss/floss_manager_client.h
+++ b/device/bluetooth/floss/floss_manager_client.h
@@ -8,8 +8,8 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
#include "base/containers/flat_map.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
diff --git a/device/bluetooth/floss/floss_socket_manager.h b/device/bluetooth/floss/floss_socket_manager.h
index 45c7eb32..f3b1bf6 100644
--- a/device/bluetooth/floss/floss_socket_manager.h
+++ b/device/bluetooth/floss/floss_socket_manager.h
@@ -8,8 +8,8 @@
#include <string>
#include <unordered_map>
-#include "base/callback.h"
#include "base/files/scoped_file.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "dbus/exported_object.h"
diff --git a/device/bluetooth/server_socket.cc b/device/bluetooth/server_socket.cc
index ca9ba36..a8c82b7 100644
--- a/device/bluetooth/server_socket.cc
+++ b/device/bluetooth/server_socket.cc
@@ -4,8 +4,8 @@
#include "device/bluetooth/server_socket.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 "device/bluetooth/bluetooth_device.h"
#include "device/bluetooth/bluetooth_socket.h"
diff --git a/device/bluetooth/server_socket_unittest.cc b/device/bluetooth/server_socket_unittest.cc
index 507d68bf..dd7a28a 100644
--- a/device/bluetooth/server_socket_unittest.cc
+++ b/device/bluetooth/server_socket_unittest.cc
@@ -8,7 +8,7 @@
#include <tuple>
#include <vector>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
diff --git a/device/bluetooth/socket.cc b/device/bluetooth/socket.cc
index 1399902..9a2f6568 100644
--- a/device/bluetooth/socket.cc
+++ b/device/bluetooth/socket.cc
@@ -8,8 +8,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/ptr_util.h"
#include "device/bluetooth/bluetooth_socket.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/device/bluetooth/socket_unittest.cc b/device/bluetooth/socket_unittest.cc
index 7108ae0..68c321a 100644
--- a/device/bluetooth/socket_unittest.cc
+++ b/device/bluetooth/socket_unittest.cc
@@ -7,7 +7,7 @@
#include <tuple>
#include <vector>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/run_loop.h"
#include "base/test/gmock_callback_support.h"
diff --git a/device/bluetooth/test/bluetooth_test.cc b/device/bluetooth/test/bluetooth_test.cc
index c0de71d..26a4523 100644
--- a/device/bluetooth/test/bluetooth_test.cc
+++ b/device/bluetooth/test/bluetooth_test.cc
@@ -7,8 +7,8 @@
#include <iterator>
#include <memory>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/notreached.h"
#include "base/run_loop.h"
diff --git a/device/bluetooth/test/bluetooth_test_android.cc b/device/bluetooth/test/bluetooth_test_android.cc
index 080dae5..63e74ff 100644
--- a/device/bluetooth/test/bluetooth_test_android.cc
+++ b/device/bluetooth/test/bluetooth_test_android.cc
@@ -9,8 +9,8 @@
#include "base/android/jni_array.h"
#include "base/android/jni_string.h"
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
#include "device/bluetooth/android/wrappers.h"
diff --git a/device/bluetooth/test/bluetooth_test_bluez.cc b/device/bluetooth/test/bluetooth_test_bluez.cc
index 51d4f375..88237ba1 100644
--- a/device/bluetooth/test/bluetooth_test_bluez.cc
+++ b/device/bluetooth/test/bluetooth_test_bluez.cc
@@ -7,9 +7,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/ref_counted.h"
#include "base/run_loop.h"
#include "dbus/object_path.h"
diff --git a/device/bluetooth/test/bluetooth_test_bluez.h b/device/bluetooth/test/bluetooth_test_bluez.h
index 8957b7b..a60a860 100644
--- a/device/bluetooth/test/bluetooth_test_bluez.h
+++ b/device/bluetooth/test/bluetooth_test_bluez.h
@@ -8,7 +8,7 @@
#include <cstdint>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "device/bluetooth/bluetooth_device.h"
#include "device/bluetooth/bluetooth_local_gatt_characteristic.h"
diff --git a/device/bluetooth/test/bluetooth_test_cast.cc b/device/bluetooth/test/bluetooth_test_cast.cc
index d67254e34..9978b486 100644
--- a/device/bluetooth/test/bluetooth_test_cast.cc
+++ b/device/bluetooth/test/bluetooth_test_cast.cc
@@ -4,7 +4,7 @@
#include "device/bluetooth/test/bluetooth_test_cast.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "chromecast/device/bluetooth/bluetooth_util.h"
#include "chromecast/device/bluetooth/le/mock_gatt_client_manager.h"
#include "chromecast/device/bluetooth/le/remote_device.h"
diff --git a/device/bluetooth/test/bluetooth_test_mac.mm b/device/bluetooth/test/bluetooth_test_mac.mm
index 4d75982..4272eb3 100644
--- a/device/bluetooth/test/bluetooth_test_mac.mm
+++ b/device/bluetooth/test/bluetooth_test_mac.mm
@@ -9,7 +9,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#import "base/mac/foundation_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/sys_string_conversions.h"
diff --git a/device/bluetooth/test/bluetooth_test_win.cc b/device/bluetooth/test/bluetooth_test_win.cc
index c206d18..297eb57 100644
--- a/device/bluetooth/test/bluetooth_test_win.cc
+++ b/device/bluetooth/test/bluetooth_test_win.cc
@@ -14,9 +14,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/device/bluetooth/test/fake_bluetooth_adapter_winrt.cc b/device/bluetooth/test/fake_bluetooth_adapter_winrt.cc
index 922d8d46..580a0fa 100644
--- a/device/bluetooth/test/fake_bluetooth_adapter_winrt.cc
+++ b/device/bluetooth/test/fake_bluetooth_adapter_winrt.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/strcat.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
diff --git a/device/bluetooth/test/fake_bluetooth_le_device_winrt.cc b/device/bluetooth/test/fake_bluetooth_le_device_winrt.cc
index f57a1e2..6efa531 100644
--- a/device/bluetooth/test/fake_bluetooth_le_device_winrt.cc
+++ b/device/bluetooth/test/fake_bluetooth_le_device_winrt.cc
@@ -8,7 +8,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/device/bluetooth/test/fake_bluetooth_le_device_winrt.h b/device/bluetooth/test/fake_bluetooth_le_device_winrt.h
index 1c8f3db..f724cd0 100644
--- a/device/bluetooth/test/fake_bluetooth_le_device_winrt.h
+++ b/device/bluetooth/test/fake_bluetooth_le_device_winrt.h
@@ -16,7 +16,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "device/bluetooth/bluetooth_device.h"
#include "device/bluetooth/test/fake_device_information_winrt.h"
diff --git a/device/bluetooth/test/fake_central.cc b/device/bluetooth/test/fake_central.cc
index a175b853..8cc9df737 100644
--- a/device/bluetooth/test/fake_central.cc
+++ b/device/bluetooth/test/fake_central.cc
@@ -9,7 +9,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/device/bluetooth/test/fake_device_information_custom_pairing_winrt.cc b/device/bluetooth/test/fake_device_information_custom_pairing_winrt.cc
index 7e10689..03a29c6 100644
--- a/device/bluetooth/test/fake_device_information_custom_pairing_winrt.cc
+++ b/device/bluetooth/test/fake_device_information_custom_pairing_winrt.cc
@@ -9,7 +9,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "base/test/bind.h"
#include "base/win/async_operation.h"
diff --git a/device/bluetooth/test/fake_device_information_custom_pairing_winrt.h b/device/bluetooth/test/fake_device_information_custom_pairing_winrt.h
index 0f0da5c..745123f 100644
--- a/device/bluetooth/test/fake_device_information_custom_pairing_winrt.h
+++ b/device/bluetooth/test/fake_device_information_custom_pairing_winrt.h
@@ -11,7 +11,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/strings/string_piece.h"
#include "device/bluetooth/test/fake_device_information_pairing_winrt.h"
diff --git a/device/bluetooth/test/fake_device_information_winrt.cc b/device/bluetooth/test/fake_device_information_winrt.cc
index 5701b8d..0fb1419 100644
--- a/device/bluetooth/test/fake_device_information_winrt.cc
+++ b/device/bluetooth/test/fake_device_information_winrt.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/string_piece.h"
#include "base/task/sequenced_task_runner.h"
#include "base/win/async_operation.h"
diff --git a/device/bluetooth/test/fake_gatt_characteristic_winrt.cc b/device/bluetooth/test/fake_gatt_characteristic_winrt.cc
index a72b1cf..f5132145 100644
--- a/device/bluetooth/test/fake_gatt_characteristic_winrt.cc
+++ b/device/bluetooth/test/fake_gatt_characteristic_winrt.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/strings/string_piece.h"
#include "base/task/single_thread_task_runner.h"
#include "base/win/async_operation.h"
diff --git a/device/bluetooth/test/fake_gatt_characteristic_winrt.h b/device/bluetooth/test/fake_gatt_characteristic_winrt.h
index edb1353..5df270d 100644
--- a/device/bluetooth/test/fake_gatt_characteristic_winrt.h
+++ b/device/bluetooth/test/fake_gatt_characteristic_winrt.h
@@ -14,7 +14,7 @@
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/strings/string_piece_forward.h"
#include "device/bluetooth/bluetooth_gatt_service.h"
diff --git a/device/bluetooth/test/fake_gatt_descriptor_winrt.h b/device/bluetooth/test/fake_gatt_descriptor_winrt.h
index 4b7e4eb..51f2036 100644
--- a/device/bluetooth/test/fake_gatt_descriptor_winrt.h
+++ b/device/bluetooth/test/fake_gatt_descriptor_winrt.h
@@ -13,7 +13,7 @@
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/strings/string_piece_forward.h"
#include "device/bluetooth/bluetooth_gatt_service.h"
diff --git a/device/bluetooth/test/fake_gatt_device_service_winrt.cc b/device/bluetooth/test/fake_gatt_device_service_winrt.cc
index a323e60..3ec15b5d 100644
--- a/device/bluetooth/test/fake_gatt_device_service_winrt.cc
+++ b/device/bluetooth/test/fake_gatt_device_service_winrt.cc
@@ -9,7 +9,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/string_piece.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/device/bluetooth/test/fake_peripheral.cc b/device/bluetooth/test/fake_peripheral.cc
index e3e43f8..607328e 100644
--- a/device/bluetooth/test/fake_peripheral.cc
+++ b/device/bluetooth/test/fake_peripheral.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/memory/weak_ptr.h"
#include "base/ranges/algorithm.h"
diff --git a/device/bluetooth/test/fake_radio_winrt.cc b/device/bluetooth/test/fake_radio_winrt.cc
index 942ceda..c775f37 100644
--- a/device/bluetooth/test/fake_radio_winrt.cc
+++ b/device/bluetooth/test/fake_radio_winrt.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/bind.h"
#include "base/win/async_operation.h"
diff --git a/device/bluetooth/test/fake_radio_winrt.h b/device/bluetooth/test/fake_radio_winrt.h
index d3b3ed4..b7a39ea 100644
--- a/device/bluetooth/test/fake_radio_winrt.h
+++ b/device/bluetooth/test/fake_radio_winrt.h
@@ -10,8 +10,8 @@
#include <wrl/client.h>
#include <wrl/implements.h>
-#include "base/callback.h"
#include "base/cancelable_callback.h"
+#include "base/functional/callback.h"
namespace device {
diff --git a/device/bluetooth/test/fake_remote_gatt_characteristic.cc b/device/bluetooth/test/fake_remote_gatt_characteristic.cc
index b5db90c..4e1811db 100644
--- a/device/bluetooth/test/fake_remote_gatt_characteristic.cc
+++ b/device/bluetooth/test/fake_remote_gatt_characteristic.cc
@@ -7,7 +7,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/ranges/algorithm.h"
#include "base/strings/stringprintf.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/device/bluetooth/test/fake_remote_gatt_descriptor.cc b/device/bluetooth/test/fake_remote_gatt_descriptor.cc
index 82a5184..43aa9cdf 100644
--- a/device/bluetooth/test/fake_remote_gatt_descriptor.cc
+++ b/device/bluetooth/test/fake_remote_gatt_descriptor.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/single_thread_task_runner.h"
#include "device/bluetooth/public/mojom/test/fake_bluetooth.mojom.h"
diff --git a/device/bluetooth/test/mock_bluetooth_adapter.h b/device/bluetooth/test/mock_bluetooth_adapter.h
index d7c86d00..1fd7c3e 100644
--- a/device/bluetooth/test/mock_bluetooth_adapter.h
+++ b/device/bluetooth/test/mock_bluetooth_adapter.h
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
#include "device/bluetooth/bluetooth_adapter.h"
diff --git a/device/bluetooth/test/mock_bluetooth_gatt_characteristic.h b/device/bluetooth/test/mock_bluetooth_gatt_characteristic.h
index 3bbedb7..955df2b 100644
--- a/device/bluetooth/test/mock_bluetooth_gatt_characteristic.h
+++ b/device/bluetooth/test/mock_bluetooth_gatt_characteristic.h
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "device/bluetooth/bluetooth_remote_gatt_characteristic.h"
#include "device/bluetooth/bluetooth_remote_gatt_descriptor.h"
#include "device/bluetooth/public/cpp/bluetooth_uuid.h"
diff --git a/device/bluetooth/test/mock_bluetooth_gatt_descriptor.h b/device/bluetooth/test/mock_bluetooth_gatt_descriptor.h
index 9286b21d..490afe3 100644
--- a/device/bluetooth/test/mock_bluetooth_gatt_descriptor.h
+++ b/device/bluetooth/test/mock_bluetooth_gatt_descriptor.h
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "device/bluetooth/bluetooth_remote_gatt_characteristic.h"
#include "device/bluetooth/bluetooth_remote_gatt_descriptor.h"
#include "device/bluetooth/public/cpp/bluetooth_uuid.h"
diff --git a/device/bluetooth/test/mock_bluetooth_gatt_notify_session.cc b/device/bluetooth/test/mock_bluetooth_gatt_notify_session.cc
index 1c82913..1ac1100 100644
--- a/device/bluetooth/test/mock_bluetooth_gatt_notify_session.cc
+++ b/device/bluetooth/test/mock_bluetooth_gatt_notify_session.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "device/bluetooth/test/mock_bluetooth_gatt_notify_session.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "device/bluetooth/test/mock_bluetooth_adapter.h"
#include "device/bluetooth/test/mock_bluetooth_gatt_characteristic.h"
diff --git a/device/bluetooth/test/mock_bluetooth_gatt_notify_session.h b/device/bluetooth/test/mock_bluetooth_gatt_notify_session.h
index 441aaa0..876a5721 100644
--- a/device/bluetooth/test/mock_bluetooth_gatt_notify_session.h
+++ b/device/bluetooth/test/mock_bluetooth_gatt_notify_session.h
@@ -9,7 +9,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/timer/timer.h"
#include "device/bluetooth/bluetooth_gatt_notify_session.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/device/bluetooth/test/mock_bluetooth_low_energy_scan_session.h b/device/bluetooth/test/mock_bluetooth_low_energy_scan_session.h
index 5ff9add..04750024 100644
--- a/device/bluetooth/test/mock_bluetooth_low_energy_scan_session.h
+++ b/device/bluetooth/test/mock_bluetooth_low_energy_scan_session.h
@@ -5,7 +5,7 @@
#ifndef DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_LOW_ENERGY_SCAN_SESSION_H_
#define DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_LOW_ENERGY_SCAN_SESSION_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "device/bluetooth/bluetooth_low_energy_scan_session.h"
namespace device {
diff --git a/device/bluetooth/test/test_bluetooth_local_gatt_service_delegate.cc b/device/bluetooth/test/test_bluetooth_local_gatt_service_delegate.cc
index f104134..c49aa6d 100644
--- a/device/bluetooth/test/test_bluetooth_local_gatt_service_delegate.cc
+++ b/device/bluetooth/test/test_bluetooth_local_gatt_service_delegate.cc
@@ -4,7 +4,7 @@
#include "device/bluetooth/test/test_bluetooth_local_gatt_service_delegate.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "device/bluetooth/test/bluetooth_gatt_server_test.h"
namespace device {
diff --git a/device/bluetooth/test/test_bluetooth_local_gatt_service_delegate.h b/device/bluetooth/test/test_bluetooth_local_gatt_service_delegate.h
index 25be577..a5e1984 100644
--- a/device/bluetooth/test/test_bluetooth_local_gatt_service_delegate.h
+++ b/device/bluetooth/test/test_bluetooth_local_gatt_service_delegate.h
@@ -8,7 +8,7 @@
#include <cstdint>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "device/bluetooth/bluetooth_local_gatt_characteristic.h"
#include "device/bluetooth/bluetooth_local_gatt_descriptor.h"
diff --git a/device/fido/aoa/android_accessory_device.cc b/device/fido/aoa/android_accessory_device.cc
index 57aab39a..e93e741 100644
--- a/device/fido/aoa/android_accessory_device.cc
+++ b/device/fido/aoa/android_accessory_device.cc
@@ -7,7 +7,7 @@
#include <limits>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/notreached.h"
#include "base/rand_util.h"
#include "base/strings/string_number_conversions.h"
diff --git a/device/fido/aoa/android_accessory_device.h b/device/fido/aoa/android_accessory_device.h
index eb9d4ef5..0109b17 100644
--- a/device/fido/aoa/android_accessory_device.h
+++ b/device/fido/aoa/android_accessory_device.h
@@ -7,8 +7,8 @@
#include <vector>
-#include "base/callback.h"
#include "base/containers/span.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "device/fido/fido_device.h"
#include "mojo/public/cpp/bindings/remote.h"
diff --git a/device/fido/aoa/android_accessory_discovery.cc b/device/fido/aoa/android_accessory_discovery.cc
index 5d3950a..7d40586 100644
--- a/device/fido/aoa/android_accessory_discovery.cc
+++ b/device/fido/aoa/android_accessory_discovery.cc
@@ -18,7 +18,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
// See https://source.android.com/devices/accessories/aoa for details on the
// protocol used to talk to apps on the phone here.
diff --git a/device/fido/aoa/android_accessory_discovery.h b/device/fido/aoa/android_accessory_discovery.h
index 048c989..475f8bb 100644
--- a/device/fido/aoa/android_accessory_discovery.h
+++ b/device/fido/aoa/android_accessory_discovery.h
@@ -10,9 +10,9 @@
#include <tuple>
#include <vector>
-#include "base/callback.h"
#include "base/component_export.h"
#include "base/containers/span.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "device/fido/fido_device_discovery.h"
#include "mojo/public/cpp/bindings/associated_receiver.h"
diff --git a/device/fido/appid_exclude_probe_task.h b/device/fido/appid_exclude_probe_task.h
index 6aa6dbf..a3f6995f 100644
--- a/device/fido/appid_exclude_probe_task.h
+++ b/device/fido/appid_exclude_probe_task.h
@@ -7,7 +7,7 @@
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "device/fido/authenticator_get_assertion_response.h"
#include "device/fido/ctap_get_assertion_request.h"
diff --git a/device/fido/auth_token_requester.cc b/device/fido/auth_token_requester.cc
index 7bd02f2f..a968eeb7 100644
--- a/device/fido/auth_token_requester.cc
+++ b/device/fido/auth_token_requester.cc
@@ -7,8 +7,8 @@
#include <set>
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/device/fido/auth_token_requester.h b/device/fido/auth_token_requester.h
index f5bdf028..b5121f8 100644
--- a/device/fido/auth_token_requester.h
+++ b/device/fido/auth_token_requester.h
@@ -9,8 +9,8 @@
#include <string>
#include <vector>
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "device/fido/fido_constants.h"
diff --git a/device/fido/bio/enroller.cc b/device/fido/bio/enroller.cc
index 546f269..d02fd0b 100644
--- a/device/fido/bio/enroller.cc
+++ b/device/fido/bio/enroller.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "device/fido/fido_authenticator.h"
namespace device {
diff --git a/device/fido/bio/enrollment_handler.cc b/device/fido/bio/enrollment_handler.cc
index 97d69b23..66a0446 100644
--- a/device/fido/bio/enrollment_handler.cc
+++ b/device/fido/bio/enrollment_handler.cc
@@ -4,8 +4,8 @@
#include "device/fido/bio/enrollment_handler.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "components/device_event_log/device_event_log.h"
#include "device/fido/bio/enrollment.h"
#include "device/fido/fido_authenticator.h"
diff --git a/device/fido/bio/enrollment_handler_unittest.cc b/device/fido/bio/enrollment_handler_unittest.cc
index d130bc8..f27d019e 100644
--- a/device/fido/bio/enrollment_handler_unittest.cc
+++ b/device/fido/bio/enrollment_handler_unittest.cc
@@ -8,8 +8,8 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-#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 "device/fido/bio/enrollment_handler.h"
#include "device/fido/fido_transport_protocol.h"
diff --git a/device/fido/ble_adapter_manager.cc b/device/fido/ble_adapter_manager.cc
index 57aca87..430270da 100644
--- a/device/fido/ble_adapter_manager.cc
+++ b/device/fido/ble_adapter_manager.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 "device/bluetooth/bluetooth_adapter_factory.h"
namespace device {
diff --git a/device/fido/ble_adapter_manager.h b/device/fido/ble_adapter_manager.h
index ddfc5155..f6aecc7 100644
--- a/device/fido/ble_adapter_manager.h
+++ b/device/fido/ble_adapter_manager.h
@@ -5,8 +5,8 @@
#ifndef DEVICE_FIDO_BLE_ADAPTER_MANAGER_H_
#define DEVICE_FIDO_BLE_ADAPTER_MANAGER_H_
-#include "base/callback.h"
#include "base/component_export.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/device/fido/ble_adapter_manager_unittest.cc b/device/fido/ble_adapter_manager_unittest.cc
index f47d9e90..4b2811ba 100644
--- a/device/fido/ble_adapter_manager_unittest.cc
+++ b/device/fido/ble_adapter_manager_unittest.cc
@@ -8,7 +8,7 @@
#include <memory>
#include <utility>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/test/gmock_callback_support.h"
#include "base/test/task_environment.h"
diff --git a/device/fido/cable/fido_ble_connection.cc b/device/fido/cable/fido_ble_connection.cc
index 94e63ce..0bf1ff3 100644
--- a/device/fido/cable/fido_ble_connection.cc
+++ b/device/fido/cable/fido_ble_connection.cc
@@ -9,8 +9,8 @@
#include <utility>
#include "base/barrier_closure.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/strings/stringprintf.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/device/fido/cable/fido_ble_connection.h b/device/fido/cable/fido_ble_connection.h
index cab3cc7..6d63042 100644
--- a/device/fido/cable/fido_ble_connection.h
+++ b/device/fido/cable/fido_ble_connection.h
@@ -12,8 +12,8 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
#include "base/component_export.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "device/bluetooth/bluetooth_adapter.h"
diff --git a/device/fido/cable/fido_ble_connection_unittest.cc b/device/fido/cable/fido_ble_connection_unittest.cc
index 5a9463c..9ed1d92 100644
--- a/device/fido/cable/fido_ble_connection_unittest.cc
+++ b/device/fido/cable/fido_ble_connection_unittest.cc
@@ -7,8 +7,8 @@
#include <bitset>
#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/ranges/algorithm.h"
diff --git a/device/fido/cable/fido_ble_transaction.cc b/device/fido/cable/fido_ble_transaction.cc
index 55bef39d..e66bb4e5 100644
--- a/device/fido/cable/fido_ble_transaction.cc
+++ b/device/fido/cable/fido_ble_transaction.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/strings/string_number_conversions.h"
#include "base/task/single_thread_task_runner.h"
#include "components/device_event_log/device_event_log.h"
diff --git a/device/fido/cable/fido_cable_device.cc b/device/fido/cable/fido_cable_device.cc
index 711b86bc..f8b9dbe 100644
--- a/device/fido/cable/fido_cable_device.cc
+++ b/device/fido/cable/fido_cable_device.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/numerics/safe_math.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
diff --git a/device/fido/cable/fido_cable_device_unittest.cc b/device/fido/cable/fido_cable_device_unittest.cc
index b45327c..d55ea699 100644
--- a/device/fido/cable/fido_cable_device_unittest.cc
+++ b/device/fido/cable/fido_cable_device_unittest.cc
@@ -10,8 +10,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/command_line.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/device/fido/cable/fido_cable_discovery.cc b/device/fido/cable/fido_cable_discovery.cc
index e949d7e..4ff7859 100644
--- a/device/fido/cable/fido_cable_discovery.cc
+++ b/device/fido/cable/fido_cable_discovery.cc
@@ -8,9 +8,9 @@
#include <utility>
#include "base/barrier_closure.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/logging.h"
#include "base/metrics/histogram_functions.h"
#include "base/no_destructor.h"
diff --git a/device/fido/cable/fido_cable_handshake_handler.cc b/device/fido/cable/fido_cable_handshake_handler.cc
index cfcb736..020352a 100644
--- a/device/fido/cable/fido_cable_handshake_handler.cc
+++ b/device/fido/cable/fido_cable_handshake_handler.cc
@@ -7,8 +7,8 @@
#include <tuple>
#include <utility>
-#include "base/bind.h"
#include "base/containers/span.h"
+#include "base/functional/bind.h"
#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/device/fido/cable/fido_cable_handshake_handler_unittest.cc b/device/fido/cable/fido_cable_handshake_handler_unittest.cc
index 1414b3f..b0a6c24 100644
--- a/device/fido/cable/fido_cable_handshake_handler_unittest.cc
+++ b/device/fido/cable/fido_cable_handshake_handler_unittest.cc
@@ -10,7 +10,7 @@
#include <string>
#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/device/fido/cable/fido_tunnel_device.h b/device/fido/cable/fido_tunnel_device.h
index 609c953..0904c7a 100644
--- a/device/fido/cable/fido_tunnel_device.h
+++ b/device/fido/cable/fido_tunnel_device.h
@@ -8,7 +8,7 @@
#include <array>
#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/sequence_checker.h"
diff --git a/device/fido/cable/mock_fido_ble_connection.cc b/device/fido/cable/mock_fido_ble_connection.cc
index 203b6d0..f52ed49 100644
--- a/device/fido/cable/mock_fido_ble_connection.cc
+++ b/device/fido/cable/mock_fido_ble_connection.cc
@@ -4,7 +4,7 @@
#include "device/fido/cable/mock_fido_ble_connection.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "device/bluetooth/public/cpp/bluetooth_uuid.h"
#include "device/fido/cable/fido_ble_uuids.h"
diff --git a/device/fido/cable/v2_authenticator.h b/device/fido/cable/v2_authenticator.h
index ce4c1ff..a7f45e91 100644
--- a/device/fido/cable/v2_authenticator.h
+++ b/device/fido/cable/v2_authenticator.h
@@ -10,8 +10,8 @@
#include <stdint.h>
-#include "base/callback.h"
#include "base/containers/span.h"
+#include "base/functional/callback.h"
#include "device/fido/cable/v2_constants.h"
#include "device/fido/fido_constants.h"
#include "services/network/public/mojom/network_context.mojom-forward.h"
diff --git a/device/fido/cable/v2_discovery.cc b/device/fido/cable/v2_discovery.cc
index ca4163f..acc59bd 100644
--- a/device/fido/cable/v2_discovery.cc
+++ b/device/fido/cable/v2_discovery.cc
@@ -4,10 +4,10 @@
#include "device/fido/cable/v2_discovery.h"
-#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/metrics/histogram_functions.h"
#include "base/strings/string_number_conversions.h"
#include "components/device_event_log/device_event_log.h"
diff --git a/device/fido/cable/v2_discovery.h b/device/fido/cable/v2_discovery.h
index 5c5ed84e..af5bfde 100644
--- a/device/fido/cable/v2_discovery.h
+++ b/device/fido/cable/v2_discovery.h
@@ -9,10 +9,10 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
#include "base/component_export.h"
#include "base/containers/flat_set.h"
#include "base/containers/span.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "device/fido/cable/cable_discovery_data.h"
diff --git a/device/fido/cable/v2_registration.h b/device/fido/cable/v2_registration.h
index 878295e..1541f3f 100644
--- a/device/fido/cable/v2_registration.h
+++ b/device/fido/cable/v2_registration.h
@@ -11,8 +11,8 @@
#include <memory>
#include <vector>
-#include "base/callback_forward.h"
#include "base/containers/span.h"
+#include "base/functional/callback_forward.h"
#include "device/fido/cable/v2_constants.h"
#include "device/fido/fido_constants.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/device/fido/cable/v2_test_util.cc b/device/fido/cable/v2_test_util.cc
index 17c884d..c7387db 100644
--- a/device/fido/cable/v2_test_util.cc
+++ b/device/fido/cable/v2_test_util.cc
@@ -8,9 +8,9 @@
#include <vector>
#include "base/base64url.h"
-#include "base/callback.h"
#include "base/check.h"
#include "base/containers/contains.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/string_number_conversions.h"
diff --git a/device/fido/cable/v2_test_util.h b/device/fido/cable/v2_test_util.h
index d5100ff..b3c1ea8 100644
--- a/device/fido/cable/v2_test_util.h
+++ b/device/fido/cable/v2_test_util.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback_forward.h"
#include "base/containers/span.h"
+#include "base/functional/callback_forward.h"
#include "device/fido/cable/v2_authenticator.h"
#include "device/fido/cable/v2_constants.h"
#include "device/fido/cable/v2_discovery.h"
diff --git a/device/fido/cable/websocket_adapter.cc b/device/fido/cable/websocket_adapter.cc
index 1e466ca..15a7728 100644
--- a/device/fido/cable/websocket_adapter.cc
+++ b/device/fido/cable/websocket_adapter.cc
@@ -4,7 +4,7 @@
#include "device/fido/cable/websocket_adapter.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
#include "base/strings/string_number_conversions.h"
diff --git a/device/fido/cable/websocket_adapter.h b/device/fido/cable/websocket_adapter.h
index d9563fb..55b9270f 100644
--- a/device/fido/cable/websocket_adapter.h
+++ b/device/fido/cable/websocket_adapter.h
@@ -7,9 +7,9 @@
#include <vector>
-#include "base/callback_forward.h"
#include "base/component_export.h"
#include "base/containers/span.h"
+#include "base/functional/callback_forward.h"
#include "base/sequence_checker.h"
#include "device/fido/cable/v2_handshake.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/device/fido/cbor_extract.cc b/device/fido/cbor_extract.cc
index a5fba3b7..ada966e 100644
--- a/device/fido/cbor_extract.cc
+++ b/device/fido/cbor_extract.cc
@@ -6,8 +6,8 @@
#include <type_traits>
-#include "base/callback.h"
#include "base/check_op.h"
+#include "base/functional/callback.h"
#include "components/cbor/values.h"
namespace device {
diff --git a/device/fido/cbor_extract.h b/device/fido/cbor_extract.h
index 85f766a..3ebcf90 100644
--- a/device/fido/cbor_extract.h
+++ b/device/fido/cbor_extract.h
@@ -5,9 +5,9 @@
#ifndef DEVICE_FIDO_CBOR_EXTRACT_H_
#define DEVICE_FIDO_CBOR_EXTRACT_H_
-#include "base/callback_forward.h"
#include "base/component_export.h"
#include "base/containers/span.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "components/cbor/values.h"
diff --git a/device/fido/cbor_extract_unittest.cc b/device/fido/cbor_extract_unittest.cc
index dccc644..aa4fa68 100644
--- a/device/fido/cbor_extract_unittest.cc
+++ b/device/fido/cbor_extract_unittest.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "device/fido/cbor_extract.h"
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr_exclusion.h"
#include "base/ranges/algorithm.h"
#include "components/cbor/values.h"
diff --git a/device/fido/credential_management_handler.cc b/device/fido/credential_management_handler.cc
index 682b4b2..155c68f 100644
--- a/device/fido/credential_management_handler.cc
+++ b/device/fido/credential_management_handler.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 "device/fido/fido_authenticator.h"
#include "device/fido/fido_constants.h"
diff --git a/device/fido/cros/authenticator.cc b/device/fido/cros/authenticator.cc
index 9cdde10..4177c04 100644
--- a/device/fido/cros/authenticator.cc
+++ b/device/fido/cros/authenticator.cc
@@ -10,8 +10,8 @@
#include <vector>
#include "base/barrier_closure.h"
-#include "base/bind.h"
#include "base/containers/span.h"
+#include "base/functional/bind.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "chromeos/dbus/u2f/u2f_client.h"
diff --git a/device/fido/cros/credential_store.h b/device/fido/cros/credential_store.h
index c272311b..b94cff4 100644
--- a/device/fido/cros/credential_store.h
+++ b/device/fido/cros/credential_store.h
@@ -5,8 +5,8 @@
#ifndef DEVICE_FIDO_CROS_CREDENTIAL_STORE_H_
#define DEVICE_FIDO_CROS_CREDENTIAL_STORE_H_
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "device/fido/platform_credential_store.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/device/fido/cros/discovery.cc b/device/fido/cros/discovery.cc
index 72e9c33..83433c9 100644
--- a/device/fido/cros/discovery.cc
+++ b/device/fido/cros/discovery.cc
@@ -6,7 +6,7 @@
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "build/chromeos_buildflags.h"
#include "chromeos/dbus/u2f/u2f_client.h"
diff --git a/device/fido/cros/discovery.h b/device/fido/cros/discovery.h
index 79d6f8d..aea6645 100644
--- a/device/fido/cros/discovery.h
+++ b/device/fido/cros/discovery.h
@@ -8,8 +8,8 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "chromeos/dbus/tpm_manager/tpm_manager.pb.h"
#include "device/fido/cros/authenticator.h"
diff --git a/device/fido/ctap2_device_operation.h b/device/fido/ctap2_device_operation.h
index 414b0c8..de6a72c 100644
--- a/device/fido/ctap2_device_operation.h
+++ b/device/fido/ctap2_device_operation.h
@@ -11,9 +11,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/containers/span.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/string_number_conversions.h"
#include "components/cbor/diagnostic_writer.h"
diff --git a/device/fido/device_operation.h b/device/fido/device_operation.h
index 35d1223..b917231e 100644
--- a/device/fido/device_operation.h
+++ b/device/fido/device_operation.h
@@ -10,8 +10,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/raw_ptr.h"
#include "base/task/sequenced_task_runner.h"
#include "device/fido/fido_constants.h"
diff --git a/device/fido/fake_fido_discovery.cc b/device/fido/fake_fido_discovery.cc
index c710be7..faac9b6 100644
--- a/device/fido/fake_fido_discovery.cc
+++ b/device/fido/fake_fido_discovery.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/notreached.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/device/fido/fake_fido_discovery.h b/device/fido/fake_fido_discovery.h
index f61de6f..27c976a 100644
--- a/device/fido/fake_fido_discovery.h
+++ b/device/fido/fake_fido_discovery.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/run_loop.h"
#include "device/fido/fido_discovery_factory.h"
diff --git a/device/fido/fido_authenticator.cc b/device/fido/fido_authenticator.cc
index 82d2f70..47a3397 100644
--- a/device/fido/fido_authenticator.cc
+++ b/device/fido/fido_authenticator.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/notreached.h"
#include "device/fido/ctap_make_credential_request.h"
#include "device/fido/fido_constants.h"
diff --git a/device/fido/fido_authenticator.h b/device/fido/fido_authenticator.h
index db5ce20..6bbe8ba 100644
--- a/device/fido/fido_authenticator.h
+++ b/device/fido/fido_authenticator.h
@@ -8,9 +8,9 @@
#include <cstdint>
#include <string>
-#include "base/callback_forward.h"
#include "base/component_export.h"
#include "base/containers/span.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/weak_ptr.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
diff --git a/device/fido/fido_device.cc b/device/fido/fido_device.cc
index e242b7f5..56dd83ca 100644
--- a/device/fido/fido_device.cc
+++ b/device/fido/fido_device.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "components/device_event_log/device_event_log.h"
#include "device/fido/device_response_converter.h"
#include "device/fido/fido_constants.h"
diff --git a/device/fido/fido_device.h b/device/fido/fido_device.h
index 7fa6221..cb691532b 100644
--- a/device/fido/fido_device.h
+++ b/device/fido/fido_device.h
@@ -10,8 +10,8 @@
#include <string>
#include <vector>
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "device/fido/authenticator_get_info_response.h"
#include "device/fido/fido_constants.h"
diff --git a/device/fido/fido_device_discovery.cc b/device/fido/fido_device_discovery.cc
index 1f476f4..e10a378 100644
--- a/device/fido/fido_device_discovery.cc
+++ b/device/fido/fido_device_discovery.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "device/fido/fido_authenticator.h"
#include "device/fido/fido_device.h"
diff --git a/device/fido/fido_device_discovery.h b/device/fido/fido_device_discovery.h
index bf7e86b..6437e11 100644
--- a/device/fido/fido_device_discovery.h
+++ b/device/fido/fido_device_discovery.h
@@ -12,8 +12,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/component_export.h"
+#include "base/functional/bind.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/string_piece.h"
#include "device/fido/fido_discovery_base.h"
diff --git a/device/fido/fido_request_handler_base.cc b/device/fido/fido_request_handler_base.cc
index 11d2ac1..a1083b5 100644
--- a/device/fido/fido_request_handler_base.cc
+++ b/device/fido/fido_request_handler_base.cc
@@ -6,10 +6,10 @@
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/containers/cxx20_erase.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/strings/string_piece.h"
diff --git a/device/fido/fido_request_handler_base.h b/device/fido/fido_request_handler_base.h
index b6f57a5..a549d4e5 100644
--- a/device/fido/fido_request_handler_base.h
+++ b/device/fido/fido_request_handler_base.h
@@ -13,10 +13,10 @@
#include <string>
#include <vector>
-#include "base/callback.h"
#include "base/check.h"
#include "base/component_export.h"
#include "base/containers/flat_set.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/string_piece_forward.h"
diff --git a/device/fido/fido_request_handler_unittest.cc b/device/fido/fido_request_handler_unittest.cc
index bb8aff5..5e3df02d 100644
--- a/device/fido/fido_request_handler_unittest.cc
+++ b/device/fido/fido_request_handler_unittest.cc
@@ -7,7 +7,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/device/fido/fido_task.cc b/device/fido/fido_task.cc
index e669bde..16f5566 100644
--- a/device/fido/fido_task.cc
+++ b/device/fido/fido_task.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "device/fido/fido_constants.h"
diff --git a/device/fido/fido_task.h b/device/fido/fido_task.h
index 2d3f835..49c827d 100644
--- a/device/fido/fido_task.h
+++ b/device/fido/fido_task.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/memory/weak_ptr.h"
#include "device/fido/fido_device.h"
diff --git a/device/fido/get_assertion_handler_unittest.cc b/device/fido/get_assertion_handler_unittest.cc
index 8a7f9a9..516820bd 100644
--- a/device/fido/get_assertion_handler_unittest.cc
+++ b/device/fido/get_assertion_handler_unittest.cc
@@ -5,9 +5,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/raw_ptr.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/task_environment.h"
diff --git a/device/fido/get_assertion_request_handler.cc b/device/fido/get_assertion_request_handler.cc
index b61d645..0ebf5610 100644
--- a/device/fido/get_assertion_request_handler.cc
+++ b/device/fido/get_assertion_request_handler.cc
@@ -9,9 +9,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/containers/cxx20_erase.h"
+#include "base/functional/bind.h"
#include "base/metrics/histogram_functions.h"
#include "base/ranges/algorithm.h"
#include "base/stl_util.h"
diff --git a/device/fido/get_assertion_request_handler.h b/device/fido/get_assertion_request_handler.h
index e8db9fd..cf302fa 100644
--- a/device/fido/get_assertion_request_handler.h
+++ b/device/fido/get_assertion_request_handler.h
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "device/fido/auth_token_requester.h"
diff --git a/device/fido/get_assertion_task.cc b/device/fido/get_assertion_task.cc
index 06c9684..8296a51 100644
--- a/device/fido/get_assertion_task.cc
+++ b/device/fido/get_assertion_task.cc
@@ -7,8 +7,8 @@
#include <algorithm>
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "device/base/features.h"
#include "device/fido/authenticator_get_assertion_response.h"
#include "device/fido/ctap2_device_operation.h"
diff --git a/device/fido/get_assertion_task.h b/device/fido/get_assertion_task.h
index 157131d..0d8be269f 100644
--- a/device/fido/get_assertion_task.h
+++ b/device/fido/get_assertion_task.h
@@ -10,8 +10,8 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "device/fido/ctap_get_assertion_request.h"
#include "device/fido/ctap_make_credential_request.h"
diff --git a/device/fido/get_assertion_task_unittest.cc b/device/fido/get_assertion_task_unittest.cc
index 0e6e42f2b..ed46d079 100644
--- a/device/fido/get_assertion_task_unittest.cc
+++ b/device/fido/get_assertion_task_unittest.cc
@@ -10,7 +10,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/test/task_environment.h"
#include "crypto/ec_private_key.h"
#include "device/base/features.h"
diff --git a/device/fido/hid/fake_hid_impl_for_testing.cc b/device/fido/hid/fake_hid_impl_for_testing.cc
index 9409b81..dd250cf 100644
--- a/device/fido/hid/fake_hid_impl_for_testing.cc
+++ b/device/fido/hid/fake_hid_impl_for_testing.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
+#include "base/functional/callback_helpers.h"
#include "device/fido/fido_parsing_utils.h"
#include "device/fido/hid/fido_hid_discovery.h"
#include "mojo/public/cpp/bindings/pending_associated_remote.h"
diff --git a/device/fido/hid/fake_hid_impl_for_testing.h b/device/fido/hid/fake_hid_impl_for_testing.h
index df828b4..4e4810b 100644
--- a/device/fido/hid/fake_hid_impl_for_testing.h
+++ b/device/fido/hid/fake_hid_impl_for_testing.h
@@ -9,8 +9,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
#include "base/containers/span.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "device/fido/fido_constants.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/device/fido/hid/fido_hid_device.cc b/device/fido/hid/fido_hid_device.cc
index dae1f19..8adf99f 100644
--- a/device/fido/hid/fido_hid_device.cc
+++ b/device/fido/hid/fido_hid_device.cc
@@ -7,11 +7,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_set.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
diff --git a/device/fido/hid/fido_hid_device.h b/device/fido/hid/fido_hid_device.h
index 4af5f51..07c79f4e 100644
--- a/device/fido/hid/fido_hid_device.h
+++ b/device/fido/hid/fido_hid_device.h
@@ -10,10 +10,10 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
#include "base/cancelable_callback.h"
#include "base/component_export.h"
#include "base/containers/queue.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
diff --git a/device/fido/hid/fido_hid_device_unittest.cc b/device/fido/hid/fido_hid_device_unittest.cc
index 8629b48..3dc7c9e 100644
--- a/device/fido/hid/fido_hid_device_unittest.cc
+++ b/device/fido/hid/fido_hid_device_unittest.cc
@@ -8,8 +8,8 @@
#include <memory>
#include <tuple>
-#include "base/bind.h"
#include "base/containers/span.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/device/fido/hid/fido_hid_discovery.cc b/device/fido/hid/fido_hid_discovery.cc
index 01aefa6..6e1954a 100644
--- a/device/fido/hid/fido_hid_discovery.cc
+++ b/device/fido/hid/fido_hid_discovery.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/no_destructor.h"
#include "components/device_event_log/device_event_log.h"
#include "device/fido/hid/fido_hid_device.h"
diff --git a/device/fido/hid/fido_hid_discovery.h b/device/fido/hid/fido_hid_discovery.h
index fe73131..18a70f1 100644
--- a/device/fido/hid/fido_hid_discovery.h
+++ b/device/fido/hid/fido_hid_discovery.h
@@ -8,9 +8,9 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
#include "base/component_export.h"
#include "base/containers/flat_set.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "device/fido/fido_device_discovery.h"
#include "mojo/public/cpp/bindings/associated_receiver.h"
diff --git a/device/fido/mac/authenticator.h b/device/fido/mac/authenticator.h
index 476111b..01e58dc 100644
--- a/device/fido/mac/authenticator.h
+++ b/device/fido/mac/authenticator.h
@@ -8,8 +8,8 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/string_piece_forward.h"
#include "device/fido/ctap_make_credential_request.h"
diff --git a/device/fido/mac/authenticator.mm b/device/fido/mac/authenticator.mm
index 2478d7d..03687db 100644
--- a/device/fido/mac/authenticator.mm
+++ b/device/fido/mac/authenticator.mm
@@ -6,8 +6,8 @@
#include <algorithm>
-#include "base/bind.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/strings/string_piece.h"
diff --git a/device/fido/mac/credential_store.h b/device/fido/mac/credential_store.h
index 1d6c1f9c8..6549844 100644
--- a/device/fido/mac/credential_store.h
+++ b/device/fido/mac/credential_store.h
@@ -11,8 +11,8 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/mac/foundation_util.h"
#include "base/memory/raw_ptr.h"
#include "device/fido/mac/authenticator_config.h"
diff --git a/device/fido/mac/discovery.cc b/device/fido/mac/discovery.cc
index 285a1bb..c8c8902 100644
--- a/device/fido/mac/discovery.cc
+++ b/device/fido/mac/discovery.cc
@@ -4,7 +4,7 @@
#include "device/fido/mac/discovery.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "device/fido/mac/authenticator.h"
namespace device {
diff --git a/device/fido/mac/fake_touch_id_context.mm b/device/fido/mac/fake_touch_id_context.mm
index ed43972a..f7fe16c 100644
--- a/device/fido/mac/fake_touch_id_context.mm
+++ b/device/fido/mac/fake_touch_id_context.mm
@@ -4,7 +4,7 @@
#include "device/fido/mac/fake_touch_id_context.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
namespace device {
diff --git a/device/fido/mac/get_assertion_operation.h b/device/fido/mac/get_assertion_operation.h
index b84819e..8da2593 100644
--- a/device/fido/mac/get_assertion_operation.h
+++ b/device/fido/mac/get_assertion_operation.h
@@ -7,8 +7,8 @@
#include <os/availability.h>
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "device/fido/authenticator_get_assertion_response.h"
#include "device/fido/ctap_get_assertion_request.h"
diff --git a/device/fido/mac/get_assertion_operation.mm b/device/fido/mac/get_assertion_operation.mm
index 15ef9c2..832988ff 100644
--- a/device/fido/mac/get_assertion_operation.mm
+++ b/device/fido/mac/get_assertion_operation.mm
@@ -10,7 +10,7 @@
#import <Foundation/Foundation.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/mac/foundation_util.h"
#include "base/mac/mac_logging.h"
#include "base/mac/scoped_cftyperef.h"
diff --git a/device/fido/mac/make_credential_operation.h b/device/fido/mac/make_credential_operation.h
index f928022..39dd5558 100644
--- a/device/fido/mac/make_credential_operation.h
+++ b/device/fido/mac/make_credential_operation.h
@@ -7,8 +7,8 @@
#include <os/availability.h>
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "device/fido/authenticator_make_credential_response.h"
#include "device/fido/ctap_make_credential_request.h"
diff --git a/device/fido/mac/make_credential_operation.mm b/device/fido/mac/make_credential_operation.mm
index d6ac86c..9e5af8d 100644
--- a/device/fido/mac/make_credential_operation.mm
+++ b/device/fido/mac/make_credential_operation.mm
@@ -8,9 +8,9 @@
#import <Foundation/Foundation.h>
-#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/mac/foundation_util.h"
#include "base/mac/mac_logging.h"
#include "base/mac/scoped_cftyperef.h"
diff --git a/device/fido/mac/touch_id_context.h b/device/fido/mac/touch_id_context.h
index 0fcb54b..cb961a8 100644
--- a/device/fido/mac/touch_id_context.h
+++ b/device/fido/mac/touch_id_context.h
@@ -10,8 +10,8 @@
#include <string>
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/mac/scoped_nsobject.h"
#include "base/memory/weak_ptr.h"
diff --git a/device/fido/mac/touch_id_context.mm b/device/fido/mac/touch_id_context.mm
index 1ddb317..adfc4bd 100644
--- a/device/fido/mac/touch_id_context.mm
+++ b/device/fido/mac/touch_id_context.mm
@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
#include <Security/Security.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/mac/foundation_util.h"
#include "base/mac/scoped_cftyperef.h"
diff --git a/device/fido/mac/util.h b/device/fido/mac/util.h
index 3ab85dd..fabdbf9 100644
--- a/device/fido/mac/util.h
+++ b/device/fido/mac/util.h
@@ -12,9 +12,9 @@
#include <string>
#include <vector>
-#include "base/callback.h"
#include "base/component_export.h"
#include "base/containers/span.h"
+#include "base/functional/callback.h"
#include "device/fido/attested_credential_data.h"
#include "device/fido/authenticator_data.h"
#include "device/fido/fido_constants.h"
diff --git a/device/fido/mac/util.mm b/device/fido/mac/util.mm
index 788b9e6..892fc26 100644
--- a/device/fido/mac/util.mm
+++ b/device/fido/mac/util.mm
@@ -10,7 +10,7 @@
#import <Foundation/Foundation.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/mac/foundation_util.h"
#include "base/mac/mac_logging.h"
#include "base/mac/scoped_cftyperef.h"
diff --git a/device/fido/make_credential_handler_unittest.cc b/device/fido/make_credential_handler_unittest.cc
index 045b6d5..fde9c45 100644
--- a/device/fido/make_credential_handler_unittest.cc
+++ b/device/fido/make_credential_handler_unittest.cc
@@ -5,9 +5,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/raw_ptr.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/task_environment.h"
diff --git a/device/fido/make_credential_request_handler.cc b/device/fido/make_credential_request_handler.cc
index 09e9490..bdd0be3 100644
--- a/device/fido/make_credential_request_handler.cc
+++ b/device/fido/make_credential_request_handler.cc
@@ -8,9 +8,9 @@
#include <utility>
#include "base/barrier_closure.h"
-#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/containers/cxx20_erase.h"
+#include "base/functional/bind.h"
#include "base/metrics/histogram_functions.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
diff --git a/device/fido/make_credential_request_handler.h b/device/fido/make_credential_request_handler.h
index fb263775..35da15c7 100644
--- a/device/fido/make_credential_request_handler.h
+++ b/device/fido/make_credential_request_handler.h
@@ -10,8 +10,8 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
#include "base/component_export.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/device/fido/make_credential_task.cc b/device/fido/make_credential_task.cc
index 5c9013b..31509f6 100644
--- a/device/fido/make_credential_task.cc
+++ b/device/fido/make_credential_task.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/ranges/algorithm.h"
#include "device/base/features.h"
#include "device/fido/ctap2_device_operation.h"
diff --git a/device/fido/make_credential_task.h b/device/fido/make_credential_task.h
index 7f12e933..1b42dfd 100644
--- a/device/fido/make_credential_task.h
+++ b/device/fido/make_credential_task.h
@@ -10,8 +10,8 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "device/fido/authenticator_get_assertion_response.h"
#include "device/fido/authenticator_make_credential_response.h"
diff --git a/device/fido/make_credential_task_unittest.cc b/device/fido/make_credential_task_unittest.cc
index b9126a5..18fc294 100644
--- a/device/fido/make_credential_task_unittest.cc
+++ b/device/fido/make_credential_task_unittest.cc
@@ -6,7 +6,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/numerics/safe_conversions.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
diff --git a/device/fido/mock_fido_device.cc b/device/fido/mock_fido_device.cc
index 1547ffc..6c5a070 100644
--- a/device/fido/mock_fido_device.cc
+++ b/device/fido/mock_fido_device.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/strings/strcat.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/device/fido/reset_request_handler.cc b/device/fido/reset_request_handler.cc
index 54551cb..c81bf77 100644
--- a/device/fido/reset_request_handler.cc
+++ b/device/fido/reset_request_handler.cc
@@ -4,8 +4,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "device/fido/fido_authenticator.h"
#include "device/fido/fido_constants.h"
#include "device/fido/pin.h"
diff --git a/device/fido/reset_request_handler.h b/device/fido/reset_request_handler.h
index 0b6eb48..2a76c89 100644
--- a/device/fido/reset_request_handler.h
+++ b/device/fido/reset_request_handler.h
@@ -7,9 +7,9 @@
#include <memory>
-#include "base/callback.h"
#include "base/component_export.h"
#include "base/containers/flat_set.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
#include "device/fido/fido_discovery_factory.h"
diff --git a/device/fido/set_pin_request_handler.cc b/device/fido/set_pin_request_handler.cc
index 6c98424..8db266ad 100644
--- a/device/fido/set_pin_request_handler.cc
+++ b/device/fido/set_pin_request_handler.cc
@@ -5,8 +5,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "device/fido/fido_authenticator.h"
#include "device/fido/fido_constants.h"
#include "device/fido/pin.h"
diff --git a/device/fido/set_pin_request_handler.h b/device/fido/set_pin_request_handler.h
index b1c0ddf..28495c3 100644
--- a/device/fido/set_pin_request_handler.h
+++ b/device/fido/set_pin_request_handler.h
@@ -8,9 +8,9 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/component_export.h"
#include "base/containers/flat_set.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/device/fido/test_callback_receiver.h b/device/fido/test_callback_receiver.h
index e986ca2..4c4c4ec 100644
--- a/device/fido/test_callback_receiver.h
+++ b/device/fido/test_callback_receiver.h
@@ -9,9 +9,9 @@
#include <type_traits>
#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/run_loop.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/device/fido/u2f_register_operation.cc b/device/fido/u2f_register_operation.cc
index 3cd02f96..3257c259 100644
--- a/device/fido/u2f_register_operation.cc
+++ b/device/fido/u2f_register_operation.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/strings/string_number_conversions.h"
#include "base/task/sequenced_task_runner.h"
#include "components/apdu/apdu_response.h"
diff --git a/device/fido/u2f_sign_operation.cc b/device/fido/u2f_sign_operation.cc
index 8576b68..da21751 100644
--- a/device/fido/u2f_sign_operation.cc
+++ b/device/fido/u2f_sign_operation.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/string_number_conversions.h"
#include "base/task/sequenced_task_runner.h"
#include "components/apdu/apdu_response.h"
diff --git a/device/fido/u2f_sign_operation.h b/device/fido/u2f_sign_operation.h
index cb2c1cc..f6ef2a9 100644
--- a/device/fido/u2f_sign_operation.h
+++ b/device/fido/u2f_sign_operation.h
@@ -10,8 +10,8 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "device/fido/ctap_get_assertion_request.h"
#include "device/fido/device_operation.h"
diff --git a/device/fido/virtual_fido_device_discovery.cc b/device/fido/virtual_fido_device_discovery.cc
index bf66d28..77819eaa 100644
--- a/device/fido/virtual_fido_device_discovery.cc
+++ b/device/fido/virtual_fido_device_discovery.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/task/sequenced_task_runner.h"
#include "device/fido/virtual_fido_device_authenticator.h"
diff --git a/device/fido/virtual_u2f_device_unittest.cc b/device/fido/virtual_u2f_device_unittest.cc
index 61fbdba..c4124a0 100644
--- a/device/fido/virtual_u2f_device_unittest.cc
+++ b/device/fido/virtual_u2f_device_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/scoped_refptr.h"
#include "base/test/bind.h"
#include "base/test/task_environment.h"
diff --git a/device/fido/win/authenticator.cc b/device/fido/win/authenticator.cc
index 847671fd..5689a70 100644
--- a/device/fido/win/authenticator.cc
+++ b/device/fido/win/authenticator.cc
@@ -9,9 +9,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/containers/flat_map.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/notreached.h"
diff --git a/device/fido/win/authenticator.h b/device/fido/win/authenticator.h
index 394ac9fb..79bf338 100644
--- a/device/fido/win/authenticator.h
+++ b/device/fido/win/authenticator.h
@@ -9,9 +9,9 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/component_export.h"
#include "base/containers/span.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/device/fido/win/discovery.cc b/device/fido/win/discovery.cc
index 0534d8e..88f66bcc 100644
--- a/device/fido/win/discovery.cc
+++ b/device/fido/win/discovery.cc
@@ -4,8 +4,8 @@
#include "device/fido/win/discovery.h"
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "device/fido/win/webauthn_api.h"
diff --git a/device/fido/win/webauthn_api.cc b/device/fido/win/webauthn_api.cc
index e914af7..72ebeb2b 100644
--- a/device/fido/win/webauthn_api.cc
+++ b/device/fido/win/webauthn_api.cc
@@ -7,8 +7,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/no_destructor.h"
#include "base/numerics/safe_conversions.h"
diff --git a/device/fido/win/webauthn_api.h b/device/fido/win/webauthn_api.h
index 51f959b..7a401cc 100644
--- a/device/fido/win/webauthn_api.h
+++ b/device/fido/win/webauthn_api.h
@@ -9,9 +9,9 @@
#include <functional>
#include <memory>
-#include "base/callback.h"
#include "base/component_export.h"
#include "base/containers/span.h"
+#include "base/functional/callback.h"
#include "device/fido/authenticator_get_assertion_response.h"
#include "device/fido/authenticator_make_credential_response.h"
#include "device/fido/ctap_get_assertion_request.h"
diff --git a/device/gamepad/abstract_haptic_gamepad.cc b/device/gamepad/abstract_haptic_gamepad.cc
index 0e7e593..99451ec 100644
--- a/device/gamepad/abstract_haptic_gamepad.cc
+++ b/device/gamepad/abstract_haptic_gamepad.cc
@@ -4,7 +4,7 @@
#include "device/gamepad/abstract_haptic_gamepad.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
#include "device/gamepad/gamepad_data_fetcher.h"
diff --git a/device/gamepad/abstract_haptic_gamepad_unittest.cc b/device/gamepad/abstract_haptic_gamepad_unittest.cc
index 89a67c6..494de997 100644
--- a/device/gamepad/abstract_haptic_gamepad_unittest.cc
+++ b/device/gamepad/abstract_haptic_gamepad_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/weak_ptr.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/device/gamepad/dualshock4_controller_unittest.cc b/device/gamepad/dualshock4_controller_unittest.cc
index d6dd359..d8972d5 100644
--- a/device/gamepad/dualshock4_controller_unittest.cc
+++ b/device/gamepad/dualshock4_controller_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/memory/weak_ptr.h"
#include "base/run_loop.h"
diff --git a/device/gamepad/gamepad_data_fetcher.cc b/device/gamepad/gamepad_data_fetcher.cc
index 0fc073cc..eab2faf 100644
--- a/device/gamepad/gamepad_data_fetcher.cc
+++ b/device/gamepad/gamepad_data_fetcher.cc
@@ -4,7 +4,7 @@
#include "device/gamepad/gamepad_data_fetcher.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/no_destructor.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/device/gamepad/gamepad_device_linux.cc b/device/gamepad/gamepad_device_linux.cc
index 3c7be5d7..639fe467 100644
--- a/device/gamepad/gamepad_device_linux.cc
+++ b/device/gamepad/gamepad_device_linux.cc
@@ -11,8 +11,8 @@
#include <linux/joystick.h>
#include <sys/ioctl.h>
-#include "base/callback_helpers.h"
#include "base/containers/fixed_flat_set.h"
+#include "base/functional/callback_helpers.h"
#include "base/posix/eintr_wrapper.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
diff --git a/device/gamepad/gamepad_platform_data_fetcher_linux.cc b/device/gamepad/gamepad_platform_data_fetcher_linux.cc
index 3d12c752..772e9b05 100644
--- a/device/gamepad/gamepad_platform_data_fetcher_linux.cc
+++ b/device/gamepad/gamepad_platform_data_fetcher_linux.cc
@@ -10,8 +10,8 @@
#include <sys/types.h>
#include <unistd.h>
-#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/strings/utf_string_conversions.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/device/gamepad/gamepad_provider.cc b/device/gamepad/gamepad_provider.cc
index c714566..7ccf74d9 100644
--- a/device/gamepad/gamepad_provider.cc
+++ b/device/gamepad/gamepad_provider.cc
@@ -11,8 +11,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/message_loop/message_pump_type.h"
#include "base/strings/string_number_conversions.h"
diff --git a/device/gamepad/gamepad_provider.h b/device/gamepad/gamepad_provider.h
index 363761b..4e75591 100644
--- a/device/gamepad/gamepad_provider.h
+++ b/device/gamepad/gamepad_provider.h
@@ -9,7 +9,7 @@
#include <utility>
#include <vector>
-#include "base/callback_forward.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/device/gamepad/gamepad_provider_unittest.cc b/device/gamepad/gamepad_provider_unittest.cc
index aef0f59..fe832c4a 100644
--- a/device/gamepad/gamepad_provider_unittest.cc
+++ b/device/gamepad/gamepad_provider_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/run_loop.h"
diff --git a/device/gamepad/gamepad_service.cc b/device/gamepad/gamepad_service.cc
index 5cbc1e2..50ac1e1 100644
--- a/device/gamepad/gamepad_service.cc
+++ b/device/gamepad/gamepad_service.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/singleton.h"
#include "base/threading/thread.h"
diff --git a/device/gamepad/gamepad_service.h b/device/gamepad/gamepad_service.h
index 71d390b..3e3dd8f6 100644
--- a/device/gamepad/gamepad_service.h
+++ b/device/gamepad/gamepad_service.h
@@ -11,8 +11,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_forward.h"
+#include "base/functional/bind.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/singleton.h"
diff --git a/device/gamepad/hid_haptic_gamepad_unittest.cc b/device/gamepad/hid_haptic_gamepad_unittest.cc
index b739d9c..6a1fa1e 100644
--- a/device/gamepad/hid_haptic_gamepad_unittest.cc
+++ b/device/gamepad/hid_haptic_gamepad_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/memory/weak_ptr.h"
#include "base/run_loop.h"
diff --git a/device/gamepad/nintendo_controller.cc b/device/gamepad/nintendo_controller.cc
index ee664a6..beb0e62c 100644
--- a/device/gamepad/nintendo_controller.cc
+++ b/device/gamepad/nintendo_controller.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/cxx17_backports.h"
+#include "base/functional/bind.h"
#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
#include "device/gamepad/gamepad_data_fetcher.h"
diff --git a/device/gamepad/nintendo_data_fetcher.cc b/device/gamepad/nintendo_data_fetcher.cc
index 43c49be9..cdf64a4 100644
--- a/device/gamepad/nintendo_data_fetcher.cc
+++ b/device/gamepad/nintendo_data_fetcher.cc
@@ -4,8 +4,8 @@
#include "device/gamepad/nintendo_data_fetcher.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 "device/gamepad/gamepad_service.h"
#include "device/gamepad/gamepad_uma.h"
diff --git a/device/gamepad/raw_input_data_fetcher_win.cc b/device/gamepad/raw_input_data_fetcher_win.cc
index 68410743..44a7089 100644
--- a/device/gamepad/raw_input_data_fetcher_win.cc
+++ b/device/gamepad/raw_input_data_fetcher_win.cc
@@ -8,7 +8,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/sys_string_conversions.h"
#include "base/task/sequenced_task_runner.h"
#include "base/trace_event/trace_event.h"
diff --git a/device/gamepad/test_support/fake_igamepad_statics.h b/device/gamepad/test_support/fake_igamepad_statics.h
index 8c0abdf..40197e3 100644
--- a/device/gamepad/test_support/fake_igamepad_statics.h
+++ b/device/gamepad/test_support/fake_igamepad_statics.h
@@ -12,8 +12,8 @@
#include <unordered_map>
-#include "base/callback_forward.h"
#include "base/containers/flat_map.h"
+#include "base/functional/callback_forward.h"
#include "base/strings/string_piece_forward.h"
#include "device/gamepad/test_support/fake_igamepad.h"
#include "device/gamepad/test_support/fake_iraw_game_controller.h"
diff --git a/device/gamepad/wgi_data_fetcher_win.h b/device/gamepad/wgi_data_fetcher_win.h
index 2965e757..450ad10 100644
--- a/device/gamepad/wgi_data_fetcher_win.h
+++ b/device/gamepad/wgi_data_fetcher_win.h
@@ -13,8 +13,8 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
#include "base/containers/flat_map.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/no_destructor.h"
#include "base/sequence_checker.h"
diff --git a/device/gamepad/wgi_data_fetcher_win_unittest.cc b/device/gamepad/wgi_data_fetcher_win_unittest.cc
index 7049f87..248306a 100644
--- a/device/gamepad/wgi_data_fetcher_win_unittest.cc
+++ b/device/gamepad/wgi_data_fetcher_win_unittest.cc
@@ -8,10 +8,10 @@
#include <XInput.h>
#include <winerror.h>
-#include "base/bind.h"
#include "base/containers/fixed_flat_map.h"
#include "base/containers/flat_map.h"
#include "base/containers/span.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/shared_memory_mapping.h"
#include "base/run_loop.h"
diff --git a/device/gamepad/xbox_controller_mac.mm b/device/gamepad/xbox_controller_mac.mm
index 48a5525..d2d9d840 100644
--- a/device/gamepad/xbox_controller_mac.mm
+++ b/device/gamepad/xbox_controller_mac.mm
@@ -15,11 +15,11 @@
#include <IOKit/usb/IOUSBLib.h>
#include <IOKit/usb/USB.h>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
#include "base/containers/fixed_flat_set.h"
#include "base/cxx17_backports.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/mac/foundation_util.h"
#include "base/mac/scoped_ioobject.h"
diff --git a/device/gamepad/xbox_hid_controller_unittest.cc b/device/gamepad/xbox_hid_controller_unittest.cc
index 6641e2a..7e9cf56 100644
--- a/device/gamepad/xbox_hid_controller_unittest.cc
+++ b/device/gamepad/xbox_hid_controller_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/memory/weak_ptr.h"
#include "base/run_loop.h"
diff --git a/device/gamepad/xinput_data_fetcher_win.cc b/device/gamepad/xinput_data_fetcher_win.cc
index eb8b8f8..1493dcc 100644
--- a/device/gamepad/xinput_data_fetcher_win.cc
+++ b/device/gamepad/xinput_data_fetcher_win.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/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/device/test/run_all_unittests.cc b/device/test/run_all_unittests.cc
index 2a92795..5c14a7a 100644
--- a/device/test/run_all_unittests.cc
+++ b/device/test/run_all_unittests.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/files/file.h"
+#include "base/functional/bind.h"
#include "base/path_service.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
diff --git a/device/udev_linux/udev_watcher.cc b/device/udev_linux/udev_watcher.cc
index 41a1ac9..7d98667 100644
--- a/device/udev_linux/udev_watcher.cc
+++ b/device/udev_linux/udev_watcher.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/strings/string_piece.h"
diff --git a/device/vr/android/arcore/ar_compositor_frame_sink.cc b/device/vr/android/arcore/ar_compositor_frame_sink.cc
index 900f8864..dfc7fdb 100644
--- a/device/vr/android/arcore/ar_compositor_frame_sink.cc
+++ b/device/vr/android/arcore/ar_compositor_frame_sink.cc
@@ -4,7 +4,7 @@
#include "device/vr/android/arcore/ar_compositor_frame_sink.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/task/bind_post_task.h"
diff --git a/device/vr/android/arcore/ar_compositor_frame_sink.h b/device/vr/android/arcore/ar_compositor_frame_sink.h
index 90b44d3..939d7d8 100644
--- a/device/vr/android/arcore/ar_compositor_frame_sink.h
+++ b/device/vr/android/arcore/ar_compositor_frame_sink.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/device/vr/android/arcore/arcore_device.cc b/device/vr/android/arcore/arcore_device.cc
index 3efe756..f2a1b6c 100644
--- a/device/vr/android/arcore/arcore_device.cc
+++ b/device/vr/android/arcore/arcore_device.cc
@@ -7,8 +7,8 @@
#include <algorithm>
#include "base/android/android_hardware_buffer_compat.h"
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/no_destructor.h"
#include "base/numerics/math_constants.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/device/vr/android/arcore/arcore_device.h b/device/vr/android/arcore/arcore_device.h
index 8a26880..3bc0d5e 100644
--- a/device/vr/android/arcore/arcore_device.h
+++ b/device/vr/android/arcore/arcore_device.h
@@ -11,8 +11,8 @@
#include <utility>
#include "base/android/jni_android.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"
#include "device/vr/android/arcore/arcore_gl.h"
#include "device/vr/public/cpp/xr_frame_sink_client.h"
diff --git a/device/vr/android/arcore/arcore_gl.cc b/device/vr/android/arcore/arcore_gl.cc
index bf6d15f..e739c90 100644
--- a/device/vr/android/arcore/arcore_gl.cc
+++ b/device/vr/android/arcore/arcore_gl.cc
@@ -10,11 +10,11 @@
#include <utility>
#include "base/android/android_hardware_buffer_compat.h"
#include "base/android/jni_android.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
#include "base/containers/queue.h"
#include "base/cxx17_backports.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/single_thread_task_runner.h"
diff --git a/device/vr/android/arcore/arcore_impl.cc b/device/vr/android/arcore/arcore_impl.cc
index 599eb56..1ec5f58 100644
--- a/device/vr/android/arcore/arcore_impl.cc
+++ b/device/vr/android/arcore/arcore_impl.cc
@@ -5,9 +5,9 @@
#include "device/vr/android/arcore/arcore_impl.h"
#include "base/android/jni_android.h"
-#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/containers/span.h"
+#include "base/functional/bind.h"
#include "base/metrics/histogram_macros.h"
#include "base/numerics/checked_math.h"
#include "base/numerics/math_constants.h"
diff --git a/device/vr/android/gvr/gvr_device.cc b/device/vr/android/gvr/gvr_device.cc
index 89cf767..4bcbfdb 100644
--- a/device/vr/android/gvr/gvr_device.cc
+++ b/device/vr/android/gvr/gvr_device.cc
@@ -10,7 +10,7 @@
#include <utility>
#include "base/android/android_hardware_buffer_compat.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/no_destructor.h"
#include "base/time/time.h"
diff --git a/device/vr/android/web_xr_presentation_state.h b/device/vr/android/web_xr_presentation_state.h
index bc29dcf..8bd8dd17 100644
--- a/device/vr/android/web_xr_presentation_state.h
+++ b/device/vr/android/web_xr_presentation_state.h
@@ -9,8 +9,8 @@
#include <string>
#include <utility>
-#include "base/callback.h"
#include "base/containers/queue.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/time/time.h"
#include "components/viz/common/resources/resource_id.h"
diff --git a/device/vr/openxr/openxr_anchor_request.h b/device/vr/openxr/openxr_anchor_request.h
index 3993f5fa..f0ee410 100644
--- a/device/vr/openxr/openxr_anchor_request.h
+++ b/device/vr/openxr/openxr_anchor_request.h
@@ -5,7 +5,7 @@
#ifndef DEVICE_VR_OPENXR_OPENXR_ANCHOR_REQUEST_H_
#define DEVICE_VR_OPENXR_OPENXR_ANCHOR_REQUEST_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "device/vr/public/mojom/vr_service.mojom.h"
#include "ui/gfx/geometry/transform.h"
diff --git a/device/vr/openxr/openxr_api_wrapper.cc b/device/vr/openxr/openxr_api_wrapper.cc
index 68394da..cbaf870 100644
--- a/device/vr/openxr/openxr_api_wrapper.cc
+++ b/device/vr/openxr/openxr_api_wrapper.cc
@@ -9,9 +9,9 @@
#include <algorithm>
#include <array>
-#include "base/callback_helpers.h"
#include "base/check.h"
#include "base/containers/contains.h"
+#include "base/functional/callback_helpers.h"
#include "base/notreached.h"
#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/device/vr/openxr/openxr_api_wrapper.h b/device/vr/openxr/openxr_api_wrapper.h
index 7853612..7377218 100644
--- a/device/vr/openxr/openxr_api_wrapper.h
+++ b/device/vr/openxr/openxr_api_wrapper.h
@@ -11,7 +11,7 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/device/vr/openxr/openxr_device.cc b/device/vr/openxr/openxr_device.cc
index 1324c35..7d80773 100644
--- a/device/vr/openxr/openxr_device.cc
+++ b/device/vr/openxr/openxr_device.cc
@@ -6,8 +6,8 @@
#include <string>
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
+#include "base/functional/callback_helpers.h"
#include "base/no_destructor.h"
#include "build/build_config.h"
#include "device/base/features.h"
diff --git a/device/vr/openxr/openxr_render_loop.cc b/device/vr/openxr/openxr_render_loop.cc
index 8341b361..8ebfbd72 100644
--- a/device/vr/openxr/openxr_render_loop.cc
+++ b/device/vr/openxr/openxr_render_loop.cc
@@ -6,8 +6,8 @@
#include <d3d11_4.h>
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
+#include "base/functional/callback_helpers.h"
#include "base/ranges/algorithm.h"
#include "components/viz/common/gpu/context_provider.h"
#include "device/vr/openxr/openxr_api_wrapper.h"
diff --git a/device/vr/openxr/openxr_render_loop.h b/device/vr/openxr/openxr_render_loop.h
index 6acb4ce..a63161b 100644
--- a/device/vr/openxr/openxr_render_loop.h
+++ b/device/vr/openxr/openxr_render_loop.h
@@ -8,7 +8,7 @@
#include <stdint.h>
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ref.h"
#include "components/viz/common/gpu/context_lost_observer.h"
#include "device/vr/openxr/context_provider_callbacks.h"
diff --git a/device/vr/orientation/orientation_device.cc b/device/vr/orientation/orientation_device.cc
index 41f7c15..4c39044 100644
--- a/device/vr/orientation/orientation_device.cc
+++ b/device/vr/orientation/orientation_device.cc
@@ -4,8 +4,8 @@
#include <math.h>
-#include "base/bind.h"
#include "base/containers/cxx20_erase.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/no_destructor.h"
#include "base/numerics/math_constants.h"
diff --git a/device/vr/orientation/orientation_device.h b/device/vr/orientation/orientation_device.h
index f864894..bc78450 100644
--- a/device/vr/orientation/orientation_device.h
+++ b/device/vr/orientation/orientation_device.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback_forward.h"
#include "base/component_export.h"
+#include "base/functional/callback_forward.h"
#include "base/threading/simple_thread.h"
#include "build/build_config.h"
#include "device/vr/public/mojom/vr_service.mojom.h"
diff --git a/device/vr/orientation/orientation_device_provider.cc b/device/vr/orientation/orientation_device_provider.cc
index 2e3782a..d24b32ae 100644
--- a/device/vr/orientation/orientation_device_provider.cc
+++ b/device/vr/orientation/orientation_device_provider.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 "device/vr/orientation/orientation_device.h"
#include "services/device/public/mojom/sensor_provider.mojom.h"
diff --git a/device/vr/orientation/orientation_device_provider.h b/device/vr/orientation/orientation_device_provider.h
index a779134..4076e97 100644
--- a/device/vr/orientation/orientation_device_provider.h
+++ b/device/vr/orientation/orientation_device_provider.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback_forward.h"
#include "base/component_export.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "device/vr/orientation/orientation_device.h"
#include "device/vr/public/cpp/vr_device_provider.h"
diff --git a/device/vr/orientation/orientation_device_provider_unittest.cc b/device/vr/orientation/orientation_device_provider_unittest.cc
index 92d1149..18800b89 100644
--- a/device/vr/orientation/orientation_device_provider_unittest.cc
+++ b/device/vr/orientation/orientation_device_provider_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/raw_ptr.h"
#include "base/memory/read_only_shared_memory_region.h"
#include "base/memory/shared_memory_mapping.h"
diff --git a/device/vr/orientation/orientation_device_unittest.cc b/device/vr/orientation/orientation_device_unittest.cc
index 8be524e..09fb399a 100644
--- a/device/vr/orientation/orientation_device_unittest.cc
+++ b/device/vr/orientation/orientation_device_unittest.cc
@@ -7,9 +7,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/read_only_shared_memory_region.h"
#include "base/memory/shared_memory_mapping.h"
#include "base/run_loop.h"
diff --git a/device/vr/orientation/orientation_session.cc b/device/vr/orientation/orientation_session.cc
index ac7e009..588c58c 100644
--- a/device/vr/orientation/orientation_session.cc
+++ b/device/vr/orientation/orientation_session.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "device/vr/orientation/orientation_device.h"
namespace device {
diff --git a/device/vr/public/cpp/vr_device_provider.h b/device/vr/public/cpp/vr_device_provider.h
index 1d3caf7..4c104ae6 100644
--- a/device/vr/public/cpp/vr_device_provider.h
+++ b/device/vr/public/cpp/vr_device_provider.h
@@ -5,8 +5,8 @@
#ifndef DEVICE_VR_PUBLIC_CPP_VR_DEVICE_PROVIDER_H_
#define DEVICE_VR_PUBLIC_CPP_VR_DEVICE_PROVIDER_H_
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "device/vr/public/cpp/xr_frame_sink_client.h"
#include "device/vr/public/mojom/isolated_xr_service.mojom.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/device/vr/public/cpp/xr_frame_sink_client.h b/device/vr/public/cpp/xr_frame_sink_client.h
index 5b2f5b9..5e70358 100644
--- a/device/vr/public/cpp/xr_frame_sink_client.h
+++ b/device/vr/public/cpp/xr_frame_sink_client.h
@@ -6,8 +6,8 @@
#define DEVICE_VR_PUBLIC_CPP_XR_FRAME_SINK_CLIENT_H_
#include <memory>
-#include "base/callback_forward.h"
#include "base/component_export.h"
+#include "base/functional/callback_forward.h"
#include "services/viz/privileged/mojom/compositing/frame_sink_manager.mojom-forward.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/device/vr/vr_device.h b/device/vr/vr_device.h
index e0cf057..c4a448c8 100644
--- a/device/vr/vr_device.h
+++ b/device/vr/vr_device.h
@@ -5,8 +5,8 @@
#ifndef DEVICE_VR_VR_DEVICE_H_
#define DEVICE_VR_VR_DEVICE_H_
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
namespace device {
diff --git a/device/vr/vr_device_base.h b/device/vr/vr_device_base.h
index cf94d49a..f53f214a 100644
--- a/device/vr/vr_device_base.h
+++ b/device/vr/vr_device_base.h
@@ -5,8 +5,8 @@
#ifndef DEVICE_VR_VR_DEVICE_BASE_H_
#define DEVICE_VR_VR_DEVICE_BASE_H_
-#include "base/callback.h"
#include "base/component_export.h"
+#include "base/functional/callback.h"
#include "build/build_config.h"
#include "device/vr/public/mojom/isolated_xr_service.mojom.h"
#include "device/vr/public/mojom/vr_service.mojom.h"
diff --git a/device/vr/vr_device_base_unittest.cc b/device/vr/vr_device_base_unittest.cc
index 8ae1a0b..9c652c7 100644
--- a/device/vr/vr_device_base_unittest.cc
+++ b/device/vr/vr_device_base_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/test/task_environment.h"
#include "device/vr/public/mojom/vr_service.mojom.h"
diff --git a/device/vr/windows/compositor_base.cc b/device/vr/windows/compositor_base.cc
index 9404107..21abce0 100644
--- a/device/vr/windows/compositor_base.cc
+++ b/device/vr/windows/compositor_base.cc
@@ -4,7 +4,7 @@
#include "device/vr/windows/compositor_base.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/single_thread_task_runner.h"
#include "base/trace_event/trace_event.h"
#include "base/types/cxx23_to_underlying.h"
diff --git a/docs/ui/create/examples/login_dialog.md b/docs/ui/create/examples/login_dialog.md
index 11e7370..6683597 100644
--- a/docs/ui/create/examples/login_dialog.md
+++ b/docs/ui/create/examples/login_dialog.md
@@ -264,7 +264,7 @@
``` cpp
-#include "base/bind.h"
+#include "base/functional/bind.h"
...
// static
void LoginBubbleDialogView::Show(View* anchor_view,
@@ -439,7 +439,7 @@
#include <memory>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/views/border.h"
#include "ui/views/controls/label.h"
diff --git a/extensions/browser/api/alarms/alarm_manager.cc b/extensions/browser/api/alarms/alarm_manager.cc
index 503a4ba2..89d3b66 100644
--- a/extensions/browser/api/alarms/alarm_manager.cc
+++ b/extensions/browser/api/alarms/alarm_manager.cc
@@ -11,7 +11,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/json/json_writer.h"
#include "base/json/values_util.h"
#include "base/lazy_instance.h"
diff --git a/extensions/browser/api/alarms/alarm_manager.h b/extensions/browser/api/alarms/alarm_manager.h
index e09e1cfc..79ff03c 100644
--- a/extensions/browser/api/alarms/alarm_manager.h
+++ b/extensions/browser/api/alarms/alarm_manager.h
@@ -9,8 +9,8 @@
#include <string>
#include <vector>
-#include "base/callback.h"
#include "base/containers/queue.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/extensions/browser/api/alarms/alarms_api.cc b/extensions/browser/api/alarms/alarms_api.cc
index cfc3048..870329f 100644
--- a/extensions/browser/api/alarms/alarms_api.cc
+++ b/extensions/browser/api/alarms/alarms_api.cc
@@ -8,7 +8,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/string_number_conversions.h"
#include "base/time/clock.h"
#include "base/time/default_clock.h"
diff --git a/extensions/browser/api/alarms/alarms_api_unittest.cc b/extensions/browser/api/alarms/alarms_api_unittest.cc
index 38a175a..3c0c73c 100644
--- a/extensions/browser/api/alarms/alarms_api_unittest.cc
+++ b/extensions/browser/api/alarms/alarms_api_unittest.cc
@@ -12,7 +12,7 @@
#include <string>
#include <utility>
-#include "base/bind.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/extensions/browser/api/api_resource_manager.h b/extensions/browser/api/api_resource_manager.h
index 137d747..8ceb2bd 100644
--- a/extensions/browser/api/api_resource_manager.h
+++ b/extensions/browser/api/api_resource_manager.h
@@ -11,7 +11,7 @@
#include <unordered_set>
#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/notreached.h"
diff --git a/extensions/browser/api/app_window/app_window_api.cc b/extensions/browser/api/app_window/app_window_api.cc
index 8fd5c01..f46a34f 100644
--- a/extensions/browser/api/app_window/app_window_api.cc
+++ b/extensions/browser/api/app_window/app_window_api.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/command_line.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/extensions/browser/api/async_api_function.cc b/extensions/browser/api/async_api_function.cc
index 85f2022..a92aff5 100644
--- a/extensions/browser/api/async_api_function.cc
+++ b/extensions/browser/api/async_api_function.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
#include "extensions/browser/extension_system.h"
diff --git a/extensions/browser/api/automation_internal/automation_internal_api.cc b/extensions/browser/api/automation_internal/automation_internal_api.cc
index f91e306af..5a9bfd5 100644
--- a/extensions/browser/api/automation_internal/automation_internal_api.cc
+++ b/extensions/browser/api/automation_internal/automation_internal_api.cc
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_macros.h"
#include "base/scoped_observation.h"
diff --git a/extensions/browser/api/bluetooth/bluetooth_api.cc b/extensions/browser/api/bluetooth/bluetooth_api.cc
index 6b73d1d..5f25ec9 100644
--- a/extensions/browser/api/bluetooth/bluetooth_api.cc
+++ b/extensions/browser/api/bluetooth/bluetooth_api.cc
@@ -8,8 +8,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/lazy_instance.h"
#include "base/memory/ref_counted.h"
#include "build/chromeos_buildflags.h"
diff --git a/extensions/browser/api/bluetooth/bluetooth_event_router.cc b/extensions/browser/api/bluetooth/bluetooth_event_router.cc
index 3fd27ac..5de45939 100644
--- a/extensions/browser/api/bluetooth/bluetooth_event_router.cc
+++ b/extensions/browser/api/bluetooth/bluetooth_event_router.cc
@@ -8,9 +8,9 @@
#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/lazy_instance.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
diff --git a/extensions/browser/api/bluetooth/bluetooth_event_router.h b/extensions/browser/api/bluetooth/bluetooth_event_router.h
index e61d97f..ce6599d 100644
--- a/extensions/browser/api/bluetooth/bluetooth_event_router.h
+++ b/extensions/browser/api/bluetooth/bluetooth_event_router.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/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/extensions/browser/api/bluetooth/bluetooth_event_router_unittest.cc b/extensions/browser/api/bluetooth/bluetooth_event_router_unittest.cc
index f8150f7..b5dd630 100644
--- a/extensions/browser/api/bluetooth/bluetooth_event_router_unittest.cc
+++ b/extensions/browser/api/bluetooth/bluetooth_event_router_unittest.cc
@@ -8,7 +8,7 @@
#include <string>
#include <utility>
-#include "base/callback_helpers.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/extensions/browser/api/bluetooth/bluetooth_extension_function.cc b/extensions/browser/api/bluetooth/bluetooth_extension_function.cc
index 8e3ce00..5467a75 100644
--- a/extensions/browser/api/bluetooth/bluetooth_extension_function.cc
+++ b/extensions/browser/api/bluetooth/bluetooth_extension_function.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/api/bluetooth/bluetooth_extension_function.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_frame_host.h"
diff --git a/extensions/browser/api/bluetooth/bluetooth_private_api.cc b/extensions/browser/api/bluetooth/bluetooth_private_api.cc
index 8f1720f..27b01cd 100644
--- a/extensions/browser/api/bluetooth/bluetooth_private_api.cc
+++ b/extensions/browser/api/bluetooth/bluetooth_private_api.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/lazy_instance.h"
#include "base/metrics/histogram_functions.h"
#include "base/strings/string_piece.h"
diff --git a/extensions/browser/api/bluetooth/bluetooth_private_api.h b/extensions/browser/api/bluetooth/bluetooth_private_api.h
index 1a02c16b..e873ee23 100644
--- a/extensions/browser/api/bluetooth/bluetooth_private_api.h
+++ b/extensions/browser/api/bluetooth/bluetooth_private_api.h
@@ -5,7 +5,7 @@
#ifndef EXTENSIONS_BROWSER_API_BLUETOOTH_BLUETOOTH_PRIVATE_API_H_
#define EXTENSIONS_BROWSER_API_BLUETOOTH_BLUETOOTH_PRIVATE_API_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "device/bluetooth/bluetooth_device.h"
#include "extensions/browser/api/bluetooth/bluetooth_extension_function.h"
diff --git a/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.cc b/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.cc
index 8e1c5ff..eff890d 100644
--- a/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.cc
+++ b/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.cc
@@ -11,9 +11,9 @@
#include <utility>
#include <vector>
-#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/lazy_instance.h"
#include "base/logging.h"
#include "base/memory/weak_ptr.h"
diff --git a/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.cc b/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.cc
index 445cd0ef..4ac4f4f 100644
--- a/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.cc
+++ b/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.cc
@@ -10,8 +10,8 @@
#include <unordered_set>
#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/strings/utf_string_conversions.h"
#include "base/values.h"
diff --git a/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h b/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h
index 627d8481..7cc72fe 100644
--- a/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h
+++ b/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h
@@ -12,7 +12,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/memory/weak_ptr.h"
diff --git a/extensions/browser/api/bluetooth_socket/bluetooth_api_socket.cc b/extensions/browser/api/bluetooth_socket/bluetooth_api_socket.cc
index 769185b..43a29c62 100644
--- a/extensions/browser/api/bluetooth_socket/bluetooth_api_socket.cc
+++ b/extensions/browser/api/bluetooth_socket/bluetooth_api_socket.cc
@@ -4,8 +4,8 @@
#include "extensions/browser/api/bluetooth_socket/bluetooth_api_socket.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/lazy_instance.h"
#include "device/bluetooth/bluetooth_socket.h"
#include "net/base/io_buffer.h"
diff --git a/extensions/browser/api/bluetooth_socket/bluetooth_socket_api.cc b/extensions/browser/api/bluetooth_socket/bluetooth_socket_api.cc
index 51d5360..e0ab89f 100644
--- a/extensions/browser/api/bluetooth_socket/bluetooth_socket_api.cc
+++ b/extensions/browser/api/bluetooth_socket/bluetooth_socket_api.cc
@@ -10,7 +10,7 @@
#include <unordered_set>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/hash/hash.h"
#include "base/metrics/histogram_functions.h"
#include "base/types/optional_util.h"
diff --git a/extensions/browser/api/bluetooth_socket/bluetooth_socket_event_dispatcher.cc b/extensions/browser/api/bluetooth_socket/bluetooth_socket_event_dispatcher.cc
index c342f68d..fdb6637b 100644
--- a/extensions/browser/api/bluetooth_socket/bluetooth_socket_event_dispatcher.cc
+++ b/extensions/browser/api/bluetooth_socket/bluetooth_socket_event_dispatcher.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "content/public/browser/browser_task_traits.h"
#include "device/bluetooth/bluetooth_device.h"
diff --git a/extensions/browser/api/cec_private/cec_private_api.cc b/extensions/browser/api/cec_private/cec_private_api.cc
index 25a8ea6..a90f2e7 100644
--- a/extensions/browser/api/cec_private/cec_private_api.cc
+++ b/extensions/browser/api/cec_private/cec_private_api.cc
@@ -6,7 +6,7 @@
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/notreached.h"
#include "chromeos/ash/components/dbus/cec_service/cec_service_client.h"
#include "extensions/common/api/cec_private.h"
diff --git a/extensions/browser/api/clipboard/clipboard_api.cc b/extensions/browser/api/clipboard/clipboard_api.cc
index 88ccccb8..ae867f55 100644
--- a/extensions/browser/api/clipboard/clipboard_api.cc
+++ b/extensions/browser/api/clipboard/clipboard_api.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/strings/string_util.h"
#include "base/values.h"
diff --git a/extensions/browser/api/declarative/declarative_api.cc b/extensions/browser/api/declarative/declarative_api.cc
index dc98ce4e..eb23498 100644
--- a/extensions/browser/api/declarative/declarative_api.cc
+++ b/extensions/browser/api/declarative/declarative_api.cc
@@ -11,9 +11,9 @@
#include <vector>
#include "base/base64.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/span.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/string_util.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/extensions/browser/api/declarative/declarative_rule.h b/extensions/browser/api/declarative/declarative_rule.h
index 4b11a933..e69a5d3 100644
--- a/extensions/browser/api/declarative/declarative_rule.h
+++ b/extensions/browser/api/declarative/declarative_rule.h
@@ -16,7 +16,7 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
#include "base/time/time.h"
#include "components/url_matcher/url_matcher.h"
diff --git a/extensions/browser/api/declarative/declarative_rule_unittest.cc b/extensions/browser/api/declarative/declarative_rule_unittest.cc
index 1c06992..3297f7d 100644
--- a/extensions/browser/api/declarative/declarative_rule_unittest.cc
+++ b/extensions/browser/api/declarative/declarative_rule_unittest.cc
@@ -4,8 +4,8 @@
#include "extensions/browser/api/declarative/declarative_rule.h"
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/raw_ref.h"
#include "base/test/values_test_util.h"
diff --git a/extensions/browser/api/declarative/rules_cache_delegate.cc b/extensions/browser/api/declarative/rules_cache_delegate.cc
index 2075c99c..0a73c45 100644
--- a/extensions/browser/api/declarative/rules_cache_delegate.cc
+++ b/extensions/browser/api/declarative/rules_cache_delegate.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/observer_list.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_task_traits.h"
diff --git a/extensions/browser/api/declarative/rules_registry.cc b/extensions/browser/api/declarative/rules_registry.cc
index 6075aa0d..f8c3339 100644
--- a/extensions/browser/api/declarative/rules_registry.cc
+++ b/extensions/browser/api/declarative/rules_registry.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/stringprintf.h"
diff --git a/extensions/browser/api/declarative/rules_registry_service.cc b/extensions/browser/api/declarative/rules_registry_service.cc
index 3b3fc5b..0903c73 100644
--- a/extensions/browser/api/declarative/rules_registry_service.cc
+++ b/extensions/browser/api/declarative/rules_registry_service.cc
@@ -7,9 +7,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/observer_list.h"
#include "base/ranges/algorithm.h"
diff --git a/extensions/browser/api/declarative_net_request/declarative_net_request_api.cc b/extensions/browser/api/declarative_net_request/declarative_net_request_api.cc
index 2ebc4fa..0de2e35 100644
--- a/extensions/browser/api/declarative_net_request/declarative_net_request_api.cc
+++ b/extensions/browser/api/declarative_net_request/declarative_net_request_api.cc
@@ -9,9 +9,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/containers/cxx20_erase.h"
+#include "base/functional/bind.h"
#include "base/time/time.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
diff --git a/extensions/browser/api/declarative_net_request/file_backed_ruleset_source.cc b/extensions/browser/api/declarative_net_request/file_backed_ruleset_source.cc
index 867d0e3..b7ac107 100644
--- a/extensions/browser/api/declarative_net_request/file_backed_ruleset_source.cc
+++ b/extensions/browser/api/declarative_net_request/file_backed_ruleset_source.cc
@@ -8,11 +8,11 @@
#include <set>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/json/json_reader.h"
#include "base/json/json_string_value_serializer.h"
#include "base/memory/ptr_util.h"
diff --git a/extensions/browser/api/declarative_net_request/file_backed_ruleset_source.h b/extensions/browser/api/declarative_net_request/file_backed_ruleset_source.h
index 5a2c6c7..6ab376a 100644
--- a/extensions/browser/api/declarative_net_request/file_backed_ruleset_source.h
+++ b/extensions/browser/api/declarative_net_request/file_backed_ruleset_source.h
@@ -10,8 +10,8 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
#include "base/files/file_path.h"
+#include "base/functional/callback_forward.h"
#include "base/time/time.h"
#include "extensions/browser/api/declarative_net_request/ruleset_source.h"
#include "extensions/common/api/declarative_net_request/dnr_manifest_data.h"
diff --git a/extensions/browser/api/declarative_net_request/file_sequence_helper.cc b/extensions/browser/api/declarative_net_request/file_sequence_helper.cc
index d732acb..ee748c0 100644
--- a/extensions/browser/api/declarative_net_request/file_sequence_helper.cc
+++ b/extensions/browser/api/declarative_net_request/file_sequence_helper.cc
@@ -9,12 +9,12 @@
#include <utility>
#include "base/barrier_closure.h"
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/containers/contains.h"
#include "base/containers/cxx20_erase.h"
#include "base/files/file_util.h"
#include "base/files/important_file_writer.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
diff --git a/extensions/browser/api/declarative_net_request/file_sequence_helper.h b/extensions/browser/api/declarative_net_request/file_sequence_helper.h
index 956c5950..a70d9a7e 100644
--- a/extensions/browser/api/declarative_net_request/file_sequence_helper.h
+++ b/extensions/browser/api/declarative_net_request/file_sequence_helper.h
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/weak_ptr.h"
#include "extensions/browser/api/declarative_net_request/constants.h"
#include "extensions/browser/api/declarative_net_request/file_backed_ruleset_source.h"
diff --git a/extensions/browser/api/declarative_net_request/file_sequence_helper_unittest.cc b/extensions/browser/api/declarative_net_request/file_sequence_helper_unittest.cc
index d3872f64..59a0b8e 100644
--- a/extensions/browser/api/declarative_net_request/file_sequence_helper_unittest.cc
+++ b/extensions/browser/api/declarative_net_request/file_sequence_helper_unittest.cc
@@ -8,9 +8,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/files/file_util.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "base/test/metrics/histogram_tester.h"
diff --git a/extensions/browser/api/declarative_net_request/install_index_helper.h b/extensions/browser/api/declarative_net_request/install_index_helper.h
index 9acfb6a9..78bf563e 100644
--- a/extensions/browser/api/declarative_net_request/install_index_helper.h
+++ b/extensions/browser/api/declarative_net_request/install_index_helper.h
@@ -10,7 +10,7 @@
#include <utility>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/ref_counted.h"
#include "extensions/browser/api/declarative_net_request/file_backed_ruleset_source.h"
#include "extensions/browser/api/declarative_net_request/ruleset_install_pref.h"
diff --git a/extensions/browser/api/declarative_net_request/request_params.cc b/extensions/browser/api/declarative_net_request/request_params.cc
index 8ade77b..d5e121bb 100644
--- a/extensions/browser/api/declarative_net_request/request_params.cc
+++ b/extensions/browser/api/declarative_net_request/request_params.cc
@@ -6,10 +6,10 @@
#include <algorithm>
-#include "base/bind.h"
#include "base/check.h"
#include "base/containers/flat_map.h"
#include "base/dcheck_is_on.h"
+#include "base/functional/bind.h"
#include "base/no_destructor.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h"
diff --git a/extensions/browser/api/declarative_net_request/request_params.h b/extensions/browser/api/declarative_net_request/request_params.h
index d6a5ee8..cd0a34da 100644
--- a/extensions/browser/api/declarative_net_request/request_params.h
+++ b/extensions/browser/api/declarative_net_request/request_params.h
@@ -5,8 +5,8 @@
#ifndef EXTENSIONS_BROWSER_API_DECLARATIVE_NET_REQUEST_REQUEST_PARAMS_H_
#define EXTENSIONS_BROWSER_API_DECLARATIVE_NET_REQUEST_REQUEST_PARAMS_H_
-#include "base/callback.h"
#include "base/containers/flat_map.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "components/url_pattern_index/url_pattern_index.h"
#include "content/public/browser/global_routing_id.h"
diff --git a/extensions/browser/api/declarative_net_request/rules_monitor_service.cc b/extensions/browser/api/declarative_net_request/rules_monitor_service.cc
index 9d03cce..75b1061 100644
--- a/extensions/browser/api/declarative_net_request/rules_monitor_service.cc
+++ b/extensions/browser/api/declarative_net_request/rules_monitor_service.cc
@@ -6,13 +6,13 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check_op.h"
#include "base/containers/contains.h"
#include "base/containers/cxx20_erase.h"
#include "base/containers/queue.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/lazy_instance.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
diff --git a/extensions/browser/api/declarative_net_request/ruleset_manager.cc b/extensions/browser/api/declarative_net_request/ruleset_manager.cc
index 7ba5f41..57c3941 100644
--- a/extensions/browser/api/declarative_net_request/ruleset_manager.cc
+++ b/extensions/browser/api/declarative_net_request/ruleset_manager.cc
@@ -7,10 +7,10 @@
#include <iterator>
#include <tuple>
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/containers/contains.h"
#include "base/containers/cxx20_erase.h"
+#include "base/functional/bind.h"
#include "base/metrics/histogram_macros.h"
#include "base/notreached.h"
#include "base/ranges/algorithm.h"
diff --git a/extensions/browser/api/declarative_webrequest/webrequest_condition.cc b/extensions/browser/api/declarative_webrequest/webrequest_condition.cc
index de85217..4023f675 100644
--- a/extensions/browser/api/declarative_webrequest/webrequest_condition.cc
+++ b/extensions/browser/api/declarative_webrequest/webrequest_condition.cc
@@ -4,8 +4,8 @@
#include "extensions/browser/api/declarative_webrequest/webrequest_condition.h"
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/strings/stringprintf.h"
#include "base/values.h"
#include "components/url_matcher/url_matcher_factory.h"
diff --git a/extensions/browser/api/declarative_webrequest/webrequest_rules_registry.cc b/extensions/browser/api/declarative_webrequest/webrequest_rules_registry.cc
index 40238f7f..b5d5258a 100644
--- a/extensions/browser/api/declarative_webrequest/webrequest_rules_registry.cc
+++ b/extensions/browser/api/declarative_webrequest/webrequest_rules_registry.cc
@@ -9,8 +9,8 @@
#include <limits>
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "content/public/browser/browser_thread.h"
#include "extensions/browser/api/declarative_webrequest/webrequest_condition.h"
#include "extensions/browser/api/declarative_webrequest/webrequest_constants.h"
diff --git a/extensions/browser/api/device_permissions_manager.cc b/extensions/browser/api/device_permissions_manager.cc
index 3fe13f41..8e118e7 100644
--- a/extensions/browser/api/device_permissions_manager.cc
+++ b/extensions/browser/api/device_permissions_manager.cc
@@ -8,8 +8,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/singleton.h"
#include "base/strings/string_number_conversions.h"
diff --git a/extensions/browser/api/device_permissions_prompt.cc b/extensions/browser/api/device_permissions_prompt.cc
index e99d843..b2d5be2 100644
--- a/extensions/browser/api/device_permissions_prompt.cc
+++ b/extensions/browser/api/device_permissions_prompt.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/i18n/message_formatter.h"
#include "base/memory/scoped_refptr.h"
#include "base/no_destructor.h"
diff --git a/extensions/browser/api/device_permissions_prompt.h b/extensions/browser/api/device_permissions_prompt.h
index 44ca8e53..5a42fe2 100644
--- a/extensions/browser/api/device_permissions_prompt.h
+++ b/extensions/browser/api/device_permissions_prompt.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/ref_counted.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/extensions/browser/api/diagnostics/diagnostics_api.cc b/extensions/browser/api/diagnostics/diagnostics_api.cc
index 8e11d9e..e4b200ce 100644
--- a/extensions/browser/api/diagnostics/diagnostics_api.cc
+++ b/extensions/browser/api/diagnostics/diagnostics_api.cc
@@ -4,8 +4,8 @@
#include "extensions/browser/api/diagnostics/diagnostics_api.h"
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/json/json_reader.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
diff --git a/extensions/browser/api/dns/dns_api.cc b/extensions/browser/api/dns/dns_api.cc
index 20bdf4d..8e23120e 100644
--- a/extensions/browser/api/dns/dns_api.cc
+++ b/extensions/browser/api/dns/dns_api.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/api/dns/dns_api.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/values.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
diff --git a/extensions/browser/api/execute_code_function.cc b/extensions/browser/api/execute_code_function.cc
index 30a4eb4..81bb3092 100644
--- a/extensions/browser/api/execute_code_function.cc
+++ b/extensions/browser/api/execute_code_function.cc
@@ -9,7 +9,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/ranges/algorithm.h"
#include "extensions/browser/extension_api_frame_id_map.h"
#include "extensions/browser/extensions_browser_client.h"
diff --git a/extensions/browser/api/feedback_private/feedback_private_api.cc b/extensions/browser/api/feedback_private/feedback_private_api.cc
index 3670353c..a055ab8 100644
--- a/extensions/browser/api/feedback_private/feedback_private_api.cc
+++ b/extensions/browser/api/feedback_private/feedback_private_api.cc
@@ -8,8 +8,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/memory/weak_ptr.h"
#include "base/metrics/histogram_base.h"
diff --git a/extensions/browser/api/feedback_private/feedback_private_api_unittest_base_chromeos.cc b/extensions/browser/api/feedback_private/feedback_private_api_unittest_base_chromeos.cc
index fa41979..afcb1c4a 100644
--- a/extensions/browser/api/feedback_private/feedback_private_api_unittest_base_chromeos.cc
+++ b/extensions/browser/api/feedback_private/feedback_private_api_unittest_base_chromeos.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/location.h"
#include "base/task/single_thread_task_runner.h"
#include "components/feedback/system_logs/system_logs_source.h"
diff --git a/extensions/browser/api/feedback_private/feedback_private_delegate.h b/extensions/browser/api/feedback_private/feedback_private_delegate.h
index 7fb309f..eb8d7c2 100644
--- a/extensions/browser/api/feedback_private/feedback_private_delegate.h
+++ b/extensions/browser/api/feedback_private/feedback_private_delegate.h
@@ -5,7 +5,7 @@
#ifndef EXTENSIONS_BROWSER_API_FEEDBACK_PRIVATE_FEEDBACK_PRIVATE_DELEGATE_H_
#define EXTENSIONS_BROWSER_API_FEEDBACK_PRIVATE_FEEDBACK_PRIVATE_DELEGATE_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/values.h"
#include "components/feedback/feedback_data.h"
#include "components/feedback/system_logs/system_logs_fetcher.h"
diff --git a/extensions/browser/api/feedback_private/feedback_service.cc b/extensions/browser/api/feedback_private/feedback_service.cc
index 6edc449..36330127 100644
--- a/extensions/browser/api/feedback_private/feedback_service.cc
+++ b/extensions/browser/api/feedback_private/feedback_service.cc
@@ -9,8 +9,8 @@
#include <utility>
#include "base/barrier_closure.h"
-#include "base/bind.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/metrics/histogram_functions.h"
diff --git a/extensions/browser/api/feedback_private/feedback_service.h b/extensions/browser/api/feedback_private/feedback_service.h
index 97eada3..1dbe165 100644
--- a/extensions/browser/api/feedback_private/feedback_service.h
+++ b/extensions/browser/api/feedback_private/feedback_service.h
@@ -5,7 +5,7 @@
#ifndef EXTENSIONS_BROWSER_API_FEEDBACK_PRIVATE_FEEDBACK_SERVICE_H_
#define EXTENSIONS_BROWSER_API_FEEDBACK_PRIVATE_FEEDBACK_SERVICE_H_
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/metrics/histogram_base.h"
diff --git a/extensions/browser/api/feedback_private/log_source_access_manager.cc b/extensions/browser/api/feedback_private/log_source_access_manager.cc
index 6db16b7..f57e92a 100644
--- a/extensions/browser/api/feedback_private/log_source_access_manager.cc
+++ b/extensions/browser/api/feedback_private/log_source_access_manager.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/string_split.h"
#include "base/task/thread_pool.h"
#include "base/time/default_tick_clock.h"
diff --git a/extensions/browser/api/feedback_private/log_source_access_manager.h b/extensions/browser/api/feedback_private/log_source_access_manager.h
index 5f6fc87..58db35f7 100644
--- a/extensions/browser/api/feedback_private/log_source_access_manager.h
+++ b/extensions/browser/api/feedback_private/log_source_access_manager.h
@@ -10,7 +10,7 @@
#include <string>
#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/task/sequenced_task_runner.h"
diff --git a/extensions/browser/api/feedback_private/log_source_access_manager_chromeos_unittest.cc b/extensions/browser/api/feedback_private/log_source_access_manager_chromeos_unittest.cc
index 25a7004..0ca89a3 100644
--- a/extensions/browser/api/feedback_private/log_source_access_manager_chromeos_unittest.cc
+++ b/extensions/browser/api/feedback_private/log_source_access_manager_chromeos_unittest.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/api/feedback_private/log_source_access_manager.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "extensions/browser/api/feedback_private/feedback_private_api_unittest_base_chromeos.h"
diff --git a/extensions/browser/api/feedback_private/log_source_resource.h b/extensions/browser/api/feedback_private/log_source_resource.h
index 53f591c..8630a5fd 100644
--- a/extensions/browser/api/feedback_private/log_source_resource.h
+++ b/extensions/browser/api/feedback_private/log_source_resource.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "components/feedback/system_logs/system_logs_fetcher.h"
#include "content/public/browser/browser_thread.h"
#include "extensions/browser/api/api_resource.h"
diff --git a/extensions/browser/api/file_handlers/app_file_handler_util.cc b/extensions/browser/api/file_handlers/app_file_handler_util.cc
index 50973a5..a8bc23b 100644
--- a/extensions/browser/api/file_handlers/app_file_handler_util.cc
+++ b/extensions/browser/api/file_handlers/app_file_handler_util.cc
@@ -7,7 +7,6 @@
#include <set>
#include <vector>
-#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/files/file.h"
#include "base/files/file_path.h"
diff --git a/extensions/browser/api/file_handlers/app_file_handler_util.h b/extensions/browser/api/file_handlers/app_file_handler_util.h
index a272ed3..8f101d349 100644
--- a/extensions/browser/api/file_handlers/app_file_handler_util.h
+++ b/extensions/browser/api/file_handlers/app_file_handler_util.h
@@ -10,7 +10,7 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "extensions/common/extension.h"
#include "extensions/common/manifest_handlers/file_handler_info.h"
diff --git a/extensions/browser/api/file_handlers/directory_util.cc b/extensions/browser/api/file_handlers/directory_util.cc
index b5db40e..0b9742b 100644
--- a/extensions/browser/api/file_handlers/directory_util.cc
+++ b/extensions/browser/api/file_handlers/directory_util.cc
@@ -6,9 +6,9 @@
#include <memory>
-#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/task/single_thread_task_runner.h"
#include "base/task/thread_pool.h"
#include "build/chromeos_buildflags.h"
diff --git a/extensions/browser/api/file_handlers/directory_util.h b/extensions/browser/api/file_handlers/directory_util.h
index 4b0e294c..58893f7 100644
--- a/extensions/browser/api/file_handlers/directory_util.h
+++ b/extensions/browser/api/file_handlers/directory_util.h
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/extensions/browser/api/file_handlers/directory_util_unittest.cc b/extensions/browser/api/file_handlers/directory_util_unittest.cc
index c20add0..38108fb 100644
--- a/extensions/browser/api/file_handlers/directory_util_unittest.cc
+++ b/extensions/browser/api/file_handlers/directory_util_unittest.cc
@@ -9,9 +9,9 @@
#include <string>
#include <vector>
-#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/test/browser_task_environment.h"
diff --git a/extensions/browser/api/file_handlers/mime_util.cc b/extensions/browser/api/file_handlers/mime_util.cc
index 327aa6b..e88bb5d02 100644
--- a/extensions/browser/api/file_handlers/mime_util.cc
+++ b/extensions/browser/api/file_handlers/mime_util.cc
@@ -6,9 +6,9 @@
#include <memory>
-#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/strings/string_piece.h"
#include "base/task/single_thread_task_runner.h"
#include "base/task/thread_pool.h"
diff --git a/extensions/browser/api/file_handlers/mime_util.h b/extensions/browser/api/file_handlers/mime_util.h
index 0dca78c..ba2e539 100644
--- a/extensions/browser/api/file_handlers/mime_util.h
+++ b/extensions/browser/api/file_handlers/mime_util.h
@@ -13,7 +13,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/extensions/browser/api/file_handlers/mime_util_unittest.cc b/extensions/browser/api/file_handlers/mime_util_unittest.cc
index 5a82ca4..882d044 100644
--- a/extensions/browser/api/file_handlers/mime_util_unittest.cc
+++ b/extensions/browser/api/file_handlers/mime_util_unittest.cc
@@ -8,9 +8,9 @@
#include <string>
#include <vector>
-#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/strings/string_util.h"
#include "content/public/browser/browser_context.h"
diff --git a/extensions/browser/api/file_handlers/non_native_file_system_delegate.h b/extensions/browser/api/file_handlers/non_native_file_system_delegate.h
index 4953fc2..ef46418 100644
--- a/extensions/browser/api/file_handlers/non_native_file_system_delegate.h
+++ b/extensions/browser/api/file_handlers/non_native_file_system_delegate.h
@@ -7,8 +7,8 @@
#include <string>
-#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/functional/callback.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
namespace content {
diff --git a/extensions/browser/api/file_system/consent_provider.h b/extensions/browser/api/file_system/consent_provider.h
index 1730a7a..e37e392 100644
--- a/extensions/browser/api/file_system/consent_provider.h
+++ b/extensions/browser/api/file_system/consent_provider.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
namespace content {
class RenderFrameHost;
diff --git a/extensions/browser/api/file_system/file_system_api.cc b/extensions/browser/api/file_system/file_system_api.cc
index d8ccf6a..21fe5a76 100644
--- a/extensions/browser/api/file_system/file_system_api.cc
+++ b/extensions/browser/api/file_system/file_system_api.cc
@@ -12,10 +12,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/json/values_util.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
diff --git a/extensions/browser/api/file_system/file_system_delegate.h b/extensions/browser/api/file_system/file_system_delegate.h
index 693568c..8c1cd92 100644
--- a/extensions/browser/api/file_system/file_system_delegate.h
+++ b/extensions/browser/api/file_system/file_system_delegate.h
@@ -9,8 +9,8 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
#include "base/files/file_path.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
diff --git a/extensions/browser/api/guest_view/guest_view_internal_api.cc b/extensions/browser/api/guest_view/guest_view_internal_api.cc
index f4582992..100017f 100644
--- a/extensions/browser/api/guest_view/guest_view_internal_api.cc
+++ b/extensions/browser/api/guest_view/guest_view_internal_api.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "components/guest_view/browser/guest_view_base.h"
#include "components/guest_view/browser/guest_view_manager.h"
#include "components/guest_view/browser/guest_view_manager_delegate.h"
diff --git a/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc b/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc
index 895d291e..9aed4b3 100644
--- a/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc
+++ b/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc
@@ -10,7 +10,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/guid.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
diff --git a/extensions/browser/api/hid/hid_api.cc b/extensions/browser/api/hid/hid_api.cc
index 5dd4350..969b2ad1 100644
--- a/extensions/browser/api/hid/hid_api.cc
+++ b/extensions/browser/api/hid/hid_api.cc
@@ -10,7 +10,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/values.h"
#include "extensions/browser/api/api_resource_manager.h"
#include "extensions/common/api/hid.h"
diff --git a/extensions/browser/api/hid/hid_apitest.cc b/extensions/browser/api/hid/hid_apitest.cc
index 7808e04..7de03e8 100644
--- a/extensions/browser/api/hid/hid_apitest.cc
+++ b/extensions/browser/api/hid/hid_apitest.cc
@@ -7,8 +7,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/strings/utf_string_conversions.h"
#include "build/chromeos_buildflags.h"
diff --git a/extensions/browser/api/hid/hid_device_manager.cc b/extensions/browser/api/hid/hid_device_manager.cc
index 2214bd2..7c18996 100644
--- a/extensions/browser/api/hid/hid_device_manager.cc
+++ b/extensions/browser/api/hid/hid_device_manager.cc
@@ -12,8 +12,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
diff --git a/extensions/browser/api/hid/hid_device_manager.h b/extensions/browser/api/hid/hid_device_manager.h
index 2f3502e..2864bf86 100644
--- a/extensions/browser/api/hid/hid_device_manager.h
+++ b/extensions/browser/api/hid/hid_device_manager.h
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/threading/thread_checker.h"
#include "base/values.h"
diff --git a/extensions/browser/api/idle/idle_api_unittest.cc b/extensions/browser/api/idle/idle_api_unittest.cc
index 0d8f60a..f5929ca2 100644
--- a/extensions/browser/api/idle/idle_api_unittest.cc
+++ b/extensions/browser/api/idle/idle_api_unittest.cc
@@ -9,7 +9,7 @@
#include <memory>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/strings/string_number_conversions.h"
#include "extensions/browser/api/idle/idle_api_constants.h"
diff --git a/extensions/browser/api/lock_screen_data/data_item.cc b/extensions/browser/api/lock_screen_data/data_item.cc
index 153ca743..12be07e7 100644
--- a/extensions/browser/api/lock_screen_data/data_item.cc
+++ b/extensions/browser/api/lock_screen_data/data_item.cc
@@ -7,10 +7,10 @@
#include <utility>
#include "base/base64.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/location.h"
#include "base/metrics/histogram_macros.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/extensions/browser/api/lock_screen_data/data_item.h b/extensions/browser/api/lock_screen_data/data_item.h
index eff82b1..0b80d60 100644
--- a/extensions/browser/api/lock_screen_data/data_item.h
+++ b/extensions/browser/api/lock_screen_data/data_item.h
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/values.h"
diff --git a/extensions/browser/api/lock_screen_data/data_item_unittest.cc b/extensions/browser/api/lock_screen_data/data_item_unittest.cc
index bd338abc..f96dbe26 100644
--- a/extensions/browser/api/lock_screen_data/data_item_unittest.cc
+++ b/extensions/browser/api/lock_screen_data/data_item_unittest.cc
@@ -8,10 +8,10 @@
#include <set>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/task/sequenced_task_runner.h"
#include "base/values.h"
diff --git a/extensions/browser/api/lock_screen_data/lock_screen_data_api.cc b/extensions/browser/api/lock_screen_data/lock_screen_data_api.cc
index 404bc63..6bb640b 100644
--- a/extensions/browser/api/lock_screen_data/lock_screen_data_api.cc
+++ b/extensions/browser/api/lock_screen_data/lock_screen_data_api.cc
@@ -8,7 +8,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/metrics/histogram_macros.h"
#include "extensions/browser/api/lock_screen_data/data_item.h"
#include "extensions/browser/api/lock_screen_data/lock_screen_item_storage.h"
diff --git a/extensions/browser/api/lock_screen_data/lock_screen_item_storage.cc b/extensions/browser/api/lock_screen_data/lock_screen_item_storage.cc
index 1f00863..3b97fbd 100644
--- a/extensions/browser/api/lock_screen_data/lock_screen_item_storage.cc
+++ b/extensions/browser/api/lock_screen_data/lock_screen_item_storage.cc
@@ -7,7 +7,7 @@
#include <set>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/guid.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/strcat.h"
diff --git a/extensions/browser/api/lock_screen_data/lock_screen_item_storage.h b/extensions/browser/api/lock_screen_data/lock_screen_item_storage.h
index b0967b7..ae52604c 100644
--- a/extensions/browser/api/lock_screen_data/lock_screen_item_storage.h
+++ b/extensions/browser/api/lock_screen_data/lock_screen_item_storage.h
@@ -11,8 +11,8 @@
#include <unordered_map>
#include <vector>
-#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/scoped_observation.h"
diff --git a/extensions/browser/api/lock_screen_data/lock_screen_item_storage_unittest.cc b/extensions/browser/api/lock_screen_data/lock_screen_item_storage_unittest.cc
index 21f3e9d4..9130bb0 100644
--- a/extensions/browser/api/lock_screen_data/lock_screen_item_storage_unittest.cc
+++ b/extensions/browser/api/lock_screen_data/lock_screen_item_storage_unittest.cc
@@ -10,13 +10,13 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/containers/contains.h"
#include "base/containers/queue.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/memory/ref_counted.h"
#include "base/run_loop.h"
#include "base/time/time.h"
diff --git a/extensions/browser/api/lock_screen_data/lock_screen_value_store_migrator.h b/extensions/browser/api/lock_screen_data/lock_screen_value_store_migrator.h
index e5a560a..b2169d6 100644
--- a/extensions/browser/api/lock_screen_data/lock_screen_value_store_migrator.h
+++ b/extensions/browser/api/lock_screen_data/lock_screen_value_store_migrator.h
@@ -8,7 +8,7 @@
#include <set>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "extensions/common/extension_id.h"
namespace extensions {
diff --git a/extensions/browser/api/lock_screen_data/lock_screen_value_store_migrator_impl.cc b/extensions/browser/api/lock_screen_data/lock_screen_value_store_migrator_impl.cc
index 5d65de6b..d022d96 100644
--- a/extensions/browser/api/lock_screen_data/lock_screen_value_store_migrator_impl.cc
+++ b/extensions/browser/api/lock_screen_data/lock_screen_value_store_migrator_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/location.h"
#include "base/task/sequenced_task_runner.h"
#include "base/values.h"
diff --git a/extensions/browser/api/lock_screen_data/lock_screen_value_store_migrator_impl.h b/extensions/browser/api/lock_screen_data/lock_screen_value_store_migrator_impl.h
index 7c39540..4d8351d 100644
--- a/extensions/browser/api/lock_screen_data/lock_screen_value_store_migrator_impl.h
+++ b/extensions/browser/api/lock_screen_data/lock_screen_value_store_migrator_impl.h
@@ -11,7 +11,7 @@
#include <unordered_map>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/values.h"
#include "extensions/browser/api/lock_screen_data/lock_screen_value_store_migrator.h"
diff --git a/extensions/browser/api/lock_screen_data/lock_screen_value_store_migrator_impl_unittest.cc b/extensions/browser/api/lock_screen_data/lock_screen_value_store_migrator_impl_unittest.cc
index e1170891..865dbb8c 100644
--- a/extensions/browser/api/lock_screen_data/lock_screen_value_store_migrator_impl_unittest.cc
+++ b/extensions/browser/api/lock_screen_data/lock_screen_value_store_migrator_impl_unittest.cc
@@ -10,9 +10,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/ref_counted.h"
#include "base/run_loop.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/extensions/browser/api/management/management_api.cc b/extensions/browser/api/management/management_api.cc
index 9a4ea8c..96de5ae 100644
--- a/extensions/browser/api/management/management_api.cc
+++ b/extensions/browser/api/management/management_api.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/json/json_writer.h"
#include "base/lazy_instance.h"
#include "base/location.h"
diff --git a/extensions/browser/api/management/management_api_delegate.h b/extensions/browser/api/management/management_api_delegate.h
index 3513672d..2038249e 100644
--- a/extensions/browser/api/management/management_api_delegate.h
+++ b/extensions/browser/api/management/management_api_delegate.h
@@ -5,7 +5,7 @@
#ifndef EXTENSIONS_BROWSER_API_MANAGEMENT_MANAGEMENT_API_DELEGATE_H_
#define EXTENSIONS_BROWSER_API_MANAGEMENT_MANAGEMENT_API_DELEGATE_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "extensions/browser/disable_reason.h"
#include "extensions/browser/uninstall_reason.h"
#include "extensions/common/api/management.h"
diff --git a/extensions/browser/api/media_perception_private/media_perception_api_delegate.h b/extensions/browser/api/media_perception_private/media_perception_api_delegate.h
index fc63c0e..b010c9a6 100644
--- a/extensions/browser/api/media_perception_private/media_perception_api_delegate.h
+++ b/extensions/browser/api/media_perception_private/media_perception_api_delegate.h
@@ -5,8 +5,8 @@
#ifndef EXTENSIONS_BROWSER_API_MEDIA_PERCEPTION_PRIVATE_MEDIA_PERCEPTION_API_DELEGATE_H_
#define EXTENSIONS_BROWSER_API_MEDIA_PERCEPTION_PRIVATE_MEDIA_PERCEPTION_API_DELEGATE_H_
-#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/functional/callback.h"
#include "chromeos/services/media_perception/public/mojom/media_perception_service.mojom.h"
#include "extensions/common/api/media_perception_private.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/extensions/browser/api/media_perception_private/media_perception_api_manager.cc b/extensions/browser/api/media_perception_private/media_perception_api_manager.cc
index 42f25a6b..9bad0a2 100644
--- a/extensions/browser/api/media_perception_private/media_perception_api_manager.cc
+++ b/extensions/browser/api/media_perception_private/media_perception_api_manager.cc
@@ -8,8 +8,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
diff --git a/extensions/browser/api/media_perception_private/media_perception_api_manager_unittest.cc b/extensions/browser/api/media_perception_private/media_perception_api_manager_unittest.cc
index 1050c7c0..bc9bce73 100644
--- a/extensions/browser/api/media_perception_private/media_perception_api_manager_unittest.cc
+++ b/extensions/browser/api/media_perception_private/media_perception_api_manager_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/containers/queue.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "chromeos/ash/components/dbus/media_analytics/fake_media_analytics_client.h"
#include "chromeos/ash/components/dbus/media_analytics/media_analytics_client.h"
diff --git a/extensions/browser/api/media_perception_private/media_perception_private_api.cc b/extensions/browser/api/media_perception_private/media_perception_private_api.cc
index 3083467..56a1fb5 100644
--- a/extensions/browser/api/media_perception_private/media_perception_private_api.cc
+++ b/extensions/browser/api/media_perception_private/media_perception_private_api.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "extensions/browser/api/media_perception_private/media_perception_private_api.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
namespace extensions {
diff --git a/extensions/browser/api/media_perception_private/media_perception_private_apitest.cc b/extensions/browser/api/media_perception_private/media_perception_private_apitest.cc
index 6b4b24b..141c997 100644
--- a/extensions/browser/api/media_perception_private/media_perception_private_apitest.cc
+++ b/extensions/browser/api/media_perception_private/media_perception_private_apitest.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "base/auto_reset.h"
-#include "base/bind.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
#include "base/task/single_thread_task_runner.h"
#include "chromeos/ash/components/dbus/media_analytics/fake_media_analytics_client.h"
#include "chromeos/ash/components/dbus/media_analytics/media_analytics_client.h"
diff --git a/extensions/browser/api/messaging/extension_message_port.cc b/extensions/browser/api/messaging/extension_message_port.cc
index 1a729cf..74ba126 100644
--- a/extensions/browser/api/messaging/extension_message_port.cc
+++ b/extensions/browser/api/messaging/extension_message_port.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/notreached.h"
#include "base/scoped_observation.h"
diff --git a/extensions/browser/api/messaging/extension_message_port.h b/extensions/browser/api/messaging/extension_message_port.h
index 034c14a..1e4c669 100644
--- a/extensions/browser/api/messaging/extension_message_port.h
+++ b/extensions/browser/api/messaging/extension_message_port.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/weak_ptr.h"
#include "base/types/pass_key.h"
diff --git a/extensions/browser/api/messaging/message_service.cc b/extensions/browser/api/messaging/message_service.cc
index 2c5458e..8813f00 100644
--- a/extensions/browser/api/messaging/message_service.cc
+++ b/extensions/browser/api/messaging/message_service.cc
@@ -10,9 +10,9 @@
#include <memory>
#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/json/json_writer.h"
#include "base/lazy_instance.h"
#include "base/metrics/field_trial_params.h"
diff --git a/extensions/browser/api/messaging/messaging_delegate.cc b/extensions/browser/api/messaging/messaging_delegate.cc
index 3108926..70f9347 100644
--- a/extensions/browser/api/messaging/messaging_delegate.cc
+++ b/extensions/browser/api/messaging/messaging_delegate.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/api/messaging/messaging_delegate.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/notreached.h"
namespace extensions {
diff --git a/extensions/browser/api/messaging/messaging_delegate.h b/extensions/browser/api/messaging/messaging_delegate.h
index 053e6d4..09123ab 100644
--- a/extensions/browser/api/messaging/messaging_delegate.h
+++ b/extensions/browser/api/messaging/messaging_delegate.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/weak_ptr.h"
#include "extensions/browser/api/messaging/message_port.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/extensions/browser/api/messaging/native_messaging_channel.h b/extensions/browser/api/messaging/native_messaging_channel.h
index 545da6d..6db46ca 100644
--- a/extensions/browser/api/messaging/native_messaging_channel.h
+++ b/extensions/browser/api/messaging/native_messaging_channel.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
namespace base {
class Value;
diff --git a/extensions/browser/api/mime_handler_private/mime_handler_private.cc b/extensions/browser/api/mime_handler_private/mime_handler_private.cc
index fac3800..d2db5d4 100644
--- a/extensions/browser/api/mime_handler_private/mime_handler_private.cc
+++ b/extensions/browser/api/mime_handler_private/mime_handler_private.cc
@@ -7,8 +7,8 @@
#include <cmath>
#include <utility>
-#include "base/bind.h"
#include "base/containers/flat_map.h"
+#include "base/functional/bind.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/string_util.h"
#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
diff --git a/extensions/browser/api/mime_handler_private/mime_handler_private.h b/extensions/browser/api/mime_handler_private/mime_handler_private.h
index 8927c5c..8b622a73 100644
--- a/extensions/browser/api/mime_handler_private/mime_handler_private.h
+++ b/extensions/browser/api/mime_handler_private/mime_handler_private.h
@@ -5,7 +5,7 @@
#ifndef EXTENSIONS_BROWSER_API_MIME_HANDLER_PRIVATE_MIME_HANDLER_PRIVATE_H_
#define EXTENSIONS_BROWSER_API_MIME_HANDLER_PRIVATE_MIME_HANDLER_PRIVATE_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "extensions/common/api/mime_handler.mojom.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/extensions/browser/api/networking_private/networking_private_api.cc b/extensions/browser/api/networking_private/networking_private_api.cc
index 1965595..cc3bd88 100644
--- a/extensions/browser/api/networking_private/networking_private_api.cc
+++ b/extensions/browser/api/networking_private/networking_private_api.cc
@@ -7,9 +7,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/strings/string_util.h"
#include "base/values.h"
#include "build/chromeos_buildflags.h"
diff --git a/extensions/browser/api/networking_private/networking_private_chromeos.cc b/extensions/browser/api/networking_private/networking_private_chromeos.cc
index 70276897..95fb27d 100644
--- a/extensions/browser/api/networking_private/networking_private_chromeos.cc
+++ b/extensions/browser/api/networking_private/networking_private_chromeos.cc
@@ -6,10 +6,10 @@
#include <memory>
-#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/values.h"
#include "chromeos/ash/components/login/login_state/login_state.h"
diff --git a/extensions/browser/api/networking_private/networking_private_chromeos_unittest.cc b/extensions/browser/api/networking_private/networking_private_chromeos_unittest.cc
index fd60b0e..63bba73 100644
--- a/extensions/browser/api/networking_private/networking_private_chromeos_unittest.cc
+++ b/extensions/browser/api/networking_private/networking_private_chromeos_unittest.cc
@@ -5,8 +5,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/json/json_string_value_serializer.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
diff --git a/extensions/browser/api/networking_private/networking_private_delegate.h b/extensions/browser/api/networking_private/networking_private_delegate.h
index 5a93469..8581b9502 100644
--- a/extensions/browser/api/networking_private/networking_private_delegate.h
+++ b/extensions/browser/api/networking_private/networking_private_delegate.h
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/values.h"
#include "components/keyed_service/core/keyed_service.h"
#include "extensions/common/api/networking_private.h"
diff --git a/extensions/browser/api/networking_private/networking_private_lacros.cc b/extensions/browser/api/networking_private/networking_private_lacros.cc
index edb1212..630df9c 100644
--- a/extensions/browser/api/networking_private/networking_private_lacros.cc
+++ b/extensions/browser/api/networking_private/networking_private_lacros.cc
@@ -6,10 +6,10 @@
#include <memory>
-#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/values.h"
#include "chrome/browser/ash/crosapi/crosapi_ash.h"
diff --git a/extensions/browser/api/networking_private/networking_private_linux.cc b/extensions/browser/api/networking_private/networking_private_linux.cc
index 63b610ce..558a71b 100644
--- a/extensions/browser/api/networking_private/networking_private_linux.cc
+++ b/extensions/browser/api/networking_private/networking_private_linux.cc
@@ -10,9 +10,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/scoped_refptr.h"
#include "base/observer_list.h"
#include "base/strings/string_split.h"
diff --git a/extensions/browser/api/networking_private/networking_private_service_client.cc b/extensions/browser/api/networking_private/networking_private_service_client.cc
index 28bf617e..523d52b 100644
--- a/extensions/browser/api/networking_private/networking_private_service_client.cc
+++ b/extensions/browser/api/networking_private/networking_private_service_client.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "base/base64.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/task/lazy_thread_pool_task_runner.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/extensions/browser/api/offscreen/lifetime_enforcer_factories.cc b/extensions/browser/api/offscreen/lifetime_enforcer_factories.cc
index 5146a9bc..c0ebf8e7 100644
--- a/extensions/browser/api/offscreen/lifetime_enforcer_factories.cc
+++ b/extensions/browser/api/offscreen/lifetime_enforcer_factories.cc
@@ -4,8 +4,8 @@
#include "extensions/browser/api/offscreen/lifetime_enforcer_factories.h"
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "extensions/browser/api/offscreen/audio_lifetime_enforcer.h"
#include "extensions/browser/api/offscreen/offscreen_document_lifetime_enforcer.h"
diff --git a/extensions/browser/api/offscreen/lifetime_enforcer_factories.h b/extensions/browser/api/offscreen/lifetime_enforcer_factories.h
index 1237303..a4383882 100644
--- a/extensions/browser/api/offscreen/lifetime_enforcer_factories.h
+++ b/extensions/browser/api/offscreen/lifetime_enforcer_factories.h
@@ -7,7 +7,7 @@
#include <map>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/no_destructor.h"
#include "extensions/browser/api/offscreen/offscreen_document_lifetime_enforcer.h"
#include "extensions/common/api/offscreen.h"
diff --git a/extensions/browser/api/offscreen/offscreen_document_lifetime_enforcer.h b/extensions/browser/api/offscreen/offscreen_document_lifetime_enforcer.h
index 2b0f3c2..a68424d 100644
--- a/extensions/browser/api/offscreen/offscreen_document_lifetime_enforcer.h
+++ b/extensions/browser/api/offscreen/offscreen_document_lifetime_enforcer.h
@@ -5,7 +5,7 @@
#ifndef EXTENSIONS_BROWSER_API_OFFSCREEN_OFFSCREEN_DOCUMENT_LIFETIME_ENFORCER_H_
#define EXTENSIONS_BROWSER_API_OFFSCREEN_OFFSCREEN_DOCUMENT_LIFETIME_ENFORCER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
namespace extensions {
diff --git a/extensions/browser/api/printer_provider/printer_provider_api.cc b/extensions/browser/api/printer_provider/printer_provider_api.cc
index 5c3d851..8ad5a1b6 100644
--- a/extensions/browser/api/printer_provider/printer_provider_api.cc
+++ b/extensions/browser/api/printer_provider/printer_provider_api.cc
@@ -13,7 +13,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/i18n/rtl.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
diff --git a/extensions/browser/api/printer_provider/printer_provider_api.h b/extensions/browser/api/printer_provider/printer_provider_api.h
index e167ef8..23543c5 100644
--- a/extensions/browser/api/printer_provider/printer_provider_api.h
+++ b/extensions/browser/api/printer_provider/printer_provider_api.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/values.h"
#include "components/keyed_service/core/keyed_service.h"
#include "services/device/public/mojom/usb_device.mojom.h"
diff --git a/extensions/browser/api/printer_provider/printer_provider_internal_api.cc b/extensions/browser/api/printer_provider/printer_provider_internal_api.cc
index ffb76c14..0769f1d 100644
--- a/extensions/browser/api/printer_provider/printer_provider_internal_api.cc
+++ b/extensions/browser/api/printer_provider/printer_provider_internal_api.cc
@@ -9,7 +9,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/guid.h"
#include "base/lazy_instance.h"
#include "base/location.h"
diff --git a/extensions/browser/api/runtime/restart_after_delay_api_unittest.cc b/extensions/browser/api/runtime/restart_after_delay_api_unittest.cc
index 1596c63..338e339 100644
--- a/extensions/browser/api/runtime/restart_after_delay_api_unittest.cc
+++ b/extensions/browser/api/runtime/restart_after_delay_api_unittest.cc
@@ -4,7 +4,7 @@
#include <utility>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
diff --git a/extensions/browser/api/runtime/runtime_api.cc b/extensions/browser/api/runtime/runtime_api.cc
index 27d34ab..a809d568 100644
--- a/extensions/browser/api/runtime/runtime_api.cc
+++ b/extensions/browser/api/runtime/runtime_api.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/location.h"
#include "base/metrics/histogram.h"
diff --git a/extensions/browser/api/runtime/runtime_api_delegate.h b/extensions/browser/api/runtime/runtime_api_delegate.h
index 44f771f..eea4b2d 100644
--- a/extensions/browser/api/runtime/runtime_api_delegate.h
+++ b/extensions/browser/api/runtime/runtime_api_delegate.h
@@ -5,7 +5,7 @@
#ifndef EXTENSIONS_BROWSER_API_RUNTIME_RUNTIME_API_DELEGATE_H_
#define EXTENSIONS_BROWSER_API_RUNTIME_RUNTIME_API_DELEGATE_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/version.h"
#include "extensions/common/api/runtime.h"
diff --git a/extensions/browser/api/serial/serial_api.cc b/extensions/browser/api/serial/serial_api.cc
index 9cb5a09..99a1ee0 100644
--- a/extensions/browser/api/serial/serial_api.cc
+++ b/extensions/browser/api/serial/serial_api.cc
@@ -9,7 +9,7 @@
#include <unordered_set>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/values.h"
#include "build/build_config.h"
#include "extensions/browser/api/api_resource_manager.h"
diff --git a/extensions/browser/api/serial/serial_apitest.cc b/extensions/browser/api/serial/serial_apitest.cc
index 2516a71..9292262a 100644
--- a/extensions/browser/api/serial/serial_apitest.cc
+++ b/extensions/browser/api/serial/serial_apitest.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/memory/ref_counted.h"
#include "base/unguessable_token.h"
#include "chrome/browser/extensions/extension_apitest.h"
diff --git a/extensions/browser/api/serial/serial_connection.cc b/extensions/browser/api/serial/serial_connection.cc
index 9d694f6..a59a64b3 100644
--- a/extensions/browser/api/serial/serial_connection.cc
+++ b/extensions/browser/api/serial/serial_connection.cc
@@ -11,8 +11,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/extensions/browser/api/serial/serial_connection.h b/extensions/browser/api/serial/serial_connection.h
index db6af20..ffa2655 100644
--- a/extensions/browser/api/serial/serial_connection.h
+++ b/extensions/browser/api/serial/serial_connection.h
@@ -9,9 +9,9 @@
#include <string>
#include <vector>
-#include "base/callback.h"
-#include "base/callback_forward.h"
#include "base/cancelable_callback.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/weak_ptr.h"
#include "content/public/browser/browser_thread.h"
#include "extensions/browser/api/api_resource.h"
diff --git a/extensions/browser/api/serial/serial_port_manager.cc b/extensions/browser/api/serial/serial_port_manager.cc
index fd09c8b..f8235efc 100644
--- a/extensions/browser/api/serial/serial_port_manager.cc
+++ b/extensions/browser/api/serial/serial_port_manager.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/no_destructor.h"
#include "build/build_config.h"
diff --git a/extensions/browser/api/serial/serial_port_manager.h b/extensions/browser/api/serial/serial_port_manager.h
index 6057fdd7..29b64ec 100644
--- a/extensions/browser/api/serial/serial_port_manager.h
+++ b/extensions/browser/api/serial/serial_port_manager.h
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/threading/thread_checker.h"
#include "content/public/browser/browser_thread.h"
diff --git a/extensions/browser/api/socket/app_firewall_hole_manager.cc b/extensions/browser/api/socket/app_firewall_hole_manager.cc
index fcfd0b3..fc1e93e 100644
--- a/extensions/browser/api/socket/app_firewall_hole_manager.cc
+++ b/extensions/browser/api/socket/app_firewall_hole_manager.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/firewall_hole_proxy.h"
diff --git a/extensions/browser/api/socket/mojo_data_pump.cc b/extensions/browser/api/socket/mojo_data_pump.cc
index 2abb7c3..46c6814 100644
--- a/extensions/browser/api/socket/mojo_data_pump.cc
+++ b/extensions/browser/api/socket/mojo_data_pump.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "net/base/completion_once_callback.h"
#include "net/base/io_buffer.h"
diff --git a/extensions/browser/api/socket/socket.cc b/extensions/browser/api/socket/socket.cc
index e429654d..4c0e578 100644
--- a/extensions/browser/api/socket/socket.cc
+++ b/extensions/browser/api/socket/socket.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/api/socket/socket.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "extensions/browser/api/api_resource_manager.h"
#include "net/base/address_list.h"
diff --git a/extensions/browser/api/socket/socket.h b/extensions/browser/api/socket/socket.h
index 7bb7381..c4e3db1 100644
--- a/extensions/browser/api/socket/socket.h
+++ b/extensions/browser/api/socket/socket.h
@@ -11,8 +11,8 @@
#include <string>
#include <utility>
-#include "base/callback.h"
#include "base/containers/queue.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
diff --git a/extensions/browser/api/socket/socket_api.cc b/extensions/browser/api/socket/socket_api.cc
index 27de8195..21433224 100644
--- a/extensions/browser/api/socket/socket_api.cc
+++ b/extensions/browser/api/socket/socket_api.cc
@@ -9,8 +9,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/containers/span.h"
+#include "base/functional/bind.h"
#include "base/types/optional_util.h"
#include "base/values.h"
#include "build/build_config.h"
diff --git a/extensions/browser/api/socket/tcp_socket.cc b/extensions/browser/api/socket/tcp_socket.cc
index b32697d..a3b57445 100644
--- a/extensions/browser/api/socket/tcp_socket.cc
+++ b/extensions/browser/api/socket/tcp_socket.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/lazy_instance.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/extensions/browser/api/socket/tls_socket.cc b/extensions/browser/api/socket/tls_socket.cc
index 6e7ce1de..92acfbd 100644
--- a/extensions/browser/api/socket/tls_socket.cc
+++ b/extensions/browser/api/socket/tls_socket.cc
@@ -6,9 +6,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 "content/public/browser/browser_thread.h"
#include "extensions/browser/api/api_resource.h"
#include "extensions/browser/api/socket/mojo_data_pump.h"
diff --git a/extensions/browser/api/socket/udp_socket.cc b/extensions/browser/api/socket/udp_socket.cc
index 68c1f6e..b2b410d 100644
--- a/extensions/browser/api/socket/udp_socket.cc
+++ b/extensions/browser/api/socket/udp_socket.cc
@@ -6,9 +6,9 @@
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/containers/cxx20_erase.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/ranges/algorithm.h"
#include "extensions/browser/api/api_resource.h"
diff --git a/extensions/browser/api/sockets_tcp/sockets_tcp_api.cc b/extensions/browser/api/sockets_tcp/sockets_tcp_api.cc
index 3f82c03..0b08f89 100644
--- a/extensions/browser/api/sockets_tcp/sockets_tcp_api.cc
+++ b/extensions/browser/api/sockets_tcp/sockets_tcp_api.cc
@@ -10,7 +10,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/types/optional_util.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
diff --git a/extensions/browser/api/sockets_tcp/sockets_tcp_api_unittest.cc b/extensions/browser/api/sockets_tcp/sockets_tcp_api_unittest.cc
index 1f57da1..868de4a2 100644
--- a/extensions/browser/api/sockets_tcp/sockets_tcp_api_unittest.cc
+++ b/extensions/browser/api/sockets_tcp/sockets_tcp_api_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/values.h"
#include "content/public/test/test_browser_context.h"
#include "extensions/browser/api/api_resource_manager.h"
diff --git a/extensions/browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc b/extensions/browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc
index e14134f..a52f136 100644
--- a/extensions/browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc
+++ b/extensions/browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "content/public/browser/browser_task_traits.h"
#include "extensions/browser/api/socket/tcp_socket.h"
diff --git a/extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.cc b/extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.cc
index 99821e2..48f5e99c 100644
--- a/extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.cc
+++ b/extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.cc
@@ -8,7 +8,7 @@
#include <unordered_set>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "content/public/common/socket_permission_request.h"
#include "extensions/browser/api/socket/tcp_socket.h"
#include "extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.h"
diff --git a/extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc b/extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc
index 0170852..6dabbc82 100644
--- a/extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc
+++ b/extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "content/public/browser/browser_task_traits.h"
#include "extensions/browser/api/socket/tcp_socket.h"
diff --git a/extensions/browser/api/sockets_udp/sockets_udp_api.cc b/extensions/browser/api/sockets_udp/sockets_udp_api.cc
index 3355873..45596fa 100644
--- a/extensions/browser/api/sockets_udp/sockets_udp_api.cc
+++ b/extensions/browser/api/sockets_udp/sockets_udp_api.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/types/optional_util.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/storage_partition.h"
diff --git a/extensions/browser/api/sockets_udp/sockets_udp_api_unittest.cc b/extensions/browser/api/sockets_udp/sockets_udp_api_unittest.cc
index b37832f8..c89611a 100644
--- a/extensions/browser/api/sockets_udp/sockets_udp_api_unittest.cc
+++ b/extensions/browser/api/sockets_udp/sockets_udp_api_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/values.h"
#include "extensions/browser/api/api_resource_manager.h"
#include "extensions/browser/api/socket/socket.h"
diff --git a/extensions/browser/api/sockets_udp/test_udp_echo_server.cc b/extensions/browser/api/sockets_udp/test_udp_echo_server.cc
index b43188d..a4d8063e 100644
--- a/extensions/browser/api/sockets_udp/test_udp_echo_server.cc
+++ b/extensions/browser/api/sockets_udp/test_udp_echo_server.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/api/sockets_udp/test_udp_echo_server.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
diff --git a/extensions/browser/api/sockets_udp/udp_socket_event_dispatcher.cc b/extensions/browser/api/sockets_udp/udp_socket_event_dispatcher.cc
index 05ef89c..396a3e26 100644
--- a/extensions/browser/api/sockets_udp/udp_socket_event_dispatcher.cc
+++ b/extensions/browser/api/sockets_udp/udp_socket_event_dispatcher.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/task/single_thread_task_runner.h"
#include "content/public/browser/browser_thread.h"
diff --git a/extensions/browser/api/storage/settings_observer.h b/extensions/browser/api/storage/settings_observer.h
index accdf62a..3255d504 100644
--- a/extensions/browser/api/storage/settings_observer.h
+++ b/extensions/browser/api/storage/settings_observer.h
@@ -5,7 +5,7 @@
#ifndef EXTENSIONS_BROWSER_API_STORAGE_SETTINGS_OBSERVER_H_
#define EXTENSIONS_BROWSER_API_STORAGE_SETTINGS_OBSERVER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/task/bind_post_task.h"
#include "base/task/sequenced_task_runner.h"
#include "base/types/strong_alias.h"
diff --git a/extensions/browser/api/storage/settings_storage_quota_enforcer.cc b/extensions/browser/api/storage/settings_storage_quota_enforcer.cc
index ec4bf38..98a4953 100644
--- a/extensions/browser/api/storage/settings_storage_quota_enforcer.cc
+++ b/extensions/browser/api/storage/settings_storage_quota_enforcer.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/json/json_writer.h"
#include "base/logging.h"
#include "base/strings/stringprintf.h"
diff --git a/extensions/browser/api/storage/settings_test_util.cc b/extensions/browser/api/storage/settings_test_util.cc
index 15a16b9..beb2f84 100644
--- a/extensions/browser/api/storage/settings_test_util.cc
+++ b/extensions/browser/api/storage/settings_test_util.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/values.h"
#include "content/public/test/test_utils.h"
#include "extensions/browser/api/storage/storage_frontend.h"
diff --git a/extensions/browser/api/storage/storage_api.cc b/extensions/browser/api/storage/storage_api.cc
index bf65d68..afe66b8 100644
--- a/extensions/browser/api/storage/storage_api.cc
+++ b/extensions/browser/api/storage/storage_api.cc
@@ -10,7 +10,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/stringprintf.h"
#include "base/task/sequenced_task_runner.h"
#include "base/trace_event/trace_event.h"
diff --git a/extensions/browser/api/storage/storage_api_unittest.cc b/extensions/browser/api/storage/storage_api_unittest.cc
index ca2ea33..a744cd6 100644
--- a/extensions/browser/api/storage/storage_api_unittest.cc
+++ b/extensions/browser/api/storage/storage_api_unittest.cc
@@ -7,10 +7,10 @@
#include <memory>
#include <set>
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/containers/contains.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/strings/stringprintf.h"
diff --git a/extensions/browser/api/storage/storage_frontend.cc b/extensions/browser/api/storage/storage_frontend.cc
index 33155e3..897b93a 100644
--- a/extensions/browser/api/storage/storage_frontend.cc
+++ b/extensions/browser/api/storage/storage_frontend.cc
@@ -8,9 +8,9 @@
#include <utility>
#include "base/barrier_closure.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/json/json_reader.h"
#include "base/lazy_instance.h"
#include "base/memory/ptr_util.h"
diff --git a/extensions/browser/api/storage/storage_frontend_unittest.cc b/extensions/browser/api/storage/storage_frontend_unittest.cc
index 5e4d6844..9086205 100644
--- a/extensions/browser/api/storage/storage_frontend_unittest.cc
+++ b/extensions/browser/api/storage/storage_frontend_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/strings/string_number_conversions.h"
#include "components/value_store/value_store.h"
diff --git a/extensions/browser/api/storage/value_store_cache.h b/extensions/browser/api/storage/value_store_cache.h
index 30193fb..3fff038 100644
--- a/extensions/browser/api/storage/value_store_cache.h
+++ b/extensions/browser/api/storage/value_store_cache.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
namespace value_store {
diff --git a/extensions/browser/api/system_cpu/system_cpu_api.cc b/extensions/browser/api/system_cpu/system_cpu_api.cc
index 7555c19..e47e2be 100644
--- a/extensions/browser/api/system_cpu/system_cpu_api.cc
+++ b/extensions/browser/api/system_cpu/system_cpu_api.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "extensions/browser/api/system_cpu/system_cpu_api.h"
-#include "base/bind.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
#include "extensions/browser/api/system_cpu/cpu_info_provider.h"
namespace extensions {
diff --git a/extensions/browser/api/system_info/system_info_api.cc b/extensions/browser/api/system_info/system_info_api.cc
index 0c37dbf6..03d1b70 100644
--- a/extensions/browser/api/system_info/system_info_api.cc
+++ b/extensions/browser/api/system_info/system_info_api.cc
@@ -9,8 +9,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/containers/flat_set.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/memory/singleton.h"
#include "base/values.h"
diff --git a/extensions/browser/api/system_info/system_info_provider.cc b/extensions/browser/api/system_info/system_info_provider.cc
index bf282fa..50a0a8b 100644
--- a/extensions/browser/api/system_info/system_info_provider.cc
+++ b/extensions/browser/api/system_info/system_info_provider.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/api/system_info/system_info_provider.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/task_traits.h"
#include "base/task/thread_pool.h"
diff --git a/extensions/browser/api/system_info/system_info_provider.h b/extensions/browser/api/system_info/system_info_provider.h
index 641ba7c..cda01c72 100644
--- a/extensions/browser/api/system_info/system_info_provider.h
+++ b/extensions/browser/api/system_info/system_info_provider.h
@@ -5,9 +5,9 @@
#ifndef EXTENSIONS_BROWSER_API_SYSTEM_INFO_SYSTEM_INFO_PROVIDER_H_
#define EXTENSIONS_BROWSER_API_SYSTEM_INFO_SYSTEM_INFO_PROVIDER_H_
-#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/memory/ref_counted.h"
namespace base {
diff --git a/extensions/browser/api/system_memory/system_memory_api.cc b/extensions/browser/api/system_memory/system_memory_api.cc
index bb35caa..6c037dc 100644
--- a/extensions/browser/api/system_memory/system_memory_api.cc
+++ b/extensions/browser/api/system_memory/system_memory_api.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/api/system_memory/system_memory_api.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "extensions/browser/api/system_memory/memory_info_provider.h"
namespace extensions {
diff --git a/extensions/browser/api/system_network/system_network_api.cc b/extensions/browser/api/system_network/system_network_api.cc
index ee0a7af..7cab7df 100644
--- a/extensions/browser/api/system_network/system_network_api.cc
+++ b/extensions/browser/api/system_network/system_network_api.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/api/system_network/system_network_api.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/network_service_instance.h"
#include "services/network/public/mojom/network_service.mojom.h"
diff --git a/extensions/browser/api/system_storage/system_storage_api.cc b/extensions/browser/api/system_storage/system_storage_api.cc
index 6e42a59..36138fe 100644
--- a/extensions/browser/api/system_storage/system_storage_api.cc
+++ b/extensions/browser/api/system_storage/system_storage_api.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/api/system_storage/system_storage_api.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/thread_pool.h"
#include "content/public/browser/browser_thread.h"
diff --git a/extensions/browser/api/system_storage/system_storage_eject_apitest.cc b/extensions/browser/api/system_storage/system_storage_eject_apitest.cc
index b68b20e..a6d94ccd5 100644
--- a/extensions/browser/api/system_storage/system_storage_eject_apitest.cc
+++ b/extensions/browser/api/system_storage/system_storage_eject_apitest.cc
@@ -4,8 +4,8 @@
//
// SystemStorage eject API browser tests.
-#include "base/callback_helpers.h"
#include "base/files/file_path.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/extensions/browser/api/usb/usb_api.cc b/extensions/browser/api/usb/usb_api.cc
index 0d58996..3437a71b 100644
--- a/extensions/browser/api/usb/usb_api.cc
+++ b/extensions/browser/api/usb/usb_api.cc
@@ -13,7 +13,7 @@
#include <vector>
#include "base/barrier_closure.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted_memory.h"
#include "base/values.h"
#include "extensions/browser/api/device_permissions_manager.h"
diff --git a/extensions/browser/api/usb/usb_device_resource.cc b/extensions/browser/api/usb/usb_device_resource.cc
index 0baf1481..78116ed 100644
--- a/extensions/browser/api/usb/usb_device_resource.cc
+++ b/extensions/browser/api/usb/usb_device_resource.cc
@@ -8,8 +8,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/lazy_instance.h"
#include "base/synchronization/lock.h"
#include "content/public/browser/browser_thread.h"
diff --git a/extensions/browser/api/virtual_keyboard/virtual_keyboard_api.cc b/extensions/browser/api/virtual_keyboard/virtual_keyboard_api.cc
index a4681b7..5ac00bd 100644
--- a/extensions/browser/api/virtual_keyboard/virtual_keyboard_api.cc
+++ b/extensions/browser/api/virtual_keyboard/virtual_keyboard_api.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "build/chromeos_buildflags.h"
#include "extensions/browser/api/virtual_keyboard_private/virtual_keyboard_delegate.h"
#include "extensions/browser/api/virtual_keyboard_private/virtual_keyboard_private_api.h"
diff --git a/extensions/browser/api/virtual_keyboard_private/virtual_keyboard_delegate.h b/extensions/browser/api/virtual_keyboard_private/virtual_keyboard_delegate.h
index a8a681b..f7519c46 100644
--- a/extensions/browser/api/virtual_keyboard_private/virtual_keyboard_delegate.h
+++ b/extensions/browser/api/virtual_keyboard_private/virtual_keyboard_delegate.h
@@ -8,7 +8,7 @@
#include <set>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/values.h"
#include "content/public/browser/browser_thread.h"
#include "extensions/common/api/virtual_keyboard.h"
diff --git a/extensions/browser/api/virtual_keyboard_private/virtual_keyboard_private_api.cc b/extensions/browser/api/virtual_keyboard_private/virtual_keyboard_private_api.cc
index 87da061f..4b6fe0b 100644
--- a/extensions/browser/api/virtual_keyboard_private/virtual_keyboard_private_api.cc
+++ b/extensions/browser/api/virtual_keyboard_private/virtual_keyboard_private_api.cc
@@ -8,7 +8,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/strings/utf_string_conversions.h"
#include "extensions/browser/api/extensions_api_client.h"
diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc
index 9c9971d..21ba17e 100644
--- a/extensions/browser/api/web_request/web_request_api.cc
+++ b/extensions/browser/api/web_request/web_request_api.cc
@@ -10,11 +10,11 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
#include "base/containers/cxx20_erase_vector.h"
#include "base/containers/flat_map.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/json/json_writer.h"
#include "base/lazy_instance.h"
#include "base/memory/raw_ptr.h"
diff --git a/extensions/browser/api/web_request/web_request_api_helpers.cc b/extensions/browser/api/web_request/web_request_api_helpers.cc
index ba32a3c..789f3a3a 100644
--- a/extensions/browser/api/web_request/web_request_api_helpers.cc
+++ b/extensions/browser/api/web_request/web_request_api_helpers.cc
@@ -11,11 +11,11 @@
#include <tuple>
#include <utility>
-#include "base/bind.h"
#include "base/containers/adapters.h"
#include "base/containers/contains.h"
#include "base/containers/fixed_flat_map.h"
#include "base/containers/fixed_flat_set.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/metrics/histogram_macros.h"
diff --git a/extensions/browser/api/web_request/web_request_event_details.cc b/extensions/browser/api/web_request/web_request_event_details.cc
index d3e1f7a..05422c4 100644
--- a/extensions/browser/api/web_request/web_request_event_details.cc
+++ b/extensions/browser/api/web_request/web_request_event_details.cc
@@ -7,8 +7,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/strings/string_number_conversions.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
diff --git a/extensions/browser/api/web_request/web_request_info.cc b/extensions/browser/api/web_request/web_request_info.cc
index 1d75ab9af..7863345b 100644
--- a/extensions/browser/api/web_request/web_request_info.cc
+++ b/extensions/browser/api/web_request/web_request_info.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <string>
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/values.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/websocket_handshake_request_info.h"
diff --git a/extensions/browser/api/web_request/web_request_info.h b/extensions/browser/api/web_request/web_request_info.h
index 5648447..cda4ce6f 100644
--- a/extensions/browser/api/web_request/web_request_info.h
+++ b/extensions/browser/api/web_request/web_request_info.h
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/values.h"
#include "content/public/browser/global_routing_id.h"
diff --git a/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc b/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc
index f20744f..09437c1 100644
--- a/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc
+++ b/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc
@@ -10,12 +10,12 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/check.h"
#include "base/check_op.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/scoped_refptr.h"
#include "base/metrics/histogram_macros.h"
#include "base/no_destructor.h"
diff --git a/extensions/browser/api/web_request/web_request_proxying_websocket.cc b/extensions/browser/api/web_request/web_request_proxying_websocket.cc
index 3372627f..38d05cb 100644
--- a/extensions/browser/api/web_request/web_request_proxying_websocket.cc
+++ b/extensions/browser/api/web_request/web_request_proxying_websocket.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/api/web_request/web_request_proxying_websocket.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/no_destructor.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
diff --git a/extensions/browser/api/web_request/web_request_proxying_websocket.h b/extensions/browser/api/web_request/web_request_proxying_websocket.h
index 6f218b2cf..31e9c669 100644
--- a/extensions/browser/api/web_request/web_request_proxying_websocket.h
+++ b/extensions/browser/api/web_request/web_request_proxying_websocket.h
@@ -8,7 +8,7 @@
#include <string>
#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/extensions/browser/api/webcam_private/visca_webcam.cc b/extensions/browser/api/webcam_private/visca_webcam.cc
index 14848a5..48ca71b 100644
--- a/extensions/browser/api/webcam_private/visca_webcam.cc
+++ b/extensions/browser/api/webcam_private/visca_webcam.cc
@@ -10,7 +10,7 @@
#include <algorithm>
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
using content::BrowserThread;
diff --git a/extensions/browser/api/webcam_private/visca_webcam.h b/extensions/browser/api/webcam_private/visca_webcam.h
index 0f097e1..01ff36af 100644
--- a/extensions/browser/api/webcam_private/visca_webcam.h
+++ b/extensions/browser/api/webcam_private/visca_webcam.h
@@ -10,8 +10,8 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "extensions/browser/api/serial/serial_connection.h"
#include "extensions/browser/api/webcam_private/webcam.h"
diff --git a/extensions/browser/api/webcam_private/visca_webcam_unittest.cc b/extensions/browser/api/webcam_private/visca_webcam_unittest.cc
index a6f764da..a6870d1 100644
--- a/extensions/browser/api/webcam_private/visca_webcam_unittest.cc
+++ b/extensions/browser/api/webcam_private/visca_webcam_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/bind.h"
#include "base/test/gmock_callback_support.h"
diff --git a/extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc b/extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc
index 36db659..0ef2966 100644
--- a/extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc
+++ b/extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/media_device_id.h"
diff --git a/extensions/browser/api_test_utils.cc b/extensions/browser/api_test_utils.cc
index 22c4b54..81e907a 100644
--- a/extensions/browser/api_test_utils.cc
+++ b/extensions/browser/api_test_utils.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/json/json_reader.h"
#include "base/values.h"
#include "components/crx_file/id_util.h"
diff --git a/extensions/browser/app_window/app_delegate.h b/extensions/browser/app_window/app_delegate.h
index 5b8570ec..aae858c 100644
--- a/extensions/browser/app_window/app_delegate.h
+++ b/extensions/browser/app_window/app_delegate.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "content/public/browser/media_stream_request.h"
#include "third_party/blink/public/common/mediastream/media_stream_request.h"
#include "third_party/skia/include/core/SkColor.h"
diff --git a/extensions/browser/app_window/app_window.cc b/extensions/browser/app_window/app_window.cc
index 0419d6b90a..7546c00 100644
--- a/extensions/browser/app_window/app_window.cc
+++ b/extensions/browser/app_window/app_window.cc
@@ -12,7 +12,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/extensions/browser/app_window/app_window_client.h b/extensions/browser/app_window/app_window_client.h
index 19ae2f383..4305f7d 100644
--- a/extensions/browser/app_window/app_window_client.h
+++ b/extensions/browser/app_window/app_window_client.h
@@ -5,7 +5,7 @@
#ifndef EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_CLIENT_H_
#define EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_CLIENT_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "extensions/browser/app_window/app_window.h"
#include "extensions/common/api/app_runtime.h"
diff --git a/extensions/browser/app_window/app_window_geometry_cache.cc b/extensions/browser/app_window/app_window_geometry_cache.cc
index 486d517..64d1cb24 100644
--- a/extensions/browser/app_window/app_window_geometry_cache.cc
+++ b/extensions/browser/app_window/app_window_geometry_cache.cc
@@ -8,8 +8,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/json/values_util.h"
#include "base/observer_list.h"
#include "base/strings/string_number_conversions.h"
diff --git a/extensions/browser/background_script_executor.cc b/extensions/browser/background_script_executor.cc
index 6f960e2..aa33e2c8 100644
--- a/extensions/browser/background_script_executor.cc
+++ b/extensions/browser/background_script_executor.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/background_script_executor.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/json/json_reader.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/service_worker_context.h"
diff --git a/extensions/browser/blob_reader.cc b/extensions/browser/blob_reader.cc
index 2ddbe34..ce57d92 100644
--- a/extensions/browser/blob_reader.cc
+++ b/extensions/browser/blob_reader.cc
@@ -7,7 +7,7 @@
#include <limits>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
diff --git a/extensions/browser/blob_reader.h b/extensions/browser/blob_reader.h
index a500507..dcba896 100644
--- a/extensions/browser/blob_reader.h
+++ b/extensions/browser/blob_reader.h
@@ -10,7 +10,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/receiver.h"
#include "mojo/public/cpp/bindings/remote.h"
diff --git a/extensions/browser/computed_hashes.h b/extensions/browser/computed_hashes.h
index 96e43d6..2a4237b 100644
--- a/extensions/browser/computed_hashes.h
+++ b/extensions/browser/computed_hashes.h
@@ -12,8 +12,8 @@
#include <string>
#include <vector>
-#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/functional/callback.h"
#include "extensions/browser/content_verifier/content_verifier_utils.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/extensions/browser/content_hash_fetcher.cc b/extensions/browser/content_hash_fetcher.cc
index 86bc0f6..ec80d69 100644
--- a/extensions/browser/content_hash_fetcher.cc
+++ b/extensions/browser/content_hash_fetcher.cc
@@ -10,8 +10,8 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/json/json_reader.h"
#include "base/task/sequenced_task_runner.h"
#include "content/public/browser/browser_thread.h"
diff --git a/extensions/browser/content_hash_fetcher.h b/extensions/browser/content_hash_fetcher.h
index 1338545..ebb87a6 100644
--- a/extensions/browser/content_hash_fetcher.h
+++ b/extensions/browser/content_hash_fetcher.h
@@ -10,7 +10,7 @@
#include <string>
#include <utility>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "extensions/browser/content_verifier/content_hash.h"
#include "extensions/common/extension_id.h"
diff --git a/extensions/browser/content_hash_fetcher_unittest.cc b/extensions/browser/content_hash_fetcher_unittest.cc
index 97c241a..95ea362 100644
--- a/extensions/browser/content_hash_fetcher_unittest.cc
+++ b/extensions/browser/content_hash_fetcher_unittest.cc
@@ -4,13 +4,13 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.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_helpers.h"
#include "base/memory/weak_ptr.h"
#include "base/path_service.h"
#include "base/version.h"
diff --git a/extensions/browser/content_verifier.cc b/extensions/browser/content_verifier.cc
index 7f4ae2b..2a872e9 100644
--- a/extensions/browser/content_verifier.cc
+++ b/extensions/browser/content_verifier.cc
@@ -8,10 +8,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.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/extensions/browser/content_verifier/content_hash.cc b/extensions/browser/content_verifier/content_hash.cc
index 3bb80f51..433d187 100644
--- a/extensions/browser/content_verifier/content_hash.cc
+++ b/extensions/browser/content_verifier/content_hash.cc
@@ -6,9 +6,9 @@
#include <set>
-#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/json/json_reader.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
diff --git a/extensions/browser/content_verifier/content_hash.h b/extensions/browser/content_verifier/content_hash.h
index d02207d..8da8637a 100644
--- a/extensions/browser/content_verifier/content_hash.h
+++ b/extensions/browser/content_verifier/content_hash.h
@@ -7,8 +7,8 @@
#include <set>
-#include "base/callback_helpers.h"
#include "base/files/file_path.h"
+#include "base/functional/callback_helpers.h"
#include "base/version.h"
#include "extensions/browser/computed_hashes.h"
#include "extensions/browser/content_verifier/content_verifier_key.h"
diff --git a/extensions/browser/content_verifier/test_utils.cc b/extensions/browser/content_verifier/test_utils.cc
index 5ec68db..cd3544f6 100644
--- a/extensions/browser/content_verifier/test_utils.cc
+++ b/extensions/browser/content_verifier/test_utils.cc
@@ -5,9 +5,9 @@
#include "extensions/browser/content_verifier/test_utils.h"
#include "base/base64url.h"
-#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/json/json_writer.h"
#include "base/strings/stringprintf.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/extensions/browser/content_verify_job.cc b/extensions/browser/content_verify_job.cc
index cab54b9..4df438f 100644
--- a/extensions/browser/content_verify_job.cc
+++ b/extensions/browser/content_verify_job.cc
@@ -6,7 +6,7 @@
#include <algorithm>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_macros.h"
diff --git a/extensions/browser/content_verify_job.h b/extensions/browser/content_verify_job.h
index be72235..329d3650 100644
--- a/extensions/browser/content_verify_job.h
+++ b/extensions/browser/content_verify_job.h
@@ -10,8 +10,8 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "base/synchronization/lock.h"
#include "base/time/time.h"
diff --git a/extensions/browser/content_verify_job_unittest.cc b/extensions/browser/content_verify_job_unittest.cc
index b6f5b80..e305244 100644
--- a/extensions/browser/content_verify_job_unittest.cc
+++ b/extensions/browser/content_verify_job_unittest.cc
@@ -2,11 +2,11 @@
// 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/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_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/path_service.h"
#include "base/test/bind.h"
diff --git a/extensions/browser/event_listener_map_unittest.cc b/extensions/browser/event_listener_map_unittest.cc
index acbefe2..2aec88f 100644
--- a/extensions/browser/event_listener_map_unittest.cc
+++ b/extensions/browser/event_listener_map_unittest.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/stringprintf.h"
#include "base/values.h"
#include "content/public/test/mock_render_process_host.h"
diff --git a/extensions/browser/event_page_tracker.h b/extensions/browser/event_page_tracker.h
index f6902d77..96359cc 100644
--- a/extensions/browser/event_page_tracker.h
+++ b/extensions/browser/event_page_tracker.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
namespace extensions {
diff --git a/extensions/browser/event_router.cc b/extensions/browser/event_router.cc
index 0dedc0c..a57d133 100644
--- a/extensions/browser/event_router.cc
+++ b/extensions/browser/event_router.cc
@@ -9,7 +9,7 @@
#include <utility>
#include "base/atomic_sequence_num.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/observer_list.h"
diff --git a/extensions/browser/event_router.h b/extensions/browser/event_router.h
index 3aac01c..0e127bd 100644
--- a/extensions/browser/event_router.h
+++ b/extensions/browser/event_router.h
@@ -10,8 +10,8 @@
#include <unordered_map>
#include <vector>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/extensions/browser/event_router_unittest.cc b/extensions/browser/event_router_unittest.cc
index 13eced7..018b28b 100644
--- a/extensions/browser/event_router_unittest.cc
+++ b/extensions/browser/event_router_unittest.cc
@@ -8,8 +8,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/test/bind.h"
#include "base/test/metrics/histogram_tester.h"
#include "base/values.h"
diff --git a/extensions/browser/events/event_ack_data.cc b/extensions/browser/events/event_ack_data.cc
index 3f67ef8..29a8932 100644
--- a/extensions/browser/events/event_ack_data.cc
+++ b/extensions/browser/events/event_ack_data.cc
@@ -7,8 +7,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/guid.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
diff --git a/extensions/browser/events/event_ack_data.h b/extensions/browser/events/event_ack_data.h
index 8c1c5095..9258e35 100644
--- a/extensions/browser/events/event_ack_data.h
+++ b/extensions/browser/events/event_ack_data.h
@@ -5,7 +5,7 @@
#ifndef EXTENSIONS_BROWSER_EVENTS_EVENT_ACK_DATA_H_
#define EXTENSIONS_BROWSER_EVENTS_EVENT_ACK_DATA_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/weak_ptr.h"
namespace content {
diff --git a/extensions/browser/events/lazy_event_dispatcher.cc b/extensions/browser/events/lazy_event_dispatcher.cc
index 329d022..e92b88f 100644
--- a/extensions/browser/events/lazy_event_dispatcher.cc
+++ b/extensions/browser/events/lazy_event_dispatcher.cc
@@ -4,8 +4,8 @@
#include "extensions/browser/events/lazy_event_dispatcher.h"
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "extensions/browser/event_router.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extensions_browser_client.h"
diff --git a/extensions/browser/events/lazy_event_dispatcher.h b/extensions/browser/events/lazy_event_dispatcher.h
index d0f8fa8..fd31b13 100644
--- a/extensions/browser/events/lazy_event_dispatcher.h
+++ b/extensions/browser/events/lazy_event_dispatcher.h
@@ -8,7 +8,7 @@
#include <set>
#include <utility>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/values.h"
#include "extensions/browser/lazy_context_id.h"
diff --git a/extensions/browser/extension_api_frame_id_map.cc b/extensions/browser/extension_api_frame_id_map.cc
index 14a30d0..bf3619c 100644
--- a/extensions/browser/extension_api_frame_id_map.cc
+++ b/extensions/browser/extension_api_frame_id_map.cc
@@ -7,8 +7,8 @@
#include <tuple>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/child_process_host.h"
diff --git a/extensions/browser/extension_creator.cc b/extensions/browser/extension_creator.cc
index 7cfe286..07b2aeb 100644
--- a/extensions/browser/extension_creator.cc
+++ b/extensions/browser/extension_creator.cc
@@ -9,11 +9,11 @@
#include <string>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.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/functional/callback.h"
#include "base/strings/string_util.h"
#include "components/crx_file/crx_creator.h"
#include "components/crx_file/id_util.h"
diff --git a/extensions/browser/extension_function.cc b/extensions/browser/extension_function.cc
index faadf4d..9531d60 100644
--- a/extensions/browser/extension_function.cc
+++ b/extensions/browser/extension_function.cc
@@ -9,8 +9,8 @@
#include <tuple>
#include <utility>
-#include "base/bind.h"
#include "base/dcheck_is_on.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/singleton.h"
diff --git a/extensions/browser/extension_function.h b/extensions/browser/extension_function.h
index e264d8b..e183f2c0 100644
--- a/extensions/browser/extension_function.h
+++ b/extensions/browser/extension_function.h
@@ -11,8 +11,8 @@
#include <string>
#include <vector>
-#include "base/callback.h"
#include "base/callback_list.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
diff --git a/extensions/browser/extension_function_dispatcher.cc b/extensions/browser/extension_function_dispatcher.cc
index 846f01d..57dab8a 100644
--- a/extensions/browser/extension_function_dispatcher.cc
+++ b/extensions/browser/extension_function_dispatcher.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/debug/crash_logging.h"
+#include "base/functional/bind.h"
#include "base/json/json_string_value_serializer.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
diff --git a/extensions/browser/extension_host.h b/extensions/browser/extension_host.h
index 07be432..9ba8504 100644
--- a/extensions/browser/extension_host.h
+++ b/extensions/browser/extension_host.h
@@ -11,7 +11,7 @@
#include <string>
#include <unordered_map>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
diff --git a/extensions/browser/extension_host_queue.cc b/extensions/browser/extension_host_queue.cc
index 73d4632..7679546 100644
--- a/extensions/browser/extension_host_queue.cc
+++ b/extensions/browser/extension_host_queue.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/extension_host_queue.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/no_destructor.h"
#include "base/ranges/algorithm.h"
diff --git a/extensions/browser/extension_host_test_helper.h b/extensions/browser/extension_host_test_helper.h
index 7ba0764..0f80780c 100644
--- a/extensions/browser/extension_host_test_helper.h
+++ b/extensions/browser/extension_host_test_helper.h
@@ -7,7 +7,7 @@
#include <map>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/scoped_observation.h"
#include "extensions/browser/extension_host_registry.h"
diff --git a/extensions/browser/extension_icon_image.cc b/extensions/browser/extension_icon_image.cc
index c4c65cc..5378538 100644
--- a/extensions/browser/extension_icon_image.cc
+++ b/extensions/browser/extension_icon_image.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/observer_list.h"
diff --git a/extensions/browser/extension_protocols.cc b/extensions/browser/extension_protocols.cc
index 5e880163..3128c43b 100644
--- a/extensions/browser/extension_protocols.cc
+++ b/extensions/browser/extension_protocols.cc
@@ -14,12 +14,12 @@
#include <vector>
#include "base/base64.h"
-#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/feature_list.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
#include "base/hash/sha1.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
diff --git a/extensions/browser/extension_protocols.h b/extensions/browser/extension_protocols.h
index 4c1108d..ca815c92 100644
--- a/extensions/browser/extension_protocols.h
+++ b/extensions/browser/extension_protocols.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "services/metrics/public/cpp/ukm_source_id.h"
#include "services/network/public/mojom/url_loader_factory.mojom.h"
diff --git a/extensions/browser/extension_registrar.cc b/extensions/browser/extension_registrar.cc
index e2942916..138c3e7d 100644
--- a/extensions/browser/extension_registrar.cc
+++ b/extensions/browser/extension_registrar.cc
@@ -4,10 +4,10 @@
#include "extensions/browser/extension_registrar.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/notreached.h"
#include "build/chromeos_buildflags.h"
#include "content/public/browser/browser_context.h"
diff --git a/extensions/browser/extension_service_worker_message_filter.cc b/extensions/browser/extension_service_worker_message_filter.cc
index d0eb8f82..5fca569 100644
--- a/extensions/browser/extension_service_worker_message_filter.cc
+++ b/extensions/browser/extension_service_worker_message_filter.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/extension_service_worker_message_filter.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/singleton.h"
#include "components/keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.h"
#include "components/keyed_service/core/keyed_service_shutdown_notifier.h"
diff --git a/extensions/browser/extension_system.h b/extensions/browser/extension_system.h
index 1f143bc0..b96a9a0 100644
--- a/extensions/browser/extension_system.h
+++ b/extensions/browser/extension_system.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "build/build_config.h"
#include "components/keyed_service/core/keyed_service.h"
diff --git a/extensions/browser/extension_user_script_loader.cc b/extensions/browser/extension_user_script_loader.cc
index e3ab1ca..d7096de 100644
--- a/extensions/browser/extension_user_script_loader.cc
+++ b/extensions/browser/extension_user_script_loader.cc
@@ -14,13 +14,13 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
#include "base/containers/cxx20_erase_set.h"
#include "base/containers/cxx20_erase_vector.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/read_only_shared_memory_region.h"
#include "base/metrics/histogram_macros.h"
#include "base/one_shot_event.h"
diff --git a/extensions/browser/extension_util.cc b/extensions/browser/extension_util.cc
index e56f6bc3..26c8c2f 100644
--- a/extensions/browser/extension_util.cc
+++ b/extensions/browser/extension_util.cc
@@ -5,7 +5,7 @@
#include "extensions/browser/extension_util.h"
#include "base/barrier_closure.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/no_destructor.h"
#include "build/chromeos_buildflags.h"
#include "components/crx_file/id_util.h"
diff --git a/extensions/browser/extension_util.h b/extensions/browser/extension_util.h
index 734df0f..4f1c10d 100644
--- a/extensions/browser/extension_util.h
+++ b/extensions/browser/extension_util.h
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "extensions/common/manifest.h"
#include "url/gurl.h"
diff --git a/extensions/browser/extensions_browser_client.h b/extensions/browser/extensions_browser_client.h
index 55d5420..bb7a1c1 100644
--- a/extensions/browser/extensions_browser_client.h
+++ b/extensions/browser/extensions_browser_client.h
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/ref_counted.h"
#include "base/memory/ref_counted_memory.h"
#include "base/values.h"
diff --git a/extensions/browser/extensions_browser_interface_binders.cc b/extensions/browser/extensions_browser_interface_binders.cc
index ebcaa70..8a6cfb7f 100644
--- a/extensions/browser/extensions_browser_interface_binders.cc
+++ b/extensions/browser/extensions_browser_interface_binders.cc
@@ -6,7 +6,7 @@
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h"
diff --git a/extensions/browser/file_reader.cc b/extensions/browser/file_reader.cc
index 50d5909..de8c309 100644
--- a/extensions/browser/file_reader.cc
+++ b/extensions/browser/file_reader.cc
@@ -4,9 +4,9 @@
#include "extensions/browser/file_reader.h"
-#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/strings/stringprintf.h"
#include "base/task/single_thread_task_runner.h"
#include "extensions/browser/extension_file_task_runner.h"
diff --git a/extensions/browser/file_reader.h b/extensions/browser/file_reader.h
index f1fadfdc..2da9a35 100644
--- a/extensions/browser/file_reader.h
+++ b/extensions/browser/file_reader.h
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "base/task/single_thread_task_runner.h"
#include "extensions/common/extension_resource.h"
diff --git a/extensions/browser/file_reader_unittest.cc b/extensions/browser/file_reader_unittest.cc
index 3db63c03..1815968 100644
--- a/extensions/browser/file_reader_unittest.cc
+++ b/extensions/browser/file_reader_unittest.cc
@@ -4,10 +4,10 @@
#include "extensions/browser/file_reader.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/path_service.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
diff --git a/extensions/browser/guest_view/app_view/app_view_guest.cc b/extensions/browser/guest_view/app_view/app_view_guest.cc
index f5b0c34d..d9550b3 100644
--- a/extensions/browser/guest_view/app_view/app_view_guest.cc
+++ b/extensions/browser/guest_view/app_view/app_view_guest.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "components/guest_view/browser/guest_view_manager.h"
#include "content/public/browser/render_process_host.h"
diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_attach_helper.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_attach_helper.cc
index 1c0e869..54cdb0a 100644
--- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_attach_helper.cc
+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_attach_helper.cc
@@ -4,9 +4,9 @@
#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_attach_helper.h"
-#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/containers/flat_map.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/no_destructor.h"
#include "base/strings/stringprintf.h"
diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_attach_helper.h b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_attach_helper.h
index 32de46e..052d15b8 100644
--- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_attach_helper.h
+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_attach_helper.h
@@ -10,8 +10,8 @@
#include <map>
#include <string>
-#include "base/callback_helpers.h"
#include "base/containers/flat_map.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "content/public/browser/render_process_host_observer.h"
diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
index 69b595a1..a6049ae 100644
--- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "components/guest_view/common/guest_view_constants.h"
#include "content/public/browser/child_process_host.h"
#include "content/public/browser/host_zoom_map.h"
diff --git a/extensions/browser/guest_view/mime_handler_view/test_mime_handler_view_guest.cc b/extensions/browser/guest_view/mime_handler_view/test_mime_handler_view_guest.cc
index 7b6a9a2a..64fc069 100644
--- a/extensions/browser/guest_view/mime_handler_view/test_mime_handler_view_guest.cc
+++ b/extensions/browser/guest_view/mime_handler_view/test_mime_handler_view_guest.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/guest_view/mime_handler_view/test_mime_handler_view_guest.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/test_timeouts.h"
#include "base/time/time.h"
diff --git a/extensions/browser/guest_view/web_view/javascript_dialog_helper.cc b/extensions/browser/guest_view/web_view/javascript_dialog_helper.cc
index ae21577..13c9e6e 100644
--- a/extensions/browser/guest_view/web_view/javascript_dialog_helper.cc
+++ b/extensions/browser/guest_view/web_view/javascript_dialog_helper.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "components/guest_view/common/guest_view_constants.h"
diff --git a/extensions/browser/guest_view/web_view/web_ui/web_ui_url_fetcher.cc b/extensions/browser/guest_view/web_view/web_ui/web_ui_url_fetcher.cc
index 147f718..93f09f134 100644
--- a/extensions/browser/guest_view/web_view/web_ui/web_ui_url_fetcher.cc
+++ b/extensions/browser/guest_view/web_view/web_ui/web_ui_url_fetcher.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/guest_view/web_view/web_ui/web_ui_url_fetcher.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_ui_url_loader_factory.h"
#include "net/base/load_flags.h"
diff --git a/extensions/browser/guest_view/web_view/web_ui/web_ui_url_fetcher.h b/extensions/browser/guest_view/web_view/web_ui/web_ui_url_fetcher.h
index 31702dbf..07f1bf032 100644
--- a/extensions/browser/guest_view/web_view/web_ui/web_ui_url_fetcher.h
+++ b/extensions/browser/guest_view/web_view/web_ui/web_ui_url_fetcher.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "url/gurl.h"
namespace network {
diff --git a/extensions/browser/guest_view/web_view/web_view_apitest.cc b/extensions/browser/guest_view/web_view/web_view_apitest.cc
index 6e64207..bc8a5ab 100644
--- a/extensions/browser/guest_view/web_view/web_view_apitest.cc
+++ b/extensions/browser/guest_view/web_view/web_view_apitest.cc
@@ -8,8 +8,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
#include "base/memory/scoped_refptr.h"
#include "base/path_service.h"
#include "base/strings/string_util.h"
diff --git a/extensions/browser/guest_view/web_view/web_view_content_script_manager.cc b/extensions/browser/guest_view/web_view/web_view_content_script_manager.cc
index 8ff7243..584560a 100644
--- a/extensions/browser/guest_view/web_view/web_view_content_script_manager.cc
+++ b/extensions/browser/guest_view/web_view/web_view_content_script_manager.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/guest_view/web_view/web_view_content_script_manager.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_task_traits.h"
diff --git a/extensions/browser/guest_view/web_view/web_view_content_script_manager.h b/extensions/browser/guest_view/web_view/web_view_content_script_manager.h
index 169a739..c0eca2e5 100644
--- a/extensions/browser/guest_view/web_view/web_view_content_script_manager.h
+++ b/extensions/browser/guest_view/web_view/web_view_content_script_manager.h
@@ -10,7 +10,7 @@
#include <string>
#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/supports_user_data.h"
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc
index 91d5e3cb..07ce0df 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest.cc
+++ b/extensions/browser/guest_view/web_view/web_view_guest.cc
@@ -11,8 +11,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/metrics/user_metrics.h"
#include "base/strings/stringprintf.h"
diff --git a/extensions/browser/guest_view/web_view/web_view_guest_delegate.h b/extensions/browser/guest_view/web_view/web_view_guest_delegate.h
index 20740ad8..50ad3f2 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest_delegate.h
+++ b/extensions/browser/guest_view/web_view/web_view_guest_delegate.h
@@ -5,7 +5,7 @@
#ifndef EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_DELEGATE_H_
#define EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_DELEGATE_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "components/guest_view/browser/guest_view_base.h"
namespace content {
diff --git a/extensions/browser/guest_view/web_view/web_view_permission_helper.cc b/extensions/browser/guest_view/web_view/web_view_permission_helper.cc
index 55b5d03..19bde8bd 100644
--- a/extensions/browser/guest_view/web_view/web_view_permission_helper.cc
+++ b/extensions/browser/guest_view/web_view/web_view_permission_helper.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/metrics/user_metrics.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/extensions/browser/image_loader.cc b/extensions/browser/image_loader.cc
index fe3bf497..bb37de67 100644
--- a/extensions/browser/image_loader.cc
+++ b/extensions/browser/image_loader.cc
@@ -10,10 +10,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/strings/string_number_conversions.h"
#include "base/task/thread_pool.h"
#include "content/public/browser/browser_thread.h"
diff --git a/extensions/browser/image_loader.h b/extensions/browser/image_loader.h
index ad7ef3f..6daf487 100644
--- a/extensions/browser/image_loader.h
+++ b/extensions/browser/image_loader.h
@@ -7,7 +7,7 @@
#include <set>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/weak_ptr.h"
#include "components/keyed_service/core/keyed_service.h"
#include "extensions/common/extension_resource.h"
diff --git a/extensions/browser/image_loader_unittest.cc b/extensions/browser/image_loader_unittest.cc
index e2177ce..817bc44 100644
--- a/extensions/browser/image_loader_unittest.cc
+++ b/extensions/browser/image_loader_unittest.cc
@@ -6,8 +6,8 @@
#include <stddef.h>
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/json/json_file_value_serializer.h"
#include "base/path_service.h"
#include "base/run_loop.h"
diff --git a/extensions/browser/image_sanitizer.cc b/extensions/browser/image_sanitizer.cc
index 46723bb..912d2eab 100644
--- a/extensions/browser/image_sanitizer.cc
+++ b/extensions/browser/image_sanitizer.cc
@@ -4,9 +4,9 @@
#include "extensions/browser/image_sanitizer.h"
-#include "base/bind.h"
#include "base/debug/dump_without_crashing.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "extensions/browser/extension_file_task_runner.h"
#include "extensions/common/extension_resource_path_normalizer.h"
diff --git a/extensions/browser/image_sanitizer_unittest.cc b/extensions/browser/image_sanitizer_unittest.cc
index 6fa8c7f..bdfbabe0 100644
--- a/extensions/browser/image_sanitizer_unittest.cc
+++ b/extensions/browser/image_sanitizer_unittest.cc
@@ -8,10 +8,10 @@
#include <memory>
#include "base/base64.h"
-#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
diff --git a/extensions/browser/json_file_sanitizer.cc b/extensions/browser/json_file_sanitizer.cc
index 7f100d4..ab3ca152 100644
--- a/extensions/browser/json_file_sanitizer.cc
+++ b/extensions/browser/json_file_sanitizer.cc
@@ -4,8 +4,8 @@
#include "extensions/browser/json_file_sanitizer.h"
-#include "base/bind.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/json/json_string_value_serializer.h"
#include "base/task/sequenced_task_runner.h"
#include "extensions/browser/extension_file_task_runner.h"
diff --git a/extensions/browser/json_file_sanitizer_unittest.cc b/extensions/browser/json_file_sanitizer_unittest.cc
index c120ca4..73ee5bf5 100644
--- a/extensions/browser/json_file_sanitizer_unittest.cc
+++ b/extensions/browser/json_file_sanitizer_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/strings/string_number_conversions.h"
#include "content/public/test/browser_task_environment.h"
diff --git a/extensions/browser/lazy_background_task_queue.cc b/extensions/browser/lazy_background_task_queue.cc
index e01b513..de656a5 100644
--- a/extensions/browser/lazy_background_task_queue.cc
+++ b/extensions/browser/lazy_background_task_queue.cc
@@ -4,9 +4,9 @@
#include "extensions/browser/lazy_background_task_queue.h"
-#include "base/callback.h"
#include "base/check.h"
#include "base/containers/contains.h"
+#include "base/functional/callback.h"
#include "base/notreached.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/render_process_host.h"
diff --git a/extensions/browser/lazy_background_task_queue_unittest.cc b/extensions/browser/lazy_background_task_queue_unittest.cc
index 2ed718e3..825209a 100644
--- a/extensions/browser/lazy_background_task_queue_unittest.cc
+++ b/extensions/browser/lazy_background_task_queue_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/prefs/testing_pref_service.h"
diff --git a/extensions/browser/lazy_context_task_queue.h b/extensions/browser/lazy_context_task_queue.h
index c5cebf3..4df0462 100644
--- a/extensions/browser/lazy_context_task_queue.h
+++ b/extensions/browser/lazy_context_task_queue.h
@@ -5,7 +5,7 @@
#ifndef EXTENSIONS_BROWSER_LAZY_CONTEXT_TASK_QUEUE_H_
#define EXTENSIONS_BROWSER_LAZY_CONTEXT_TASK_QUEUE_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr_exclusion.h"
#include "extensions/common/extension_id.h"
#include "url/gurl.h"
diff --git a/extensions/browser/load_and_localize_file.h b/extensions/browser/load_and_localize_file.h
index d142282..94667610 100644
--- a/extensions/browser/load_and_localize_file.h
+++ b/extensions/browser/load_and_localize_file.h
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
namespace extensions {
diff --git a/extensions/browser/media_capture_util.cc b/extensions/browser/media_capture_util.cc
index bb74d10..cdecfd54 100644
--- a/extensions/browser/media_capture_util.cc
+++ b/extensions/browser/media_capture_util.cc
@@ -7,8 +7,8 @@
#include <string>
#include <utility>
-#include "base/callback.h"
#include "base/check.h"
+#include "base/functional/callback.h"
#include "base/ranges/algorithm.h"
#include "content/public/browser/media_capture_devices.h"
#include "extensions/common/extension.h"
diff --git a/extensions/browser/mock_display_info_provider.cc b/extensions/browser/mock_display_info_provider.cc
index 00df717..fe6df5b 100644
--- a/extensions/browser/mock_display_info_provider.cc
+++ b/extensions/browser/mock_display_info_provider.cc
@@ -6,9 +6,9 @@
#include <stdint.h>
-#include "base/bind.h"
#include "base/check.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/strings/string_number_conversions.h"
#include "base/task/single_thread_task_runner.h"
#include "ui/display/display.h"
diff --git a/extensions/browser/mojo/keep_alive_impl.cc b/extensions/browser/mojo/keep_alive_impl.cc
index aa0a488d..bfb1d36 100644
--- a/extensions/browser/mojo/keep_alive_impl.cc
+++ b/extensions/browser/mojo/keep_alive_impl.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "content/public/browser/browser_context.h"
namespace extensions {
diff --git a/extensions/browser/mojo/keep_alive_impl.h b/extensions/browser/mojo/keep_alive_impl.h
index cb4d7be..c202ac3 100644
--- a/extensions/browser/mojo/keep_alive_impl.h
+++ b/extensions/browser/mojo/keep_alive_impl.h
@@ -5,7 +5,7 @@
#ifndef EXTENSIONS_BROWSER_MOJO_KEEP_ALIVE_IMPL_H_
#define EXTENSIONS_BROWSER_MOJO_KEEP_ALIVE_IMPL_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/scoped_observation.h"
#include "extensions/browser/extension_registry.h"
diff --git a/extensions/browser/network_permissions_updater.h b/extensions/browser/network_permissions_updater.h
index 9a46d6cb..46c0b92 100644
--- a/extensions/browser/network_permissions_updater.h
+++ b/extensions/browser/network_permissions_updater.h
@@ -5,7 +5,7 @@
#ifndef EXTENSIONS_BROWSER_NETWORK_PERMISSIONS_UPDATER_H_
#define EXTENSIONS_BROWSER_NETWORK_PERMISSIONS_UPDATER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/types/pass_key.h"
diff --git a/extensions/browser/path_util.cc b/extensions/browser/path_util.cc
index 6867bc9..d29a085 100644
--- a/extensions/browser/path_util.cc
+++ b/extensions/browser/path_util.cc
@@ -4,8 +4,8 @@
#include "extensions/browser/path_util.h"
-#include "base/bind.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/path_service.h"
#include "base/strings/sys_string_conversions.h"
#include "build/build_config.h"
diff --git a/extensions/browser/path_util.h b/extensions/browser/path_util.h
index ca46b3c..c3ef24f 100644
--- a/extensions/browser/path_util.h
+++ b/extensions/browser/path_util.h
@@ -5,8 +5,8 @@
#ifndef EXTENSIONS_BROWSER_PATH_UTIL_H_
#define EXTENSIONS_BROWSER_PATH_UTIL_H_
-#include "base/callback_forward.h"
#include "base/files/file_path.h"
+#include "base/functional/callback_forward.h"
namespace extensions {
namespace path_util {
diff --git a/extensions/browser/preload_check.h b/extensions/browser/preload_check.h
index ef00691..d52c7b6 100644
--- a/extensions/browser/preload_check.h
+++ b/extensions/browser/preload_check.h
@@ -8,7 +8,7 @@
#include <set>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
namespace extensions {
diff --git a/extensions/browser/preload_check_group.cc b/extensions/browser/preload_check_group.cc
index 1dc45f7b..172f133 100644
--- a/extensions/browser/preload_check_group.cc
+++ b/extensions/browser/preload_check_group.cc
@@ -4,8 +4,8 @@
#include "extensions/browser/preload_check_group.h"
-#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 "extensions/common/extension.h"
diff --git a/extensions/browser/preload_check_test_util.cc b/extensions/browser/preload_check_test_util.cc
index 49e30b4..de8da6a 100644
--- a/extensions/browser/preload_check_test_util.cc
+++ b/extensions/browser/preload_check_test_util.cc
@@ -4,9 +4,9 @@
#include "extensions/browser/preload_check_test_util.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/run_loop.h"
#include "base/task/single_thread_task_runner.h"
#include "extensions/common/extension.h"
diff --git a/extensions/browser/process_manager.cc b/extensions/browser/process_manager.cc
index aeee5f5..0a9fa13f8 100644
--- a/extensions/browser/process_manager.cc
+++ b/extensions/browser/process_manager.cc
@@ -8,8 +8,8 @@
#include <unordered_set>
#include <vector>
-#include "base/bind.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/guid.h"
#include "base/location.h"
#include "base/logging.h"
diff --git a/extensions/browser/process_manager.h b/extensions/browser/process_manager.h
index af8b5c2..828cd13 100644
--- a/extensions/browser/process_manager.h
+++ b/extensions/browser/process_manager.h
@@ -13,8 +13,8 @@
#include <utility>
#include <vector>
-#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/extensions/browser/renderer_startup_helper.cc b/extensions/browser/renderer_startup_helper.cc
index 612fd570..e3e759d 100644
--- a/extensions/browser/renderer_startup_helper.cc
+++ b/extensions/browser/renderer_startup_helper.cc
@@ -8,9 +8,9 @@
#include <utility>
#include <vector>
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
#include "base/debug/dump_without_crashing.h"
+#include "base/functional/callback_helpers.h"
#include "base/strings/string_util.h"
#include "base/values.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
diff --git a/extensions/browser/requirements_checker.cc b/extensions/browser/requirements_checker.cc
index df7929ad..5e4015ce 100644
--- a/extensions/browser/requirements_checker.cc
+++ b/extensions/browser/requirements_checker.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/requirements_checker.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
diff --git a/extensions/browser/sandboxed_unpacker.cc b/extensions/browser/sandboxed_unpacker.cc
index e478f9f..115d5013 100644
--- a/extensions/browser/sandboxed_unpacker.cc
+++ b/extensions/browser/sandboxed_unpacker.cc
@@ -12,10 +12,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_enumerator.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/i18n/rtl.h"
#include "base/json/json_string_value_serializer.h"
#include "base/metrics/histogram_macros.h"
diff --git a/extensions/browser/sandboxed_unpacker_unittest.cc b/extensions/browser/sandboxed_unpacker_unittest.cc
index 5b81f50..f6e469ec 100644
--- a/extensions/browser/sandboxed_unpacker_unittest.cc
+++ b/extensions/browser/sandboxed_unpacker_unittest.cc
@@ -9,10 +9,10 @@
#include <tuple>
#include "base/base64.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/files/file_util.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/path_service.h"
diff --git a/extensions/browser/script_executor.cc b/extensions/browser/script_executor.cc
index 9e8f633..f1f37c9 100644
--- a/extensions/browser/script_executor.cc
+++ b/extensions/browser/script_executor.cc
@@ -8,11 +8,11 @@
#include <set>
#include <string>
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/containers/contains.h"
#include "base/containers/cxx20_erase.h"
#include "base/dcheck_is_on.h"
+#include "base/functional/bind.h"
#include "base/hash/hash.h"
#include "base/memory/weak_ptr.h"
#include "base/pickle.h"
diff --git a/extensions/browser/script_executor.h b/extensions/browser/script_executor.h
index a6ca857..6601916 100644
--- a/extensions/browser/script_executor.h
+++ b/extensions/browser/script_executor.h
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/values.h"
#include "extensions/browser/extension_api_frame_id_map.h"
diff --git a/extensions/browser/script_result_queue.h b/extensions/browser/script_result_queue.h
index d0062bae..70e2f8e 100644
--- a/extensions/browser/script_result_queue.h
+++ b/extensions/browser/script_result_queue.h
@@ -7,7 +7,7 @@
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/scoped_observation.h"
#include "base/values.h"
#include "extensions/browser/api/test/test_api_observer.h"
diff --git a/extensions/browser/service_worker_manager.cc b/extensions/browser/service_worker_manager.cc
index 8a3b702..6ef51928 100644
--- a/extensions/browser/service_worker_manager.cc
+++ b/extensions/browser/service_worker_manager.cc
@@ -4,8 +4,8 @@
#include "extensions/browser/service_worker_manager.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/service_worker_context.h"
#include "content/public/browser/storage_partition.h"
diff --git a/extensions/browser/service_worker_task_queue.cc b/extensions/browser/service_worker_task_queue.cc
index 32ee2d7..2458aa81 100644
--- a/extensions/browser/service_worker_task_queue.cc
+++ b/extensions/browser/service_worker_task_queue.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/metrics/histogram_macros.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/extensions/browser/state_store.cc b/extensions/browser/state_store.cc
index d963d60..5f384427 100644
--- a/extensions/browser/state_store.cc
+++ b/extensions/browser/state_store.cc
@@ -8,7 +8,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/observer_list.h"
#include "components/value_store/value_store_factory.h"
diff --git a/extensions/browser/state_store.h b/extensions/browser/state_store.h
index 6d2cec3..ee46324 100644
--- a/extensions/browser/state_store.h
+++ b/extensions/browser/state_store.h
@@ -8,7 +8,7 @@
#include <set>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "base/scoped_observation.h"
diff --git a/extensions/browser/supervised_user_extensions_delegate.h b/extensions/browser/supervised_user_extensions_delegate.h
index b69b0b93..6aa02b7 100644
--- a/extensions/browser/supervised_user_extensions_delegate.h
+++ b/extensions/browser/supervised_user_extensions_delegate.h
@@ -5,7 +5,7 @@
#ifndef EXTENSIONS_BROWSER_SUPERVISED_USER_EXTENSIONS_DELEGATE_H_
#define EXTENSIONS_BROWSER_SUPERVISED_USER_EXTENSIONS_DELEGATE_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "extensions/common/extension.h"
namespace content {
diff --git a/extensions/browser/test_event_router.h b/extensions/browser/test_event_router.h
index 9086074..096939c 100644
--- a/extensions/browser/test_event_router.h
+++ b/extensions/browser/test_event_router.h
@@ -10,7 +10,7 @@
#include <string>
#include <type_traits>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/observer_list.h"
#include "base/scoped_observation_traits.h"
#include "extensions/browser/event_router.h"
diff --git a/extensions/browser/test_extensions_browser_client.h b/extensions/browser/test_extensions_browser_client.h
index 0ff5921..76fc714 100644
--- a/extensions/browser/test_extensions_browser_client.h
+++ b/extensions/browser/test_extensions_browser_client.h
@@ -10,8 +10,8 @@
#include <utility>
#include <vector>
-#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 "build/build_config.h"
diff --git a/extensions/browser/test_image_loader.cc b/extensions/browser/test_image_loader.cc
index da41cee..2cc4f33 100644
--- a/extensions/browser/test_image_loader.cc
+++ b/extensions/browser/test_image_loader.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/test_image_loader.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "extensions/browser/image_loader.h"
#include "extensions/common/extension.h"
#include "third_party/skia/include/core/SkBitmap.h"
diff --git a/extensions/browser/updater/extension_cache.h b/extensions/browser/updater/extension_cache.h
index ced930b..6b1f554 100644
--- a/extensions/browser/updater/extension_cache.h
+++ b/extensions/browser/updater/extension_cache.h
@@ -7,8 +7,8 @@
#include <string>
-#include "base/callback_forward.h"
#include "base/files/file_path.h"
+#include "base/functional/callback_forward.h"
namespace extensions {
diff --git a/extensions/browser/updater/extension_cache_fake.cc b/extensions/browser/updater/extension_cache_fake.cc
index 32343dd..0758612fe 100644
--- a/extensions/browser/updater/extension_cache_fake.cc
+++ b/extensions/browser/updater/extension_cache_fake.cc
@@ -4,8 +4,8 @@
#include "extensions/browser/updater/extension_cache_fake.h"
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/browser/updater/extension_downloader.cc
index 8cde300..f4c6aad 100644
--- a/extensions/browser/updater/extension_downloader.cc
+++ b/extensions/browser/updater/extension_downloader.cc
@@ -8,9 +8,9 @@
#include <utility>
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/metrics/histogram.h"
diff --git a/extensions/browser/updater/extension_downloader_delegate.h b/extensions/browser/updater/extension_downloader_delegate.h
index f94d142..4ffdb75 100644
--- a/extensions/browser/updater/extension_downloader_delegate.h
+++ b/extensions/browser/updater/extension_downloader_delegate.h
@@ -8,7 +8,7 @@
#include <set>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "extensions/browser/crx_file_info.h"
#include "extensions/browser/updater/extension_downloader_types.h"
diff --git a/extensions/browser/updater/extension_downloader_unittest.cc b/extensions/browser/updater/extension_downloader_unittest.cc
index 3310a88..c16886c 100644
--- a/extensions/browser/updater/extension_downloader_unittest.cc
+++ b/extensions/browser/updater/extension_downloader_unittest.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/updater/extension_downloader.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/sequenced_task_runner.h"
#include "base/test/bind.h"
#include "content/public/test/browser_task_environment.h"
diff --git a/extensions/browser/updater/extension_installer.cc b/extensions/browser/updater/extension_installer.cc
index 293fc1a..38f377a 100644
--- a/extensions/browser/updater/extension_installer.cc
+++ b/extensions/browser/updater/extension_installer.cc
@@ -6,10 +6,10 @@
#include <utility>
-#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/logging.h"
#include "base/strings/string_number_conversions.h"
#include "components/update_client/update_client_errors.h"
diff --git a/extensions/browser/updater/extension_installer.h b/extensions/browser/updater/extension_installer.h
index 8e99ba7d..164c156 100644
--- a/extensions/browser/updater/extension_installer.h
+++ b/extensions/browser/updater/extension_installer.h
@@ -8,8 +8,8 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/functional/callback.h"
#include "components/update_client/update_client.h"
namespace extensions {
diff --git a/extensions/browser/updater/extension_installer_unittest.cc b/extensions/browser/updater/extension_installer_unittest.cc
index 41acc5e..939ba109 100644
--- a/extensions/browser/updater/extension_installer_unittest.cc
+++ b/extensions/browser/updater/extension_installer_unittest.cc
@@ -6,11 +6,11 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.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_helpers.h"
#include "base/memory/scoped_refptr.h"
#include "base/run_loop.h"
#include "components/update_client/update_client.h"
diff --git a/extensions/browser/updater/null_extension_cache.cc b/extensions/browser/updater/null_extension_cache.cc
index 5e1b97c..cc1fedb 100644
--- a/extensions/browser/updater/null_extension_cache.cc
+++ b/extensions/browser/updater/null_extension_cache.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/updater/null_extension_cache.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
namespace extensions {
diff --git a/extensions/browser/updater/request_queue.h b/extensions/browser/updater/request_queue.h
index 802346c..21f28c0 100644
--- a/extensions/browser/updater/request_queue.h
+++ b/extensions/browser/updater/request_queue.h
@@ -10,8 +10,8 @@
#include <memory>
#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/time/time.h"
#include "base/timer/timer.h"
diff --git a/extensions/browser/updater/request_queue_impl.h b/extensions/browser/updater/request_queue_impl.h
index 2735764..c6e5216 100644
--- a/extensions/browser/updater/request_queue_impl.h
+++ b/extensions/browser/updater/request_queue_impl.h
@@ -11,8 +11,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "extensions/browser/updater/request_queue.h"
namespace extensions {
diff --git a/extensions/browser/updater/safe_manifest_parser.cc b/extensions/browser/updater/safe_manifest_parser.cc
index f4b01cd..2cfe162b 100644
--- a/extensions/browser/updater/safe_manifest_parser.cc
+++ b/extensions/browser/updater/safe_manifest_parser.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
diff --git a/extensions/browser/updater/safe_manifest_parser.h b/extensions/browser/updater/safe_manifest_parser.h
index 04036b1..085ae8a5 100644
--- a/extensions/browser/updater/safe_manifest_parser.h
+++ b/extensions/browser/updater/safe_manifest_parser.h
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "url/gurl.h"
diff --git a/extensions/browser/updater/safe_manifest_parser_unittest.cc b/extensions/browser/updater/safe_manifest_parser_unittest.cc
index cc07ddb..da508e1 100644
--- a/extensions/browser/updater/safe_manifest_parser_unittest.cc
+++ b/extensions/browser/updater/safe_manifest_parser_unittest.cc
@@ -4,7 +4,7 @@
#include "extensions/browser/updater/safe_manifest_parser.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "content/public/test/browser_task_environment.h"
#include "extensions/browser/updater/extension_downloader_test_helper.h"
diff --git a/extensions/browser/updater/uninstall_ping_sender.h b/extensions/browser/updater/uninstall_ping_sender.h
index c9b5156..451157c1 100644
--- a/extensions/browser/updater/uninstall_ping_sender.h
+++ b/extensions/browser/updater/uninstall_ping_sender.h
@@ -5,7 +5,7 @@
#ifndef EXTENSIONS_BROWSER_UPDATER_UNINSTALL_PING_SENDER_H_
#define EXTENSIONS_BROWSER_UPDATER_UNINSTALL_PING_SENDER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/scoped_observation.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_registry_observer.h"
diff --git a/extensions/browser/updater/update_data_provider.cc b/extensions/browser/updater/update_data_provider.cc
index 80d2203..cc2f528 100644
--- a/extensions/browser/updater/update_data_provider.cc
+++ b/extensions/browser/updater/update_data_provider.cc
@@ -7,9 +7,9 @@
#include <utility>
#include "base/base64.h"
-#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/strings/string_util.h"
#include "base/task/thread_pool.h"
#include "components/crx_file/crx_verifier.h"
diff --git a/extensions/browser/updater/update_data_provider.h b/extensions/browser/updater/update_data_provider.h
index b01dca5d..08a1d19 100644
--- a/extensions/browser/updater/update_data_provider.h
+++ b/extensions/browser/updater/update_data_provider.h
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "extensions/browser/updater/extension_installer.h"
diff --git a/extensions/browser/updater/update_data_provider_unittest.cc b/extensions/browser/updater/update_data_provider_unittest.cc
index 2a80a045..c8d1ee7 100644
--- a/extensions/browser/updater/update_data_provider_unittest.cc
+++ b/extensions/browser/updater/update_data_provider_unittest.cc
@@ -10,10 +10,10 @@
#include <string>
#include <vector>
-#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/run_loop.h"
#include "components/update_client/update_client.h"
#include "extensions/browser/disable_reason.h"
diff --git a/extensions/browser/updater/update_service.cc b/extensions/browser/updater/update_service.cc
index 487b4b3..6a7b22c 100644
--- a/extensions/browser/updater/update_service.cc
+++ b/extensions/browser/updater/update_service.cc
@@ -9,11 +9,11 @@
#include <vector>
#include "base/barrier_closure.h"
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/feature_list.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "components/update_client/crx_update_item.h"
diff --git a/extensions/browser/updater/update_service.h b/extensions/browser/updater/update_service.h
index d434fdfd..b53f273 100644
--- a/extensions/browser/updater/update_service.h
+++ b/extensions/browser/updater/update_service.h
@@ -11,7 +11,7 @@
#include <string>
#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/threading/thread_checker.h"
diff --git a/extensions/browser/updater/update_service_unittest.cc b/extensions/browser/updater/update_service_unittest.cc
index 074af6a..5cb55f2 100644
--- a/extensions/browser/updater/update_service_unittest.cc
+++ b/extensions/browser/updater/update_service_unittest.cc
@@ -8,11 +8,11 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.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/metrics/histogram_tester.h"
diff --git a/extensions/browser/user_script_loader.cc b/extensions/browser/user_script_loader.cc
index 657586d..75e668a 100644
--- a/extensions/browser/user_script_loader.cc
+++ b/extensions/browser/user_script_loader.cc
@@ -10,8 +10,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/containers/cxx20_erase.h"
+#include "base/functional/bind.h"
#include "base/memory/writable_shared_memory_region.h"
#include "base/observer_list.h"
#include "base/strings/string_util.h"
diff --git a/extensions/browser/user_script_loader.h b/extensions/browser/user_script_loader.h
index 764bd915..8dec668 100644
--- a/extensions/browser/user_script_loader.h
+++ b/extensions/browser/user_script_loader.h
@@ -10,8 +10,8 @@
#include <memory>
#include <set>
-#include "base/callback_forward.h"
#include "base/compiler_specific.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/weak_ptr.h"
diff --git a/extensions/browser/web_ui_user_script_loader.cc b/extensions/browser/web_ui_user_script_loader.cc
index 372b2e7d..d7405a2 100644
--- a/extensions/browser/web_ui_user_script_loader.cc
+++ b/extensions/browser/web_ui_user_script_loader.cc
@@ -8,7 +8,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted.h"
#include "base/strings/string_util.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/extensions/browser/web_ui_user_script_loader.h b/extensions/browser/web_ui_user_script_loader.h
index c748e7c8..d205bde 100644
--- a/extensions/browser/web_ui_user_script_loader.h
+++ b/extensions/browser/web_ui_user_script_loader.h
@@ -10,7 +10,7 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "extensions/browser/user_script_loader.h"
#include "extensions/common/mojom/host_id.mojom-forward.h"
diff --git a/extensions/browser/zipfile_installer.cc b/extensions/browser/zipfile_installer.cc
index 8a493ee..2a6a54c 100644
--- a/extensions/browser/zipfile_installer.cc
+++ b/extensions/browser/zipfile_installer.cc
@@ -4,9 +4,9 @@
#include "extensions/browser/zipfile_installer.h"
-#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/json/json_reader.h"
#include "base/path_service.h"
#include "base/strings/string_util.h"
diff --git a/extensions/browser/zipfile_installer.h b/extensions/browser/zipfile_installer.h
index 7e532bc..f9a2f54 100644
--- a/extensions/browser/zipfile_installer.h
+++ b/extensions/browser/zipfile_installer.h
@@ -8,8 +8,8 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
diff --git a/extensions/common/csp_validator.cc b/extensions/common/csp_validator.cc
index 96ee854..9720491 100644
--- a/extensions/common/csp_validator.cc
+++ b/extensions/common/csp_validator.cc
@@ -12,10 +12,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check_op.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/raw_ref.h"
#include "base/ranges/algorithm.h"
diff --git a/extensions/common/event_matcher.cc b/extensions/common/event_matcher.cc
index 467ac4e..545679b3 100644
--- a/extensions/common/event_matcher.cc
+++ b/extensions/common/event_matcher.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "extensions/common/mojom/event_dispatcher.mojom.h"
namespace {
diff --git a/extensions/common/features/simple_feature.cc b/extensions/common/features/simple_feature.cc
index 5e77cd3..21f005d 100644
--- a/extensions/common/features/simple_feature.cc
+++ b/extensions/common/features/simple_feature.cc
@@ -9,9 +9,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_util.h"
diff --git a/extensions/common/features/simple_feature.h b/extensions/common/features/simple_feature.h
index cb5c5a1..96ce10f 100644
--- a/extensions/common/features/simple_feature.h
+++ b/extensions/common/features/simple_feature.h
@@ -13,7 +13,7 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/gtest_prod_util.h"
#include "base/lazy_instance.h"
#include "components/version_info/version_info.h"
diff --git a/extensions/common/permissions/api_permission.h b/extensions/common/permissions/api_permission.h
index 3fd4ba9..634b091 100644
--- a/extensions/common/permissions/api_permission.h
+++ b/extensions/common/permissions/api_permission.h
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/values.h"
#include "extensions/common/mojom/api_permission_id.mojom-shared.h"
diff --git a/extensions/common/permissions/permissions_info.h b/extensions/common/permissions/permissions_info.h
index e219d4d..5add791 100644
--- a/extensions/common/permissions/permissions_info.h
+++ b/extensions/common/permissions/permissions_info.h
@@ -14,8 +14,8 @@
#include <unordered_map>
#include <vector>
-#include "base/callback.h"
#include "base/containers/span.h"
+#include "base/functional/callback.h"
#include "base/lazy_instance.h"
#include "extensions/common/mojom/api_permission_id.mojom-shared.h"
#include "extensions/common/permissions/api_permission.h"
diff --git a/extensions/common/utils/content_script_utils.h b/extensions/common/utils/content_script_utils.h
index a0db64f..f0fe4ad 100644
--- a/extensions/common/utils/content_script_utils.h
+++ b/extensions/common/utils/content_script_utils.h
@@ -8,7 +8,7 @@
#include <string>
#include "base/auto_reset.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "extensions/common/api/content_scripts.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_resource.h"
diff --git a/extensions/components/native_app_window/native_app_window_views.cc b/extensions/components/native_app_window/native_app_window_views.cc
index cdfd1c6..e3777b2 100644
--- a/extensions/components/native_app_window/native_app_window_views.cc
+++ b/extensions/components/native_app_window/native_app_window_views.cc
@@ -4,7 +4,7 @@
#include "extensions/components/native_app_window/native_app_window_views.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/observer_list.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_widget_host.h"
diff --git a/extensions/renderer/api/app_window_custom_bindings.cc b/extensions/renderer/api/app_window_custom_bindings.cc
index ec80ff9..b0beb70 100644
--- a/extensions/renderer/api/app_window_custom_bindings.cc
+++ b/extensions/renderer/api/app_window_custom_bindings.cc
@@ -4,8 +4,8 @@
#include "extensions/renderer/api/app_window_custom_bindings.h"
-#include "base/bind.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_thread.h"
#include "content/public/renderer/v8_value_converter.h"
diff --git a/extensions/renderer/api/automation/automation_internal_custom_bindings.cc b/extensions/renderer/api/automation/automation_internal_custom_bindings.cc
index 9848a3d4..1822df0 100644
--- a/extensions/renderer/api/automation/automation_internal_custom_bindings.cc
+++ b/extensions/renderer/api/automation/automation_internal_custom_bindings.cc
@@ -13,7 +13,7 @@
#include <string>
#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 "base/values.h"
diff --git a/extensions/renderer/api/context_menus_custom_bindings.cc b/extensions/renderer/api/context_menus_custom_bindings.cc
index 19ec5fb..6a30202b 100644
--- a/extensions/renderer/api/context_menus_custom_bindings.cc
+++ b/extensions/renderer/api/context_menus_custom_bindings.cc
@@ -8,8 +8,8 @@
#include <atomic>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "v8/include/v8.h"
namespace {
diff --git a/extensions/renderer/api/declarative_content_hooks_delegate.cc b/extensions/renderer/api/declarative_content_hooks_delegate.cc
index a0206e54..7fef0a8 100644
--- a/extensions/renderer/api/declarative_content_hooks_delegate.cc
+++ b/extensions/renderer/api/declarative_content_hooks_delegate.cc
@@ -4,7 +4,7 @@
#include "extensions/renderer/api/declarative_content_hooks_delegate.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "extensions/common/api/declarative/declarative_constants.h"
#include "extensions/renderer/bindings/api_type_reference_map.h"
#include "extensions/renderer/bindings/argument_spec.h"
diff --git a/extensions/renderer/api/declarative_content_hooks_delegate.h b/extensions/renderer/api/declarative_content_hooks_delegate.h
index c85e636..d9b2d8c 100644
--- a/extensions/renderer/api/declarative_content_hooks_delegate.h
+++ b/extensions/renderer/api/declarative_content_hooks_delegate.h
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "extensions/renderer/bindings/api_binding_hooks_delegate.h"
#include "v8/include/v8-forward.h"
diff --git a/extensions/renderer/api/feedback_private_hooks_delegate.cc b/extensions/renderer/api/feedback_private_hooks_delegate.cc
index a968ce8d..a468536 100644
--- a/extensions/renderer/api/feedback_private_hooks_delegate.cc
+++ b/extensions/renderer/api/feedback_private_hooks_delegate.cc
@@ -4,8 +4,8 @@
#include "extensions/renderer/api/feedback_private_hooks_delegate.h"
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "extensions/renderer/bindings/api_binding_types.h"
#include "extensions/renderer/v8_helpers.h"
diff --git a/extensions/renderer/api/file_system_natives.cc b/extensions/renderer/api/file_system_natives.cc
index 107fcd8..7a41512 100644
--- a/extensions/renderer/api/file_system_natives.cc
+++ b/extensions/renderer/api/file_system_natives.cc
@@ -6,7 +6,7 @@
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "content/public/common/url_constants.h"
#include "extensions/common/constants.h"
#include "extensions/renderer/script_context.h"
diff --git a/extensions/renderer/api/messaging/gin_port.cc b/extensions/renderer/api/messaging/gin_port.cc
index 84468743..7317397b 100644
--- a/extensions/renderer/api/messaging/gin_port.cc
+++ b/extensions/renderer/api/messaging/gin_port.cc
@@ -7,7 +7,7 @@
#include <cstring>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "extensions/common/api/messaging/message.h"
#include "extensions/common/mojom/event_dispatcher.mojom.h"
#include "extensions/renderer/api/messaging/messaging_util.h"
diff --git a/extensions/renderer/api/messaging/gin_port_unittest.cc b/extensions/renderer/api/messaging/gin_port_unittest.cc
index dd6f7f6..d3743bcd 100644
--- a/extensions/renderer/api/messaging/gin_port_unittest.cc
+++ b/extensions/renderer/api/messaging/gin_port_unittest.cc
@@ -4,9 +4,9 @@
#include "extensions/renderer/api/messaging/gin_port.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 "content/public/common/content_features.h"
#include "extensions/common/api/messaging/message.h"
#include "extensions/common/api/messaging/port_id.h"
diff --git a/extensions/renderer/api/messaging/messaging_bindings.cc b/extensions/renderer/api/messaging/messaging_bindings.cc
index 4fd5903..518db26 100644
--- a/extensions/renderer/api/messaging/messaging_bindings.cc
+++ b/extensions/renderer/api/messaging/messaging_bindings.cc
@@ -6,9 +6,9 @@
#include <stdint.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 "extensions/renderer/gc_callback.h"
#include "extensions/renderer/script_context.h"
#include "v8/include/v8-function-callback.h"
diff --git a/extensions/renderer/api/messaging/native_renderer_messaging_service.cc b/extensions/renderer/api/messaging/native_renderer_messaging_service.cc
index a3ce6b2..c1b2b9e 100644
--- a/extensions/renderer/api/messaging/native_renderer_messaging_service.cc
+++ b/extensions/renderer/api/messaging/native_renderer_messaging_service.cc
@@ -10,9 +10,9 @@
#include <utility>
#include <vector>
-#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/supports_user_data.h"
#include "content/public/common/content_constants.h"
#include "content/public/renderer/render_frame.h"
diff --git a/extensions/renderer/api/messaging/one_time_message_handler.cc b/extensions/renderer/api/messaging/one_time_message_handler.cc
index 62d4021..c5fe3c54 100644
--- a/extensions/renderer/api/messaging/one_time_message_handler.cc
+++ b/extensions/renderer/api/messaging/one_time_message_handler.cc
@@ -6,10 +6,10 @@
#include <map>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/containers/contains.h"
#include "base/containers/cxx20_erase.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/ranges/algorithm.h"
#include "base/supports_user_data.h"
#include "content/public/renderer/render_frame.h"
diff --git a/extensions/renderer/api_activity_logger.cc b/extensions/renderer/api_activity_logger.cc
index 3cc1dc1..17e201d2 100644
--- a/extensions/renderer/api_activity_logger.cc
+++ b/extensions/renderer/api_activity_logger.cc
@@ -9,7 +9,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "content/public/renderer/v8_value_converter.h"
#include "extensions/renderer/activity_log_converter_strategy.h"
#include "extensions/renderer/dispatcher.h"
diff --git a/extensions/renderer/api_definitions_natives.cc b/extensions/renderer/api_definitions_natives.cc
index 9f199623..79cf5b0b 100644
--- a/extensions/renderer/api_definitions_natives.cc
+++ b/extensions/renderer/api_definitions_natives.cc
@@ -4,7 +4,7 @@
#include "extensions/renderer/api_definitions_natives.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "extensions/common/features/feature.h"
#include "extensions/common/features/feature_provider.h"
#include "extensions/renderer/dispatcher.h"
diff --git a/extensions/renderer/bindings/api_binding.cc b/extensions/renderer/bindings/api_binding.cc
index 5e92062..ddc74c924 100644
--- a/extensions/renderer/bindings/api_binding.cc
+++ b/extensions/renderer/bindings/api_binding.cc
@@ -6,8 +6,8 @@
#include <algorithm>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/ranges/algorithm.h"
#include "base/strings/strcat.h"
#include "base/strings/string_util.h"
diff --git a/extensions/renderer/bindings/api_binding.h b/extensions/renderer/bindings/api_binding.h
index d7adeacb1..95bf7d9 100644
--- a/extensions/renderer/bindings/api_binding.h
+++ b/extensions/renderer/bindings/api_binding.h
@@ -9,8 +9,8 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/containers/flat_set.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/supports_user_data.h"
#include "base/values.h"
diff --git a/extensions/renderer/bindings/api_binding_hooks_test_delegate.h b/extensions/renderer/bindings/api_binding_hooks_test_delegate.h
index 72441bf..83021bf 100644
--- a/extensions/renderer/bindings/api_binding_hooks_test_delegate.h
+++ b/extensions/renderer/bindings/api_binding_hooks_test_delegate.h
@@ -8,7 +8,7 @@
#include <map>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/strings/string_piece.h"
#include "extensions/renderer/bindings/api_binding_hooks_delegate.h"
#include "v8/include/v8.h"
diff --git a/extensions/renderer/bindings/api_binding_js_util_unittest.cc b/extensions/renderer/bindings/api_binding_js_util_unittest.cc
index 9ff4532..840829f 100644
--- a/extensions/renderer/bindings/api_binding_js_util_unittest.cc
+++ b/extensions/renderer/bindings/api_binding_js_util_unittest.cc
@@ -4,7 +4,7 @@
#include "extensions/renderer/bindings/api_binding_js_util.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "extensions/renderer/bindings/api_binding_test_util.h"
#include "extensions/renderer/bindings/api_bindings_system.h"
#include "extensions/renderer/bindings/api_bindings_system_unittest.h"
diff --git a/extensions/renderer/bindings/api_binding_types.h b/extensions/renderer/bindings/api_binding_types.h
index 0db0b910..606d08b 100644
--- a/extensions/renderer/bindings/api_binding_types.h
+++ b/extensions/renderer/bindings/api_binding_types.h
@@ -8,7 +8,7 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "v8/include/v8.h"
namespace extensions {
diff --git a/extensions/renderer/bindings/api_binding_unittest.cc b/extensions/renderer/bindings/api_binding_unittest.cc
index 1a8ac2d..6360b35 100644
--- a/extensions/renderer/bindings/api_binding_unittest.cc
+++ b/extensions/renderer/bindings/api_binding_unittest.cc
@@ -7,8 +7,8 @@
#include <tuple>
#include "base/auto_reset.h"
-#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 "base/test/bind.h"
#include "base/values.h"
diff --git a/extensions/renderer/bindings/api_binding_util.h b/extensions/renderer/bindings/api_binding_util.h
index a5b0013..7c207bf 100644
--- a/extensions/renderer/bindings/api_binding_util.h
+++ b/extensions/renderer/bindings/api_binding_util.h
@@ -9,7 +9,7 @@
#include <string>
#include "base/auto_reset.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "v8/include/v8.h"
namespace extensions {
diff --git a/extensions/renderer/bindings/api_bindings_system.cc b/extensions/renderer/bindings/api_bindings_system.cc
index a2fafbe..30ea0f0 100644
--- a/extensions/renderer/bindings/api_bindings_system.cc
+++ b/extensions/renderer/bindings/api_bindings_system.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/values.h"
#include "extensions/common/mojom/event_dispatcher.mojom.h"
#include "extensions/renderer/bindings/api_binding_hooks.h"
diff --git a/extensions/renderer/bindings/api_bindings_system.h b/extensions/renderer/bindings/api_bindings_system.h
index 590f044..6d5cb72 100644
--- a/extensions/renderer/bindings/api_bindings_system.h
+++ b/extensions/renderer/bindings/api_bindings_system.h
@@ -9,7 +9,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/values.h"
#include "extensions/common/mojom/event_dispatcher.mojom-forward.h"
#include "extensions/renderer/bindings/api_binding.h"
diff --git a/extensions/renderer/bindings/api_bindings_system_unittest.cc b/extensions/renderer/bindings/api_bindings_system_unittest.cc
index 982c251..fe5a428 100644
--- a/extensions/renderer/bindings/api_bindings_system_unittest.cc
+++ b/extensions/renderer/bindings/api_bindings_system_unittest.cc
@@ -4,9 +4,9 @@
#include "extensions/renderer/bindings/api_bindings_system_unittest.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/strings/stringprintf.h"
#include "extensions/common/mojom/event_dispatcher.mojom.h"
#include "extensions/renderer/bindings/api_binding.h"
diff --git a/extensions/renderer/bindings/api_event_handler.cc b/extensions/renderer/bindings/api_event_handler.cc
index 7beaab4..4cd4769 100644
--- a/extensions/renderer/bindings/api_event_handler.cc
+++ b/extensions/renderer/bindings/api_event_handler.cc
@@ -9,9 +9,9 @@
#include <utility>
#include <vector>
-#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/notreached.h"
#include "base/ranges/algorithm.h"
#include "base/supports_user_data.h"
diff --git a/extensions/renderer/bindings/api_event_handler.h b/extensions/renderer/bindings/api_event_handler.h
index fd2edfb5..fd799e4 100644
--- a/extensions/renderer/bindings/api_event_handler.h
+++ b/extensions/renderer/bindings/api_event_handler.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "extensions/common/mojom/event_dispatcher.mojom-forward.h"
#include "extensions/renderer/bindings/api_binding_types.h"
#include "extensions/renderer/bindings/api_event_listeners.h"
diff --git a/extensions/renderer/bindings/api_event_handler_unittest.cc b/extensions/renderer/bindings/api_event_handler_unittest.cc
index 446b4ad..e14ccf18 100644
--- a/extensions/renderer/bindings/api_event_handler_unittest.cc
+++ b/extensions/renderer/bindings/api_event_handler_unittest.cc
@@ -4,8 +4,8 @@
#include "extensions/renderer/bindings/api_event_handler.h"
-#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 "base/test/mock_callback.h"
diff --git a/extensions/renderer/bindings/api_event_listeners.h b/extensions/renderer/bindings/api_event_listeners.h
index 910fbcc..310c07f 100644
--- a/extensions/renderer/bindings/api_event_listeners.h
+++ b/extensions/renderer/bindings/api_event_listeners.h
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/values.h"
#include "extensions/common/mojom/event_dispatcher.mojom-forward.h"
#include "extensions/renderer/bindings/api_binding_types.h"
diff --git a/extensions/renderer/bindings/api_event_listeners_unittest.cc b/extensions/renderer/bindings/api_event_listeners_unittest.cc
index 11c3fdf8..f87fc974 100644
--- a/extensions/renderer/bindings/api_event_listeners_unittest.cc
+++ b/extensions/renderer/bindings/api_event_listeners_unittest.cc
@@ -7,8 +7,8 @@
#include <functional>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/test/mock_callback.h"
#include "base/test/values_test_util.h"
#include "base/values.h"
diff --git a/extensions/renderer/bindings/api_last_error.h b/extensions/renderer/bindings/api_last_error.h
index 94e61de..12ce0f7 100644
--- a/extensions/renderer/bindings/api_last_error.h
+++ b/extensions/renderer/bindings/api_last_error.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "extensions/renderer/bindings/api_binding_types.h"
#include "v8/include/v8.h"
diff --git a/extensions/renderer/bindings/api_last_error_unittest.cc b/extensions/renderer/bindings/api_last_error_unittest.cc
index e283868..185f232 100644
--- a/extensions/renderer/bindings/api_last_error_unittest.cc
+++ b/extensions/renderer/bindings/api_last_error_unittest.cc
@@ -4,8 +4,8 @@
#include "extensions/renderer/bindings/api_last_error.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "extensions/renderer/bindings/api_binding_test.h"
#include "extensions/renderer/bindings/api_binding_test_util.h"
#include "gin/converter.h"
diff --git a/extensions/renderer/bindings/api_request_handler.cc b/extensions/renderer/bindings/api_request_handler.cc
index c34f7ee..674c8a0 100644
--- a/extensions/renderer/bindings/api_request_handler.cc
+++ b/extensions/renderer/bindings/api_request_handler.cc
@@ -4,7 +4,7 @@
#include "extensions/renderer/bindings/api_request_handler.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/guid.h"
#include "base/logging.h"
#include "base/values.h"
diff --git a/extensions/renderer/bindings/api_request_handler.h b/extensions/renderer/bindings/api_request_handler.h
index 1b28cbd..394ec36 100644
--- a/extensions/renderer/bindings/api_request_handler.h
+++ b/extensions/renderer/bindings/api_request_handler.h
@@ -9,7 +9,7 @@
#include <memory>
#include <set>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/values.h"
#include "extensions/common/mojom/extra_response_data.mojom.h"
#include "extensions/renderer/bindings/api_binding_types.h"
diff --git a/extensions/renderer/bindings/api_request_handler_unittest.cc b/extensions/renderer/bindings/api_request_handler_unittest.cc
index 7002821a..43dad55 100644
--- a/extensions/renderer/bindings/api_request_handler_unittest.cc
+++ b/extensions/renderer/bindings/api_request_handler_unittest.cc
@@ -4,8 +4,8 @@
#include "extensions/renderer/bindings/api_request_handler.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/strings/strcat.h"
#include "base/test/bind.h"
#include "base/values.h"
diff --git a/extensions/renderer/bindings/api_response_validator.h b/extensions/renderer/bindings/api_response_validator.h
index 76a9c1b2..c8cc69b 100644
--- a/extensions/renderer/bindings/api_response_validator.h
+++ b/extensions/renderer/bindings/api_response_validator.h
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "v8/include/v8.h"
namespace extensions {
diff --git a/extensions/renderer/bindings/api_response_validator_unittest.cc b/extensions/renderer/bindings/api_response_validator_unittest.cc
index f947c40..3e2bcf2 100644
--- a/extensions/renderer/bindings/api_response_validator_unittest.cc
+++ b/extensions/renderer/bindings/api_response_validator_unittest.cc
@@ -7,7 +7,7 @@
#include <vector>
#include "base/auto_reset.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "extensions/renderer/bindings/api_binding_test.h"
#include "extensions/renderer/bindings/api_binding_test_util.h"
#include "extensions/renderer/bindings/api_binding_util.h"
diff --git a/extensions/renderer/bindings/api_type_reference_map.h b/extensions/renderer/bindings/api_type_reference_map.h
index 5e5a6d3..4e9eb36 100644
--- a/extensions/renderer/bindings/api_type_reference_map.h
+++ b/extensions/renderer/bindings/api_type_reference_map.h
@@ -9,7 +9,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
namespace extensions {
class APISignature;
diff --git a/extensions/renderer/bindings/argument_spec_unittest.cc b/extensions/renderer/bindings/argument_spec_unittest.cc
index 9f406c1..f364d8c 100644
--- a/extensions/renderer/bindings/argument_spec_unittest.cc
+++ b/extensions/renderer/bindings/argument_spec_unittest.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "extensions/renderer/bindings/argument_spec.h"
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/strings/stringprintf.h"
#include "base/values.h"
#include "extensions/renderer/bindings/api_binding_test_util.h"
diff --git a/extensions/renderer/bindings/binding_access_checker.h b/extensions/renderer/bindings/binding_access_checker.h
index d4070656..4d7e1d9 100644
--- a/extensions/renderer/bindings/binding_access_checker.h
+++ b/extensions/renderer/bindings/binding_access_checker.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "v8/include/v8.h"
namespace extensions {
diff --git a/extensions/renderer/bindings/binding_access_checker_unittest.cc b/extensions/renderer/bindings/binding_access_checker_unittest.cc
index 21e903b..158a993 100644
--- a/extensions/renderer/bindings/binding_access_checker_unittest.cc
+++ b/extensions/renderer/bindings/binding_access_checker_unittest.cc
@@ -4,7 +4,7 @@
#include "extensions/renderer/bindings/binding_access_checker.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "extensions/renderer/bindings/api_binding_test.h"
#include "gin/converter.h"
diff --git a/extensions/renderer/bindings/declarative_event_unittest.cc b/extensions/renderer/bindings/declarative_event_unittest.cc
index 3d1d3b7fc..04102c0 100644
--- a/extensions/renderer/bindings/declarative_event_unittest.cc
+++ b/extensions/renderer/bindings/declarative_event_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/stringprintf.h"
#include "base/values.h"
#include "extensions/common/extension_api.h"
diff --git a/extensions/renderer/bindings/event_emitter_unittest.cc b/extensions/renderer/bindings/event_emitter_unittest.cc
index cacda982..acc5cec 100644
--- a/extensions/renderer/bindings/event_emitter_unittest.cc
+++ b/extensions/renderer/bindings/event_emitter_unittest.cc
@@ -4,8 +4,8 @@
#include "extensions/renderer/bindings/event_emitter.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/values.h"
#include "extensions/common/mojom/event_dispatcher.mojom.h"
#include "extensions/renderer/bindings/api_binding_test.h"
diff --git a/extensions/renderer/bindings/exception_handler_unittest.cc b/extensions/renderer/bindings/exception_handler_unittest.cc
index 1d099217..457788b 100644
--- a/extensions/renderer/bindings/exception_handler_unittest.cc
+++ b/extensions/renderer/bindings/exception_handler_unittest.cc
@@ -7,7 +7,7 @@
#include <string>
#include <tuple>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/stringprintf.h"
#include "extensions/renderer/bindings/api_binding_test.h"
#include "extensions/renderer/bindings/api_binding_test_util.h"
diff --git a/extensions/renderer/bindings/js_runner.h b/extensions/renderer/bindings/js_runner.h
index a3cc6270..69e05bd 100644
--- a/extensions/renderer/bindings/js_runner.h
+++ b/extensions/renderer/bindings/js_runner.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "v8/include/v8.h"
diff --git a/extensions/renderer/bindings/test_js_runner.cc b/extensions/renderer/bindings/test_js_runner.cc
index 017ca35..4f81cf21 100644
--- a/extensions/renderer/bindings/test_js_runner.cc
+++ b/extensions/renderer/bindings/test_js_runner.cc
@@ -6,7 +6,7 @@
#include <ostream>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "content/public/renderer/v8_value_converter.h"
#include "extensions/renderer/bindings/api_binding_test_util.h"
diff --git a/extensions/renderer/bindings/test_js_runner.h b/extensions/renderer/bindings/test_js_runner.h
index da1b0b40..e5ea10b 100644
--- a/extensions/renderer/bindings/test_js_runner.h
+++ b/extensions/renderer/bindings/test_js_runner.h
@@ -5,7 +5,7 @@
#ifndef EXTENSIONS_RENDERER_BINDINGS_TEST_JS_RUNNER_H_
#define EXTENSIONS_RENDERER_BINDINGS_TEST_JS_RUNNER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "extensions/renderer/bindings/js_runner.h"
namespace extensions {
diff --git a/extensions/renderer/blob_native_handler.cc b/extensions/renderer/blob_native_handler.cc
index c9025d3..ebe4c7d 100644
--- a/extensions/renderer/blob_native_handler.cc
+++ b/extensions/renderer/blob_native_handler.cc
@@ -4,7 +4,7 @@
#include "extensions/renderer/blob_native_handler.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "extensions/renderer/script_context.h"
#include "third_party/blink/public/platform/web_url.h"
#include "third_party/blink/public/web/web_blob.h"
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
index 538bba1..c8f7cc1 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -10,11 +10,11 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/debug/alias.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/lazy_instance.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
diff --git a/extensions/renderer/extension_frame_helper.h b/extensions/renderer/extension_frame_helper.h
index 02b8cbd..ccf83a1 100644
--- a/extensions/renderer/extension_frame_helper.h
+++ b/extensions/renderer/extension_frame_helper.h
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/weak_ptr.h"
#include "base/values.h"
#include "content/public/renderer/render_frame_observer.h"
diff --git a/extensions/renderer/extension_js_runner.cc b/extensions/renderer/extension_js_runner.cc
index 5e3c4ab..9defd98 100644
--- a/extensions/renderer/extension_js_runner.cc
+++ b/extensions/renderer/extension_js_runner.cc
@@ -4,7 +4,7 @@
#include "extensions/renderer/extension_js_runner.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "content/public/renderer/worker_thread.h"
#include "extensions/renderer/script_context.h"
#include "third_party/blink/public/web/web_local_frame.h"
diff --git a/extensions/renderer/extensions_render_frame_observer.cc b/extensions/renderer/extensions_render_frame_observer.cc
index 5353579..5e11d6c 100644
--- a/extensions/renderer/extensions_render_frame_observer.cc
+++ b/extensions/renderer/extensions_render_frame_observer.cc
@@ -10,7 +10,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/string_split.h"
#include "base/strings/utf_string_conversions.h"
#include "content/public/renderer/render_frame.h"
diff --git a/extensions/renderer/gc_callback.cc b/extensions/renderer/gc_callback.cc
index 211d85e..173280a 100644
--- a/extensions/renderer/gc_callback.cc
+++ b/extensions/renderer/gc_callback.cc
@@ -4,7 +4,7 @@
#include "extensions/renderer/gc_callback.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
#include "extensions/renderer/script_context.h"
diff --git a/extensions/renderer/gc_callback.h b/extensions/renderer/gc_callback.h
index 9f936a1..62f9365 100644
--- a/extensions/renderer/gc_callback.h
+++ b/extensions/renderer/gc_callback.h
@@ -5,7 +5,7 @@
#ifndef EXTENSIONS_RENDERER_GC_CALLBACK_H_
#define EXTENSIONS_RENDERER_GC_CALLBACK_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/single_thread_task_runner.h"
diff --git a/extensions/renderer/gc_callback_unittest.cc b/extensions/renderer/gc_callback_unittest.cc
index 0df58fef..2450395 100644
--- a/extensions/renderer/gc_callback_unittest.cc
+++ b/extensions/renderer/gc_callback_unittest.cc
@@ -4,7 +4,7 @@
#include "extensions/renderer/gc_callback.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/weak_ptr.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
diff --git a/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc b/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc
index 119367c..379ec09 100644
--- a/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc
+++ b/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc
@@ -7,7 +7,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/no_destructor.h"
#include "components/guest_view/common/guest_view.mojom.h"
diff --git a/extensions/renderer/id_generator_custom_bindings.cc b/extensions/renderer/id_generator_custom_bindings.cc
index 855162a..11b9fe5 100644
--- a/extensions/renderer/id_generator_custom_bindings.cc
+++ b/extensions/renderer/id_generator_custom_bindings.cc
@@ -6,8 +6,8 @@
#include <stdint.h>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "extensions/renderer/script_context.h"
#include "v8/include/v8-function-callback.h"
diff --git a/extensions/renderer/lazy_background_page_native_handler.cc b/extensions/renderer/lazy_background_page_native_handler.cc
index 482c5c9..8e17c97 100644
--- a/extensions/renderer/lazy_background_page_native_handler.cc
+++ b/extensions/renderer/lazy_background_page_native_handler.cc
@@ -4,7 +4,7 @@
#include "extensions/renderer/lazy_background_page_native_handler.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "content/public/renderer/render_frame.h"
#include "extensions/common/extension_messages.h"
#include "extensions/renderer/extension_frame_helper.h"
diff --git a/extensions/renderer/localization_peer.cc b/extensions/renderer/localization_peer.cc
index 3ff41a1e..64aa68c 100644
--- a/extensions/renderer/localization_peer.cc
+++ b/extensions/renderer/localization_peer.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/strings/string_util.h"
#include "extensions/common/constants.h"
diff --git a/extensions/renderer/localization_peer_unittest.cc b/extensions/renderer/localization_peer_unittest.cc
index bc3ab3b..6477d3c 100644
--- a/extensions/renderer/localization_peer_unittest.cc
+++ b/extensions/renderer/localization_peer_unittest.cc
@@ -10,7 +10,7 @@
#include <memory>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/scoped_refptr.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
diff --git a/extensions/renderer/logging_native_handler.cc b/extensions/renderer/logging_native_handler.cc
index 2f5b49d..917bef7 100644
--- a/extensions/renderer/logging_native_handler.cc
+++ b/extensions/renderer/logging_native_handler.cc
@@ -4,7 +4,7 @@
#include "extensions/renderer/logging_native_handler.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "extensions/renderer/script_context.h"
#include "v8/include/v8-function-callback.h"
diff --git a/extensions/renderer/module_system.cc b/extensions/renderer/module_system.cc
index b7b1eb21..6c21452 100644
--- a/extensions/renderer/module_system.cc
+++ b/extensions/renderer/module_system.cc
@@ -4,8 +4,8 @@
#include "extensions/renderer/module_system.h"
-#include "base/bind.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
diff --git a/extensions/renderer/module_system_test.cc b/extensions/renderer/module_system_test.cc
index b6beff81..521c53a 100644
--- a/extensions/renderer/module_system_test.cc
+++ b/extensions/renderer/module_system_test.cc
@@ -11,11 +11,11 @@
#include <string>
#include <utility>
-#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/lazy_instance.h"
#include "base/path_service.h"
#include "base/run_loop.h"
diff --git a/extensions/renderer/module_system_unittest.cc b/extensions/renderer/module_system_unittest.cc
index 63c6e38..04fbc6d 100644
--- a/extensions/renderer/module_system_unittest.cc
+++ b/extensions/renderer/module_system_unittest.cc
@@ -9,7 +9,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "extensions/renderer/module_system_test.h"
namespace extensions {
diff --git a/extensions/renderer/native_extension_bindings_system.cc b/extensions/renderer/native_extension_bindings_system.cc
index 728f358..58e95433 100644
--- a/extensions/renderer/native_extension_bindings_system.cc
+++ b/extensions/renderer/native_extension_bindings_system.cc
@@ -6,9 +6,9 @@
#include <utility>
-#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/strings/string_piece.h"
#include "base/strings/stringprintf.h"
#include "components/crx_file/id_util.h"
diff --git a/extensions/renderer/object_backed_native_handler.h b/extensions/renderer/object_backed_native_handler.h
index de3a6bd..c4f9261c 100644
--- a/extensions/renderer/object_backed_native_handler.h
+++ b/extensions/renderer/object_backed_native_handler.h
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "extensions/renderer/native_handler.h"
#include "v8/include/v8-forward.h"
#include "v8/include/v8-persistent-handle.h"
diff --git a/extensions/renderer/process_info_native_handler.cc b/extensions/renderer/process_info_native_handler.cc
index 2ae85ad0..e9e1869 100644
--- a/extensions/renderer/process_info_native_handler.cc
+++ b/extensions/renderer/process_info_native_handler.cc
@@ -4,7 +4,7 @@
#include "extensions/renderer/process_info_native_handler.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "extensions/renderer/script_context.h"
#include "gin/converter.h"
diff --git a/extensions/renderer/render_frame_observer_natives.cc b/extensions/renderer/render_frame_observer_natives.cc
index 7f32cab..51f3bd9 100644
--- a/extensions/renderer/render_frame_observer_natives.cc
+++ b/extensions/renderer/render_frame_observer_natives.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
#include "content/public/renderer/render_frame.h"
diff --git a/extensions/renderer/runtime_custom_bindings.cc b/extensions/renderer/runtime_custom_bindings.cc
index 8aa982b..274e00c3 100644
--- a/extensions/renderer/runtime_custom_bindings.cc
+++ b/extensions/renderer/runtime_custom_bindings.cc
@@ -8,7 +8,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "extensions/common/extension.h"
#include "extensions/common/mojom/view_type.mojom.h"
#include "extensions/common/view_type_util.h"
diff --git a/extensions/renderer/script_context.h b/extensions/renderer/script_context.h
index fdde8a76..56213f1 100644
--- a/extensions/renderer/script_context.h
+++ b/extensions/renderer/script_context.h
@@ -10,8 +10,8 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/threading/thread_checker.h"
#include "base/unguessable_token.h"
#include "extensions/common/features/feature.h"
diff --git a/extensions/renderer/script_context_set.cc b/extensions/renderer/script_context_set.cc
index 1e71567..21ad2f0 100644
--- a/extensions/renderer/script_context_set.cc
+++ b/extensions/renderer/script_context_set.cc
@@ -4,8 +4,8 @@
#include "extensions/renderer/script_context_set.h"
-#include "base/bind.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
#include "content/public/common/url_constants.h"
diff --git a/extensions/renderer/script_context_set_iterable.h b/extensions/renderer/script_context_set_iterable.h
index 12647b5..8e16965 100644
--- a/extensions/renderer/script_context_set_iterable.h
+++ b/extensions/renderer/script_context_set_iterable.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
namespace content {
class RenderFrame;
diff --git a/extensions/renderer/script_injection.cc b/extensions/renderer/script_injection.cc
index bbeec904..43fd5ef2 100644
--- a/extensions/renderer/script_injection.cc
+++ b/extensions/renderer/script_injection.cc
@@ -7,8 +7,8 @@
#include <map>
#include <utility>
-#include "base/bind.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/metrics/histogram_macros.h"
#include "base/time/time.h"
diff --git a/extensions/renderer/script_injection.h b/extensions/renderer/script_injection.h
index 0f674e8..ab1871c 100644
--- a/extensions/renderer/script_injection.h
+++ b/extensions/renderer/script_injection.h
@@ -10,7 +10,7 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "extensions/common/mojom/host_id.mojom-forward.h"
#include "extensions/common/mojom/run_location.mojom-shared.h"
diff --git a/extensions/renderer/script_injection_manager.cc b/extensions/renderer/script_injection_manager.cc
index 9188655..3d26c2d6 100644
--- a/extensions/renderer/script_injection_manager.cc
+++ b/extensions/renderer/script_injection_manager.cc
@@ -8,9 +8,9 @@
#include <utility>
#include "base/auto_reset.h"
-#include "base/bind.h"
#include "base/containers/cxx20_erase.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/memory/weak_ptr.h"
#include "base/ranges/algorithm.h"
#include "base/values.h"
diff --git a/extensions/renderer/script_injection_manager.h b/extensions/renderer/script_injection_manager.h
index 7bc1298..696d6c4 100644
--- a/extensions/renderer/script_injection_manager.h
+++ b/extensions/renderer/script_injection_manager.h
@@ -12,7 +12,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/scoped_observation.h"
#include "extensions/common/mojom/frame.mojom.h"
#include "extensions/common/mojom/host_id.mojom-forward.h"
diff --git a/extensions/renderer/service_worker_natives.cc b/extensions/renderer/service_worker_natives.cc
index 8b978bb8..8822e17 100644
--- a/extensions/renderer/service_worker_natives.cc
+++ b/extensions/renderer/service_worker_natives.cc
@@ -4,8 +4,8 @@
#include "extensions/renderer/service_worker_natives.h"
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "extensions/renderer/script_context.h"
#include "v8/include/v8-function-callback.h"
diff --git a/extensions/renderer/set_icon_natives.cc b/extensions/renderer/set_icon_natives.cc
index 7f316c74..0cec33331 100644
--- a/extensions/renderer/set_icon_natives.cc
+++ b/extensions/renderer/set_icon_natives.cc
@@ -10,7 +10,7 @@
#include <limits>
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/string_number_conversions.h"
#include "extensions/renderer/script_context.h"
#include "gin/data_object_builder.h"
diff --git a/extensions/renderer/test_features_native_handler.cc b/extensions/renderer/test_features_native_handler.cc
index 6e210aa..026c7b0 100644
--- a/extensions/renderer/test_features_native_handler.cc
+++ b/extensions/renderer/test_features_native_handler.cc
@@ -4,7 +4,7 @@
#include "extensions/renderer/test_features_native_handler.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "content/public/renderer/v8_value_converter.h"
#include "extensions/common/extensions_client.h"
#include "extensions/common/features/json_feature_provider_source.h"
diff --git a/extensions/renderer/test_native_handler.cc b/extensions/renderer/test_native_handler.cc
index ce9044d..f28cefb 100644
--- a/extensions/renderer/test_native_handler.cc
+++ b/extensions/renderer/test_native_handler.cc
@@ -4,7 +4,7 @@
#include "extensions/renderer/test_native_handler.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "extensions/renderer/wake_event_page.h"
#include "v8/include/v8-function.h"
diff --git a/extensions/renderer/user_gestures_native_handler.cc b/extensions/renderer/user_gestures_native_handler.cc
index 9528152d..9cd7f22 100644
--- a/extensions/renderer/user_gestures_native_handler.cc
+++ b/extensions/renderer/user_gestures_native_handler.cc
@@ -4,7 +4,7 @@
#include "extensions/renderer/user_gestures_native_handler.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "extensions/renderer/extension_interaction_provider.h"
#include "extensions/renderer/script_context.h"
#include "third_party/blink/public/mojom/frame/user_activation_notification_type.mojom.h"
diff --git a/extensions/renderer/utils_native_handler.cc b/extensions/renderer/utils_native_handler.cc
index 3f86f94..8f27538 100644
--- a/extensions/renderer/utils_native_handler.cc
+++ b/extensions/renderer/utils_native_handler.cc
@@ -4,7 +4,7 @@
#include "extensions/renderer/utils_native_handler.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "extensions/renderer/script_context.h"
#include "third_party/blink/public/web/web_serialized_script_value.h"
diff --git a/extensions/renderer/v8_context_native_handler.cc b/extensions/renderer/v8_context_native_handler.cc
index d529212..4b45455 100644
--- a/extensions/renderer/v8_context_native_handler.cc
+++ b/extensions/renderer/v8_context_native_handler.cc
@@ -4,7 +4,7 @@
#include "extensions/renderer/v8_context_native_handler.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "extensions/common/features/feature.h"
#include "extensions/renderer/script_context.h"
#include "extensions/renderer/script_context_set.h"
diff --git a/extensions/renderer/v8_schema_registry.cc b/extensions/renderer/v8_schema_registry.cc
index 4243d22..81de19d 100644
--- a/extensions/renderer/v8_schema_registry.cc
+++ b/extensions/renderer/v8_schema_registry.cc
@@ -9,8 +9,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/values.h"
#include "content/public/renderer/v8_value_converter.h"
#include "extensions/common/extension_api.h"
diff --git a/extensions/renderer/wake_event_page.cc b/extensions/renderer/wake_event_page.cc
index 4c955691..1ed0a60 100644
--- a/extensions/renderer/wake_event_page.cc
+++ b/extensions/renderer/wake_event_page.cc
@@ -8,9 +8,9 @@
#include <utility>
#include "base/atomic_sequence_num.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/lazy_instance.h"
#include "content/public/renderer/render_thread.h"
#include "content/public/renderer/worker_thread.h"
diff --git a/extensions/renderer/wake_event_page.h b/extensions/renderer/wake_event_page.h
index 1e0296e..1e7d7ea 100644
--- a/extensions/renderer/wake_event_page.h
+++ b/extensions/renderer/wake_event_page.h
@@ -9,7 +9,7 @@
#include <string>
#include <unordered_map>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/synchronization/lock.h"
diff --git a/extensions/renderer/worker_thread_dispatcher.cc b/extensions/renderer/worker_thread_dispatcher.cc
index f7c10bb4..8b6a29c 100644
--- a/extensions/renderer/worker_thread_dispatcher.cc
+++ b/extensions/renderer/worker_thread_dispatcher.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/task/single_thread_task_runner.h"
#include "base/threading/platform_thread.h"
diff --git a/extensions/shell/browser/api/file_system/shell_file_system_delegate.cc b/extensions/shell/browser/api/file_system/shell_file_system_delegate.cc
index fab6cc0e..e207343d 100644
--- a/extensions/shell/browser/api/file_system/shell_file_system_delegate.cc
+++ b/extensions/shell/browser/api/file_system/shell_file_system_delegate.cc
@@ -5,8 +5,8 @@
#include "extensions/shell/browser/api/file_system/shell_file_system_delegate.h"
#include "apps/saved_files_service.h"
-#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/functional/callback.h"
#include "base/notreached.h"
#include "extensions/browser/api/file_system/saved_files_service_interface.h"
#include "extensions/browser/extension_function.h"
diff --git a/extensions/shell/browser/shell_browser_context.cc b/extensions/shell/browser/shell_browser_context.cc
index e417f2d9..8846b62 100644
--- a/extensions/shell/browser/shell_browser_context.cc
+++ b/extensions/shell/browser/shell_browser_context.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/scoped_refptr.h"
#include "components/guest_view/browser/guest_view_manager.h"
#include "extensions/shell/browser/shell_special_storage_policy.h"
diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc
index 030ec24..1ee3576 100644
--- a/extensions/shell/browser/shell_browser_main_parts.cc
+++ b/extensions/shell/browser/shell_browser_main_parts.cc
@@ -8,8 +8,8 @@
#include <string>
#include "apps/browser_context_keyed_service_factories.h"
-#include "base/bind.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
diff --git a/extensions/shell/browser/shell_desktop_controller_aura.h b/extensions/shell/browser/shell_desktop_controller_aura.h
index 3bcaae9f..53edfbb 100644
--- a/extensions/shell/browser/shell_desktop_controller_aura.h
+++ b/extensions/shell/browser/shell_desktop_controller_aura.h
@@ -8,8 +8,8 @@
#include <map>
#include <memory>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
diff --git a/extensions/shell/browser/shell_desktop_controller_aura_browsertest.cc b/extensions/shell/browser/shell_desktop_controller_aura_browsertest.cc
index 4e6641d..6bde319 100644
--- a/extensions/shell/browser/shell_desktop_controller_aura_browsertest.cc
+++ b/extensions/shell/browser/shell_desktop_controller_aura_browsertest.cc
@@ -6,7 +6,7 @@
#include <memory>
-#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/extensions/shell/browser/shell_extension_loader.cc b/extensions/shell/browser/shell_extension_loader.cc
index 378c460..87259d4 100644
--- a/extensions/shell/browser/shell_extension_loader.cc
+++ b/extensions/shell/browser/shell_extension_loader.cc
@@ -6,9 +6,9 @@
#include "apps/launcher.h"
#include "base/auto_reset.h"
-#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/task/sequenced_task_runner.h"
#include "components/services/app_service/public/mojom/types.mojom-shared.h"
diff --git a/extensions/shell/browser/shell_extension_system.cc b/extensions/shell/browser/shell_extension_system.cc
index 2c219f4..9efd96f 100644
--- a/extensions/shell/browser/shell_extension_system.cc
+++ b/extensions/shell/browser/shell_extension_system.cc
@@ -8,9 +8,9 @@
#include <string>
#include "apps/launcher.h"
-#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "components/services/app_service/public/mojom/types.mojom-shared.h"
#include "components/value_store/value_store_factory_impl.h"
#include "content/public/browser/browser_context.h"
diff --git a/extensions/shell/browser/shell_extensions_browser_client.cc b/extensions/shell/browser/shell_extensions_browser_client.cc
index 25e3a318..7fcd119 100644
--- a/extensions/shell/browser/shell_extensions_browser_client.cc
+++ b/extensions/shell/browser/shell_extensions_browser_client.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 "build/build_config.h"
#include "build/chromeos_buildflags.h"
diff --git a/extensions/shell/browser/shell_network_controller_chromeos.cc b/extensions/shell/browser/shell_network_controller_chromeos.cc
index 849f3a6..3b19c1f 100644
--- a/extensions/shell/browser/shell_network_controller_chromeos.cc
+++ b/extensions/shell/browser/shell_network_controller_chromeos.cc
@@ -4,8 +4,8 @@
#include "extensions/shell/browser/shell_network_controller_chromeos.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/stringprintf.h"
diff --git a/extensions/shell/browser/shell_speech_recognition_manager_delegate.cc b/extensions/shell/browser/shell_speech_recognition_manager_delegate.cc
index 2f36c8d1..774838f 100644
--- a/extensions/shell/browser/shell_speech_recognition_manager_delegate.cc
+++ b/extensions/shell/browser/shell_speech_recognition_manager_delegate.cc
@@ -4,7 +4,7 @@
#include "extensions/shell/browser/shell_speech_recognition_manager_delegate.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_frame_host.h"
diff --git a/extensions/shell/browser/system_logs/shell_system_logs_fetcher_unittest.cc b/extensions/shell/browser/system_logs/shell_system_logs_fetcher_unittest.cc
index 83f350cf..268fc89 100644
--- a/extensions/shell/browser/system_logs/shell_system_logs_fetcher_unittest.cc
+++ b/extensions/shell/browser/system_logs/shell_system_logs_fetcher_unittest.cc
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
#include "base/strings/string_util.h"
diff --git a/extensions/test/extension_test_message_listener.h b/extensions/test/extension_test_message_listener.h
index 65316a6..6d776b1 100644
--- a/extensions/test/extension_test_message_listener.h
+++ b/extensions/test/extension_test_message_listener.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/scoped_observation.h"
diff --git a/extensions/test/extension_test_notification_observer.cc b/extensions/test/extension_test_notification_observer.cc
index f4e495d..46b3d66 100644
--- a/extensions/test/extension_test_notification_observer.cc
+++ b/extensions/test/extension_test_notification_observer.cc
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_registrar.h"
diff --git a/extensions/test/extension_test_notification_observer.h b/extensions/test/extension_test_notification_observer.h
index 0bbd4779..4d7542d 100644
--- a/extensions/test/extension_test_notification_observer.h
+++ b/extensions/test/extension_test_notification_observer.h
@@ -9,8 +9,8 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/callback_list.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/scoped_observation.h"
#include "content/public/browser/notification_observer.h"
diff --git a/extensions/test/extensions_unittests_main.cc b/extensions/test/extensions_unittests_main.cc
index 1835933..5192d47 100644
--- a/extensions/test/extensions_unittests_main.cc
+++ b/extensions/test/extensions_unittests_main.cc
@@ -5,7 +5,7 @@
#include <memory>
#include "base/base_paths.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/path_service.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_io_thread.h"
diff --git a/extensions/test/result_catcher.h b/extensions/test/result_catcher.h
index 1ffa9d2b..e266d486 100644
--- a/extensions/test/result_catcher.h
+++ b/extensions/test/result_catcher.h
@@ -7,8 +7,8 @@
#include <string>
-#include "base/callback.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/scoped_observation.h"
#include "extensions/browser/api/test/test_api_observer.h"
diff --git a/fuchsia_web/common/test/fit_adapter.h b/fuchsia_web/common/test/fit_adapter.h
index c9341e70..dbb172a 100644
--- a/fuchsia_web/common/test/fit_adapter.h
+++ b/fuchsia_web/common/test/fit_adapter.h
@@ -7,7 +7,7 @@
#include <lib/fit/function.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
// Adapts a base::OnceCallback<> to a fit::function<>, to allow //base callbacks
// to be used directly as FIDL result callbacks.
diff --git a/fuchsia_web/common/test/run_all_integration_tests.cc b/fuchsia_web/common/test/run_all_integration_tests.cc
index 82d96f8..6827b11 100644
--- a/fuchsia_web/common/test/run_all_integration_tests.cc
+++ b/fuchsia_web/common/test/run_all_integration_tests.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_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/system/sys_info.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
diff --git a/fuchsia_web/common/test/test_navigation_listener.cc b/fuchsia_web/common/test/test_navigation_listener.cc
index bed09be..08a53a2 100644
--- a/fuchsia_web/common/test/test_navigation_listener.cc
+++ b/fuchsia_web/common/test/test_navigation_listener.cc
@@ -8,9 +8,9 @@
#include <utility>
#include "base/auto_reset.h"
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/run_loop.h"
#include "base/strings/string_piece.h"
diff --git a/fuchsia_web/common/test/test_navigation_listener.h b/fuchsia_web/common/test/test_navigation_listener.h
index 704cc49..3e1249f 100644
--- a/fuchsia_web/common/test/test_navigation_listener.h
+++ b/fuchsia_web/common/test/test_navigation_listener.h
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/strings/string_piece.h"
class GURL;
diff --git a/fuchsia_web/runners/cast/api_bindings_client.cc b/fuchsia_web/runners/cast/api_bindings_client.cc
index 445ea64..5fcc4ad 100644
--- a/fuchsia_web/runners/cast/api_bindings_client.cc
+++ b/fuchsia_web/runners/cast/api_bindings_client.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/fuchsia/fuchsia_logging.h"
+#include "base/functional/bind.h"
#include "base/strings/string_piece.h"
#include "base/task/single_thread_task_runner.h"
#include "components/cast/message_port/fuchsia/message_port_fuchsia.h"
diff --git a/fuchsia_web/runners/cast/cast_component.cc b/fuchsia_web/runners/cast/cast_component.cc
index f3c5ace9d..c31e300 100644
--- a/fuchsia_web/runners/cast/cast_component.cc
+++ b/fuchsia_web/runners/cast/cast_component.cc
@@ -11,9 +11,9 @@
#include <utility>
#include "base/auto_reset.h"
-#include "base/bind.h"
#include "base/files/file_util.h"
#include "base/fuchsia/fuchsia_logging.h"
+#include "base/functional/bind.h"
#include "base/path_service.h"
#include "base/task/current_thread.h"
#include "components/cast/message_port/fuchsia/create_web_message.h"
diff --git a/fuchsia_web/runners/cast/cast_runner.cc b/fuchsia_web/runners/cast/cast_runner.cc
index 59e4277..5f0162b 100644
--- a/fuchsia_web/runners/cast/cast_runner.cc
+++ b/fuchsia_web/runners/cast/cast_runner.cc
@@ -10,7 +10,6 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
@@ -18,6 +17,7 @@
#include "base/fuchsia/file_utils.h"
#include "base/fuchsia/fuchsia_logging.h"
#include "base/fuchsia/process_context.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/process/process.h"
#include "base/strings/strcat.h"
diff --git a/fuchsia_web/runners/cast/cast_runner.h b/fuchsia_web/runners/cast/cast_runner.h
index 76f23e23..b62c432 100644
--- a/fuchsia_web/runners/cast/cast_runner.h
+++ b/fuchsia_web/runners/cast/cast_runner.h
@@ -11,10 +11,10 @@
#include <set>
#include <vector>
-#include "base/callback.h"
#include "base/containers/flat_set.h"
#include "base/containers/unique_ptr_adapters.h"
#include "base/fuchsia/startup_context.h"
+#include "base/functional/callback.h"
#include "fuchsia_web/runners/cast/cast_component.h"
#include "fuchsia_web/runners/cast/fidl/fidl/chromium/cast/cpp/fidl.h"
#include "fuchsia_web/runners/cast/pending_cast_component.h"
diff --git a/fuchsia_web/runners/cast/cast_runner_cfv1_shim_integration_test.cc b/fuchsia_web/runners/cast/cast_runner_cfv1_shim_integration_test.cc
index 5e7a801..3ce9bd7 100644
--- a/fuchsia_web/runners/cast/cast_runner_cfv1_shim_integration_test.cc
+++ b/fuchsia_web/runners/cast/cast_runner_cfv1_shim_integration_test.cc
@@ -15,12 +15,12 @@
#include <vector>
#include "base/auto_reset.h"
-#include "base/callback.h"
#include "base/command_line.h"
#include "base/fuchsia/fuchsia_logging.h"
#include "base/fuchsia/process_context.h"
#include "base/fuchsia/scoped_service_publisher.h"
#include "base/fuchsia/test_component_controller.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/run_loop.h"
#include "base/test/bind.h"
diff --git a/fuchsia_web/runners/cast/cast_runner_integration_test.cc b/fuchsia_web/runners/cast/cast_runner_integration_test.cc
index 895715e..d6a3b6c 100644
--- a/fuchsia_web/runners/cast/cast_runner_integration_test.cc
+++ b/fuchsia_web/runners/cast/cast_runner_integration_test.cc
@@ -21,7 +21,6 @@
#include "base/auto_reset.h"
#include "base/barrier_closure.h"
#include "base/base_paths.h"
-#include "base/callback_helpers.h"
#include "base/files/file_util.h"
#include "base/fuchsia/file_utils.h"
#include "base/fuchsia/filtered_service_directory.h"
@@ -29,6 +28,7 @@
#include "base/fuchsia/mem_buffer_util.h"
#include "base/fuchsia/scoped_service_binding.h"
#include "base/fuchsia/test_component_controller.h"
+#include "base/functional/callback_helpers.h"
#include "base/path_service.h"
#include "base/run_loop.h"
#include "base/strings/strcat.h"
diff --git a/fuchsia_web/runners/cast/fake_api_bindings.h b/fuchsia_web/runners/cast/fake_api_bindings.h
index cee08875..d6db01a 100644
--- a/fuchsia_web/runners/cast/fake_api_bindings.h
+++ b/fuchsia_web/runners/cast/fake_api_bindings.h
@@ -9,8 +9,8 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
#include "base/containers/flat_map.h"
+#include "base/functional/callback.h"
#include "base/strings/string_piece.h"
#include "fuchsia_web/runners/cast/fidl/fidl/chromium/cast/cpp/fidl.h"
diff --git a/fuchsia_web/runners/cast/named_message_port_connector_fuchsia_browsertest.cc b/fuchsia_web/runners/cast/named_message_port_connector_fuchsia_browsertest.cc
index ca9017bc..49afba82 100644
--- a/fuchsia_web/runners/cast/named_message_port_connector_fuchsia_browsertest.cc
+++ b/fuchsia_web/runners/cast/named_message_port_connector_fuchsia_browsertest.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "base/barrier_closure.h"
-#include "base/bind.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/path_service.h"
#include "base/strings/string_piece.h"
#include "components/cast/message_port/fuchsia/create_web_message.h"
diff --git a/fuchsia_web/runners/cast/pending_cast_component.cc b/fuchsia_web/runners/cast/pending_cast_component.cc
index 8ff1329..f71f333 100644
--- a/fuchsia_web/runners/cast/pending_cast_component.cc
+++ b/fuchsia_web/runners/cast/pending_cast_component.cc
@@ -4,9 +4,9 @@
#include "fuchsia_web/runners/cast/pending_cast_component.h"
-#include "base/bind.h"
#include "base/check.h"
#include "base/fuchsia/fuchsia_logging.h"
+#include "base/functional/bind.h"
#include "base/strings/string_piece.h"
PendingCastComponent::PendingCastComponent(
diff --git a/fuchsia_web/runners/common/modular/agent_impl.cc b/fuchsia_web/runners/common/modular/agent_impl.cc
index 979d130..6e6f2bb8 100644
--- a/fuchsia_web/runners/common/modular/agent_impl.cc
+++ b/fuchsia_web/runners/common/modular/agent_impl.cc
@@ -9,9 +9,9 @@
#include <utility>
-#include "base/bind.h"
#include "base/fuchsia/fuchsia_logging.h"
#include "base/fuchsia/process_context.h"
+#include "base/functional/bind.h"
namespace cr_fuchsia {
diff --git a/fuchsia_web/runners/common/modular/agent_impl.h b/fuchsia_web/runners/common/modular/agent_impl.h
index ab7cf3a..4313b0f 100644
--- a/fuchsia_web/runners/common/modular/agent_impl.h
+++ b/fuchsia_web/runners/common/modular/agent_impl.h
@@ -15,10 +15,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/containers/flat_map.h"
#include "base/fuchsia/scoped_service_binding.h"
#include "base/fuchsia/service_provider_impl.h"
+#include "base/functional/bind.h"
#include "base/strings/string_piece.h"
namespace sys {
diff --git a/fuchsia_web/runners/common/web_component.cc b/fuchsia_web/runners/common/web_component.cc
index 959a7041..2212af7 100644
--- a/fuchsia_web/runners/common/web_component.cc
+++ b/fuchsia_web/runners/common/web_component.cc
@@ -10,8 +10,8 @@
#include <lib/sys/cpp/component_context.h>
#include <lib/ui/scenic/cpp/view_ref_pair.h>
-#include "base/bind.h"
#include "base/fuchsia/fuchsia_logging.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/strings/string_piece.h"
#include "fuchsia_web/runners/common/web_content_runner.h"
diff --git a/fuchsia_web/runners/common/web_content_runner.cc b/fuchsia_web/runners/common/web_content_runner.cc
index 9cfb79ab..cad2ca0 100644
--- a/fuchsia_web/runners/common/web_content_runner.cc
+++ b/fuchsia_web/runners/common/web_content_runner.cc
@@ -11,7 +11,6 @@
#include <lib/sys/cpp/service_directory.h>
#include <utility>
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file.h"
#include "base/files/file_util.h"
@@ -20,6 +19,7 @@
#include "base/fuchsia/process_context.h"
#include "base/fuchsia/scoped_service_binding.h"
#include "base/fuchsia/startup_context.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/strings/stringprintf.h"
#include "fuchsia_web/runners/buildflags.h"
diff --git a/fuchsia_web/runners/common/web_content_runner.h b/fuchsia_web/runners/common/web_content_runner.h
index 853db8c..b35c1db 100644
--- a/fuchsia_web/runners/common/web_content_runner.h
+++ b/fuchsia_web/runners/common/web_content_runner.h
@@ -14,9 +14,9 @@
#include <set>
#include <vector>
-#include "base/callback.h"
#include "base/command_line.h"
#include "base/containers/unique_ptr_adapters.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
class WebComponent;
diff --git a/fuchsia_web/runners/web/web_runner_smoke_test.cc b/fuchsia_web/runners/web/web_runner_smoke_test.cc
index 1f2d7b2..50a3c5d 100644
--- a/fuchsia_web/runners/web/web_runner_smoke_test.cc
+++ b/fuchsia_web/runners/web/web_runner_smoke_test.cc
@@ -7,12 +7,12 @@
#include <fuchsia/sys/cpp/fidl.h>
#include <lib/sys/cpp/component_context.h>
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_enumerator.h"
#include "base/fuchsia/process_context.h"
#include "base/fuchsia/scoped_service_binding.h"
#include "base/fuchsia/service_provider_impl.h"
+#include "base/functional/bind.h"
#include "base/process/process.h"
#include "base/strings/stringprintf.h"
#include "base/test/task_environment.h"
diff --git a/fuchsia_web/webengine/browser/cast_streaming_browsertest.cc b/fuchsia_web/webengine/browser/cast_streaming_browsertest.cc
index dbe9660..9b4db20 100644
--- a/fuchsia_web/webengine/browser/cast_streaming_browsertest.cc
+++ b/fuchsia_web/webengine/browser/cast_streaming_browsertest.cc
@@ -4,8 +4,8 @@
#include <fuchsia/mem/cpp/fidl.h>
-#include "base/callback_helpers.h"
#include "base/fuchsia/mem_buffer_util.h"
+#include "base/functional/callback_helpers.h"
#include "base/test/test_future.h"
#include "base/threading/platform_thread.h"
#include "components/cast/message_port/fuchsia/message_port_fuchsia.h"
diff --git a/fuchsia_web/webengine/browser/client_hints_browsertest.cc b/fuchsia_web/webengine/browser/client_hints_browsertest.cc
index 27777b12..9b5e32d 100644
--- a/fuchsia_web/webengine/browser/client_hints_browsertest.cc
+++ b/fuchsia_web/webengine/browser/client_hints_browsertest.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/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/strings/string_number_conversions.h"
#include "build/build_config.h"
#include "components/version_info/version_info.h"
diff --git a/fuchsia_web/webengine/browser/context_impl.cc b/fuchsia_web/webengine/browser/context_impl.cc
index 921a47f..176f414 100644
--- a/fuchsia_web/webengine/browser/context_impl.cc
+++ b/fuchsia_web/webengine/browser/context_impl.cc
@@ -10,10 +10,10 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/fuchsia/fuchsia_logging.h"
#include "base/fuchsia/koid.h"
#include "base/fuchsia/mem_buffer_util.h"
+#include "base/functional/bind.h"
#include "base/strings/stringprintf.h"
#include "base/trace_event/trace_event.h"
#include "base/trace_event/typed_macros.h"
diff --git a/fuchsia_web/webengine/browser/cookie_manager_impl.h b/fuchsia_web/webengine/browser/cookie_manager_impl.h
index 8200720..29edd9c 100644
--- a/fuchsia_web/webengine/browser/cookie_manager_impl.h
+++ b/fuchsia_web/webengine/browser/cookie_manager_impl.h
@@ -7,7 +7,7 @@
#include <fuchsia/web/cpp/fidl.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "fuchsia_web/webengine/web_engine_export.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "services/network/public/mojom/cookie_manager.mojom.h"
diff --git a/fuchsia_web/webengine/browser/cookie_manager_impl_unittest.cc b/fuchsia_web/webengine/browser/cookie_manager_impl_unittest.cc
index f42cadb..cb8556b 100644
--- a/fuchsia_web/webengine/browser/cookie_manager_impl_unittest.cc
+++ b/fuchsia_web/webengine/browser/cookie_manager_impl_unittest.cc
@@ -7,7 +7,7 @@
#include <map>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/strings/string_piece.h"
#include "base/test/bind.h"
diff --git a/fuchsia_web/webengine/browser/fake_semantic_tree.h b/fuchsia_web/webengine/browser/fake_semantic_tree.h
index 9510103d..74bd6fb9 100644
--- a/fuchsia_web/webengine/browser/fake_semantic_tree.h
+++ b/fuchsia_web/webengine/browser/fake_semantic_tree.h
@@ -10,7 +10,7 @@
#include <lib/fidl/cpp/binding.h>
#include <unordered_map>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/strings/string_piece_forward.h"
class FakeSemanticTree
diff --git a/fuchsia_web/webengine/browser/fake_semantics_manager.h b/fuchsia_web/webengine/browser/fake_semantics_manager.h
index a79896c..7edfb3e5 100644
--- a/fuchsia_web/webengine/browser/fake_semantics_manager.h
+++ b/fuchsia_web/webengine/browser/fake_semantics_manager.h
@@ -10,7 +10,7 @@
#include <fuchsia/ui/scenic/cpp/fidl.h>
#include <lib/fidl/cpp/binding.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "fuchsia_web/webengine/browser/fake_semantic_tree.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/fuchsia_web/webengine/browser/frame_impl.cc b/fuchsia_web/webengine/browser/frame_impl.cc
index 1d5e4398..1707876f 100644
--- a/fuchsia_web/webengine/browser/frame_impl.cc
+++ b/fuchsia_web/webengine/browser/frame_impl.cc
@@ -11,12 +11,12 @@
#include <limits>
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/containers/contains.h"
#include "base/fuchsia/fuchsia_logging.h"
#include "base/fuchsia/mem_buffer_util.h"
#include "base/fuchsia/process_context.h"
+#include "base/functional/bind.h"
#include "base/json/json_writer.h"
#include "base/metrics/user_metrics.h"
#include "base/strings/string_piece.h"
diff --git a/fuchsia_web/webengine/browser/frame_permission_controller.h b/fuchsia_web/webengine/browser/frame_permission_controller.h
index 87739af..3e89cce8 100644
--- a/fuchsia_web/webengine/browser/frame_permission_controller.h
+++ b/fuchsia_web/webengine/browser/frame_permission_controller.h
@@ -8,8 +8,8 @@
#include <array>
#include <vector>
-#include "base/callback_forward.h"
#include "base/containers/flat_map.h"
+#include "base/functional/callback_forward.h"
#include "third_party/blink/public/common/permissions/permission_utils.h"
#include "third_party/blink/public/mojom/permissions/permission_status.mojom.h"
diff --git a/fuchsia_web/webengine/browser/media_player_impl.h b/fuchsia_web/webengine/browser/media_player_impl.h
index 29a4cb9..a93681e2 100644
--- a/fuchsia_web/webengine/browser/media_player_impl.h
+++ b/fuchsia_web/webengine/browser/media_player_impl.h
@@ -10,7 +10,7 @@
#include <lib/fidl/cpp/interface_request.h>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "fuchsia_web/webengine/web_engine_export.h"
#include "mojo/public/cpp/bindings/receiver.h"
#include "services/media_session/public/mojom/media_session.mojom.h"
diff --git a/fuchsia_web/webengine/browser/message_port.cc b/fuchsia_web/webengine/browser/message_port.cc
index 93c4b99..8fda5e2 100644
--- a/fuchsia_web/webengine/browser/message_port.cc
+++ b/fuchsia_web/webengine/browser/message_port.cc
@@ -15,11 +15,11 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/check.h"
#include "base/containers/circular_deque.h"
#include "base/fuchsia/fuchsia_logging.h"
#include "base/fuchsia/mem_buffer_util.h"
+#include "base/functional/bind.h"
#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/fuchsia_web/webengine/browser/mock_virtual_keyboard.h b/fuchsia_web/webengine/browser/mock_virtual_keyboard.h
index a767966e..4c3183b 100644
--- a/fuchsia_web/webengine/browser/mock_virtual_keyboard.h
+++ b/fuchsia_web/webengine/browser/mock_virtual_keyboard.h
@@ -8,9 +8,9 @@
#include <fuchsia/input/virtualkeyboard/cpp/fidl.h>
#include <lib/fidl/cpp/binding.h>
-#include "base/callback.h"
#include "base/fuchsia/scoped_service_binding.h"
#include "base/fuchsia/test_component_context_for_process.h"
+#include "base/functional/callback.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/fuchsia_web/webengine/browser/receiver_session_client.cc b/fuchsia_web/webengine/browser/receiver_session_client.cc
index cfa9270..3c94021 100644
--- a/fuchsia_web/webengine/browser/receiver_session_client.cc
+++ b/fuchsia_web/webengine/browser/receiver_session_client.cc
@@ -4,7 +4,7 @@
#include "fuchsia_web/webengine/browser/receiver_session_client.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "components/cast/message_port/fuchsia/message_port_fuchsia.h"
#include "components/cast/message_port/message_port.h"
#include "components/cast_streaming/browser/public/receiver_session.h"
diff --git a/fuchsia_web/webengine/browser/theme_manager.cc b/fuchsia_web/webengine/browser/theme_manager.cc
index fa58fa6..3413e3c 100644
--- a/fuchsia_web/webengine/browser/theme_manager.cc
+++ b/fuchsia_web/webengine/browser/theme_manager.cc
@@ -4,10 +4,10 @@
#include "fuchsia_web/webengine/browser/theme_manager.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/check.h"
#include "base/fuchsia/fuchsia_logging.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "third_party/blink/public/common/web_preferences/web_preferences.h"
#include "third_party/blink/public/mojom/css/preferred_color_scheme.mojom.h"
#include "third_party/blink/public/mojom/webpreferences/web_preferences.mojom.h"
diff --git a/fuchsia_web/webengine/browser/virtual_keyboard_browsertest.cc b/fuchsia_web/webengine/browser/virtual_keyboard_browsertest.cc
index 47afeb3..6203645 100644
--- a/fuchsia_web/webengine/browser/virtual_keyboard_browsertest.cc
+++ b/fuchsia_web/webengine/browser/virtual_keyboard_browsertest.cc
@@ -6,11 +6,11 @@
#include <fuchsia/ui/input3/cpp/fidl.h>
#include <lib/fit/function.h>
-#include "base/callback.h"
#include "base/fuchsia/fuchsia_logging.h"
#include "base/fuchsia/koid.h"
#include "base/fuchsia/scoped_service_binding.h"
#include "base/fuchsia/test_component_context_for_process.h"
+#include "base/functional/callback.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/test/scoped_feature_list.h"
diff --git a/fuchsia_web/webengine/browser/web_engine_browser_main_parts.cc b/fuchsia_web/webengine/browser/web_engine_browser_main_parts.cc
index a11c8b3a..027d0c0b 100644
--- a/fuchsia_web/webengine/browser/web_engine_browser_main_parts.cc
+++ b/fuchsia_web/webengine/browser/web_engine_browser_main_parts.cc
@@ -12,8 +12,6 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/files/important_file_writer_cleaner.h"
@@ -22,6 +20,8 @@
#include "base/fuchsia/intl_profile_watcher.h"
#include "base/fuchsia/koid.h"
#include "base/fuchsia/process_context.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/i18n/rtl.h"
#include "base/logging.h"
#include "base/no_destructor.h"
diff --git a/fuchsia_web/webengine/browser/web_engine_content_browser_client.cc b/fuchsia_web/webengine/browser/web_engine_content_browser_client.cc
index 5a5c95a..f5e1e54b 100644
--- a/fuchsia_web/webengine/browser/web_engine_content_browser_client.cc
+++ b/fuchsia_web/webengine/browser/web_engine_content_browser_client.cc
@@ -7,8 +7,8 @@
#include <string>
#include <utility>
-#include "base/callback.h"
#include "base/command_line.h"
+#include "base/functional/callback.h"
#include "base/i18n/rtl.h"
#include "base/strings/string_split.h"
#include "build/chromecast_buildflags.h"
diff --git a/fuchsia_web/webengine/browser/web_engine_devtools_controller.h b/fuchsia_web/webengine/browser/web_engine_devtools_controller.h
index 480b4a3..64a48756 100644
--- a/fuchsia_web/webengine/browser/web_engine_devtools_controller.h
+++ b/fuchsia_web/webengine/browser/web_engine_devtools_controller.h
@@ -5,7 +5,7 @@
#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_WEB_ENGINE_DEVTOOLS_CONTROLLER_H_
#define FUCHSIA_WEB_WEBENGINE_BROWSER_WEB_ENGINE_DEVTOOLS_CONTROLLER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "content/public/browser/devtools_agent_host.h"
namespace base {
diff --git a/fuchsia_web/webengine/browser/web_engine_media_resource_provider_impl.cc b/fuchsia_web/webengine/browser/web_engine_media_resource_provider_impl.cc
index c3bd363..ab60dc07 100644
--- a/fuchsia_web/webengine/browser/web_engine_media_resource_provider_impl.cc
+++ b/fuchsia_web/webengine/browser/web_engine_media_resource_provider_impl.cc
@@ -7,9 +7,9 @@
#include <lib/fidl/cpp/interface_handle.h>
#include <lib/sys/cpp/component_context.h>
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/fuchsia/process_context.h"
+#include "base/functional/bind.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/document_service.h"
#include "content/public/browser/permission_controller.h"
diff --git a/fuchsia_web/webengine/browser/web_engine_net_log_observer.cc b/fuchsia_web/webengine/browser/web_engine_net_log_observer.cc
index 50862c9a..28f9621f 100644
--- a/fuchsia_web/webengine/browser/web_engine_net_log_observer.cc
+++ b/fuchsia_web/webengine/browser/web_engine_net_log_observer.cc
@@ -7,10 +7,10 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/values.h"
#include "net/log/file_net_log_observer.h"
#include "net/log/net_log.h"
diff --git a/fuchsia_web/webengine/browser/web_engine_permission_delegate.cc b/fuchsia_web/webengine/browser/web_engine_permission_delegate.cc
index 14a2731..af7ce4cd81 100644
--- a/fuchsia_web/webengine/browser/web_engine_permission_delegate.cc
+++ b/fuchsia_web/webengine/browser/web_engine_permission_delegate.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/callback.h"
#include "base/check_op.h"
+#include "base/functional/callback.h"
#include "base/notreached.h"
#include "components/permissions/permission_util.h"
#include "content/public/browser/permission_controller.h"
diff --git a/fuchsia_web/webengine/context_provider_impl_unittest.cc b/fuchsia_web/webengine/context_provider_impl_unittest.cc
index ebef7c8..f95e394b 100644
--- a/fuchsia_web/webengine/context_provider_impl_unittest.cc
+++ b/fuchsia_web/webengine/context_provider_impl_unittest.cc
@@ -20,9 +20,6 @@
#include <vector>
#include "base/base_switches.h"
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/files/file.h"
#include "base/files/file_util.h"
@@ -32,6 +29,9 @@
#include "base/fuchsia/process_context.h"
#include "base/fuchsia/scoped_service_binding.h"
#include "base/fuchsia/test_component_context_for_process.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/path_service.h"
#include "base/strings/strcat.h"
#include "base/test/bind.h"
diff --git a/fuchsia_web/webengine/fake_context.h b/fuchsia_web/webengine/fake_context.h
index 977b214..bacd55f 100644
--- a/fuchsia_web/webengine/fake_context.h
+++ b/fuchsia_web/webengine/fake_context.h
@@ -12,7 +12,7 @@
#include <utility>
-#include "base/callback.h"
+#include "base/functional/callback.h"
// A fake Frame implementation that manages its own lifetime.
class FakeFrame : public fuchsia::web::testing::Frame_TestBase {
diff --git a/fuchsia_web/webengine/renderer/web_engine_audio_renderer.cc b/fuchsia_web/webengine/renderer/web_engine_audio_renderer.cc
index d6edfc9e..e185442 100644
--- a/fuchsia_web/webengine/renderer/web_engine_audio_renderer.cc
+++ b/fuchsia_web/webengine/renderer/web_engine_audio_renderer.cc
@@ -6,8 +6,8 @@
#include <lib/sys/cpp/component_context.h>
-#include "base/bind.h"
#include "base/fuchsia/fuchsia_logging.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/task/sequenced_task_runner.h"
#include "base/time/time.h"
diff --git a/fuchsia_web/webengine/renderer/web_engine_media_renderer_factory.cc b/fuchsia_web/webengine/renderer/web_engine_media_renderer_factory.cc
index cdc8a1b..c270554 100644
--- a/fuchsia_web/webengine/renderer/web_engine_media_renderer_factory.cc
+++ b/fuchsia_web/webengine/renderer/web_engine_media_renderer_factory.cc
@@ -8,7 +8,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "fuchsia_web/webengine/renderer/web_engine_audio_renderer.h"
#include "media/base/decoder_factory.h"
diff --git a/fuchsia_web/webengine/renderer/web_engine_media_renderer_factory.h b/fuchsia_web/webengine/renderer/web_engine_media_renderer_factory.h
index 08a400d8..21d5d1f 100644
--- a/fuchsia_web/webengine/renderer/web_engine_media_renderer_factory.h
+++ b/fuchsia_web/webengine/renderer/web_engine_media_renderer_factory.h
@@ -8,7 +8,7 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/task/sequenced_task_runner.h"
#include "fuchsia_web/webengine/mojom/web_engine_media_resource_provider.mojom.h"
#include "media/base/renderer_factory.h"
diff --git a/fuchsia_web/webengine/renderer/web_engine_render_frame_observer.cc b/fuchsia_web/webengine/renderer/web_engine_render_frame_observer.cc
index 8a6a258d..29352e8 100644
--- a/fuchsia_web/webengine/renderer/web_engine_render_frame_observer.cc
+++ b/fuchsia_web/webengine/renderer/web_engine_render_frame_observer.cc
@@ -4,7 +4,7 @@
#include "fuchsia_web/webengine/renderer/web_engine_render_frame_observer.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "content/public/renderer/render_frame.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
diff --git a/fuchsia_web/webengine/renderer/web_engine_render_frame_observer.h b/fuchsia_web/webengine/renderer/web_engine_render_frame_observer.h
index c27020c..5c20376 100644
--- a/fuchsia_web/webengine/renderer/web_engine_render_frame_observer.h
+++ b/fuchsia_web/webengine/renderer/web_engine_render_frame_observer.h
@@ -5,7 +5,7 @@
#ifndef FUCHSIA_WEB_WEBENGINE_RENDERER_WEB_ENGINE_RENDER_FRAME_OBSERVER_H_
#define FUCHSIA_WEB_WEBENGINE_RENDERER_WEB_ENGINE_RENDER_FRAME_OBSERVER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "components/url_rewrite/renderer/url_request_rules_receiver.h"
#include "content/public/renderer/render_frame_observer.h"
diff --git a/fuchsia_web/webengine/test/run_all_unittests.cc b/fuchsia_web/webengine/test/run_all_unittests.cc
index 75b1bb682..cf394b1 100644
--- a/fuchsia_web/webengine/test/run_all_unittests.cc
+++ b/fuchsia_web/webengine/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_suite.h"
#include "mojo/core/embedder/embedder.h"
diff --git a/fuchsia_web/webengine/test_debug_listener.h b/fuchsia_web/webengine/test_debug_listener.h
index 5da43520..0b84590 100644
--- a/fuchsia_web/webengine/test_debug_listener.h
+++ b/fuchsia_web/webengine/test_debug_listener.h
@@ -8,9 +8,9 @@
#include <fuchsia/web/cpp/fidl.h>
#include <lib/fidl/cpp/binding.h>
-#include "base/callback.h"
#include "base/containers/flat_set.h"
#include "base/containers/unique_ptr_adapters.h"
+#include "base/functional/callback.h"
// Listens to debug events and enables test code to block until a desired
// number of DevTools ports are open.
diff --git a/fuchsia_web/webinstance_host/web_instance_host_v1.cc b/fuchsia_web/webinstance_host/web_instance_host_v1.cc
index c0b9352..d99e4a2 100644
--- a/fuchsia_web/webinstance_host/web_instance_host_v1.cc
+++ b/fuchsia_web/webinstance_host/web_instance_host_v1.cc
@@ -22,12 +22,12 @@
#include <vector>
#include "base/base_switches.h"
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/fuchsia/file_utils.h"
#include "base/fuchsia/fuchsia_logging.h"
#include "base/fuchsia/process_context.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/process/process.h"
#include "base/strings/string_number_conversions.h"