Update header includes for /base/functional in /net
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: I02c0598355824c72852287cc58c1b941298ed4ce
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4157074
Reviewed-by: Daniel Cheng <[email protected]>
Auto-Submit: Avi Drissman <[email protected]>
Owners-Override: Daniel Cheng <[email protected]>
Commit-Queue: Daniel Cheng <[email protected]>
Owners-Override: Avi Drissman <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1091532}
diff --git a/net/android/http_auth_negotiate_android.cc b/net/android/http_auth_negotiate_android.cc
index fb99eb3..ff0d623 100644
--- a/net/android/http_auth_negotiate_android.cc
+++ b/net/android/http_auth_negotiate_android.cc
@@ -6,8 +6,8 @@
#include "base/android/jni_string.h"
#include "base/android/scoped_java_ref.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 "net/base/auth.h"
diff --git a/net/android/http_auth_negotiate_android.h b/net/android/http_auth_negotiate_android.h
index ef59199..42b7666 100644
--- a/net/android/http_auth_negotiate_android.h
+++ b/net/android/http_auth_negotiate_android.h
@@ -11,7 +11,7 @@
#include <string>
#include "base/android/jni_android.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "net/base/completion_once_callback.h"
diff --git a/net/android/network_change_notifier_android.cc b/net/android/network_change_notifier_android.cc
index 4408754a..4ba0b89 100644
--- a/net/android/network_change_notifier_android.cc
+++ b/net/android/network_change_notifier_android.cc
@@ -63,8 +63,8 @@
#include <unordered_set>
#include "base/android/build_info.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/metrics/histogram_macros.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/task_traits.h"
diff --git a/net/android/network_change_notifier_android_unittest.cc b/net/android/network_change_notifier_android_unittest.cc
index af62fec..d494e0c 100644
--- a/net/android/network_change_notifier_android_unittest.cc
+++ b/net/android/network_change_notifier_android_unittest.cc
@@ -8,9 +8,9 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/run_loop.h"
#include "net/android/network_change_notifier_delegate_android.h"
#include "net/base/ip_address.h"
diff --git a/net/android/network_library.h b/net/android/network_library.h
index c48da3af..7c8a778 100644
--- a/net/android/network_library.h
+++ b/net/android/network_library.h
@@ -14,7 +14,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/strings/string_piece.h"
#include "net/android/cert_verify_result_android.h"
#include "net/base/ip_endpoint.h"
diff --git a/net/base/address_tracker_linux.cc b/net/base/address_tracker_linux.cc
index 5d63d77..4976cae 100644
--- a/net/base/address_tracker_linux.cc
+++ b/net/base/address_tracker_linux.cc
@@ -10,9 +10,9 @@
#include <sys/ioctl.h>
#include <utility>
-#include "base/callback_helpers.h"
#include "base/check.h"
#include "base/files/scoped_file.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/posix/eintr_wrapper.h"
#include "base/task/current_thread.h"
diff --git a/net/base/address_tracker_linux.h b/net/base/address_tracker_linux.h
index 121eb782..4a8e73c 100644
--- a/net/base/address_tracker_linux.h
+++ b/net/base/address_tracker_linux.h
@@ -19,10 +19,10 @@
#include <string>
#include <unordered_set>
-#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/files/file_descriptor_watcher_posix.h"
#include "base/files/scoped_file.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/memory/raw_ref.h"
#include "base/synchronization/condition_variable.h"
diff --git a/net/base/address_tracker_linux_fuzzer.cc b/net/base/address_tracker_linux_fuzzer.cc
index 2611905..7a0fd53 100644
--- a/net/base/address_tracker_linux_fuzzer.cc
+++ b/net/base/address_tracker_linux_fuzzer.cc
@@ -5,7 +5,7 @@
#include <stddef.h>
#include <stdint.h>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "net/base/address_tracker_linux.h"
namespace net {
diff --git a/net/base/address_tracker_linux_unittest.cc b/net/base/address_tracker_linux_unittest.cc
index 93a2862..00a0bc7 100644
--- a/net/base/address_tracker_linux_unittest.cc
+++ b/net/base/address_tracker_linux_unittest.cc
@@ -11,10 +11,10 @@
#include <unordered_set>
#include <vector>
-#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/strings/string_number_conversions.h"
#include "base/synchronization/waitable_event.h"
diff --git a/net/base/completion_once_callback.h b/net/base/completion_once_callback.h
index d41ce7a..732407fb 100644
--- a/net/base/completion_once_callback.h
+++ b/net/base/completion_once_callback.h
@@ -7,8 +7,8 @@
#include <stdint.h>
-#include "base/callback.h"
#include "base/cancelable_callback.h"
+#include "base/functional/callback.h"
namespace net {
diff --git a/net/base/completion_repeating_callback.h b/net/base/completion_repeating_callback.h
index 44c8e6e..984fdf9 100644
--- a/net/base/completion_repeating_callback.h
+++ b/net/base/completion_repeating_callback.h
@@ -7,8 +7,8 @@
#include <stdint.h>
-#include "base/callback.h"
#include "base/cancelable_callback.h"
+#include "base/functional/callback.h"
namespace net {
diff --git a/net/base/directory_lister.cc b/net/base/directory_lister.cc
index a92b28c..9a73bc2 100644
--- a/net/base/directory_lister.cc
+++ b/net/base/directory_lister.cc
@@ -7,10 +7,10 @@
#include <algorithm>
#include <utility>
-#include "base/bind.h"
#include "base/check.h"
#include "base/files/file_enumerator.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/i18n/file_util_icu.h"
#include "base/location.h"
#include "base/notreached.h"
diff --git a/net/base/directory_lister_unittest.cc b/net/base/directory_lister_unittest.cc
index 0dc0fa0..cdba999 100644
--- a/net/base/directory_lister_unittest.cc
+++ b/net/base/directory_lister_unittest.cc
@@ -6,10 +6,10 @@
#include <utility>
#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/i18n/file_util_icu.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/net/base/elements_upload_data_stream.cc b/net/base/elements_upload_data_stream.cc
index f034db8..b6fcbf7 100644
--- a/net/base/elements_upload_data_stream.cc
+++ b/net/base/elements_upload_data_stream.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
#include "net/base/upload_bytes_element_reader.h"
diff --git a/net/base/elements_upload_data_stream_unittest.cc b/net/base/elements_upload_data_stream_unittest.cc
index 67df9a9e..e1695d5 100644
--- a/net/base/elements_upload_data_stream_unittest.cc
+++ b/net/base/elements_upload_data_stream_unittest.cc
@@ -10,10 +10,10 @@
#include <limits>
#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/location.h"
#include "base/run_loop.h"
#include "base/strings/string_piece.h"
diff --git a/net/base/file_stream_context.cc b/net/base/file_stream_context.cc
index 4b883ff..5dd95138 100644
--- a/net/base/file_stream_context.cc
+++ b/net/base/file_stream_context.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/task/task_runner.h"
diff --git a/net/base/file_stream_context_posix.cc b/net/base/file_stream_context_posix.cc
index 235fc343..0e590b3 100644
--- a/net/base/file_stream_context_posix.cc
+++ b/net/base/file_stream_context_posix.cc
@@ -7,11 +7,11 @@
#include <errno.h>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/check.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/posix/eintr_wrapper.h"
#include "base/task/task_runner.h"
diff --git a/net/base/file_stream_context_win.cc b/net/base/file_stream_context_win.cc
index 930204f..9c8a2a483 100644
--- a/net/base/file_stream_context_win.cc
+++ b/net/base/file_stream_context_win.cc
@@ -7,8 +7,8 @@
#include <windows.h>
#include <utility>
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/message_loop/message_pump_for_io.h"
diff --git a/net/base/file_stream_unittest.cc b/net/base/file_stream_unittest.cc
index 8c9dac3e..474125d 100644
--- a/net/base/file_stream_unittest.cc
+++ b/net/base/file_stream_unittest.cc
@@ -7,10 +7,10 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/files/file.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/path_service.h"
#include "base/run_loop.h"
diff --git a/net/base/logging_network_change_observer.cc b/net/base/logging_network_change_observer.cc
index 46d00954..1fd5ef9 100644
--- a/net/base/logging_network_change_observer.cc
+++ b/net/base/logging_network_change_observer.cc
@@ -6,7 +6,7 @@
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
diff --git a/net/base/mock_file_stream.cc b/net/base/mock_file_stream.cc
index d5e9fd5..2cd9158 100644
--- a/net/base/mock_file_stream.cc
+++ b/net/base/mock_file_stream.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"
diff --git a/net/base/network_activity_monitor_unittest.cc b/net/base/network_activity_monitor_unittest.cc
index 0028c75..e1b5648e 100644
--- a/net/base/network_activity_monitor_unittest.cc
+++ b/net/base/network_activity_monitor_unittest.cc
@@ -9,7 +9,7 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/string_number_conversions.h"
#include "base/threading/thread.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/base/network_change_notifier_fuchsia.cc b/net/base/network_change_notifier_fuchsia.cc
index fc7a165ef..e03fdab 100644
--- a/net/base/network_change_notifier_fuchsia.cc
+++ b/net/base/network_change_notifier_fuchsia.cc
@@ -10,8 +10,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/fuchsia/fuchsia_logging.h"
+#include "base/functional/bind.h"
#include "base/strings/stringprintf.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/net/base/network_change_notifier_fuchsia.h b/net/base/network_change_notifier_fuchsia.h
index db88012..75379c7 100644
--- a/net/base/network_change_notifier_fuchsia.h
+++ b/net/base/network_change_notifier_fuchsia.h
@@ -9,8 +9,8 @@
#include <lib/fidl/cpp/binding.h>
#include "base/atomicops.h"
-#include "base/callback.h"
#include "base/containers/flat_map.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/strings/string_piece.h"
#include "base/threading/thread_checker.h"
diff --git a/net/base/network_change_notifier_fuchsia_unittest.cc b/net/base/network_change_notifier_fuchsia_unittest.cc
index e36cb34..23bb3dec 100644
--- a/net/base/network_change_notifier_fuchsia_unittest.cc
+++ b/net/base/network_change_notifier_fuchsia_unittest.cc
@@ -11,7 +11,7 @@
#include <vector>
#include "base/auto_reset.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
diff --git a/net/base/network_change_notifier_linux.cc b/net/base/network_change_notifier_linux.cc
index 793ed8d..dee80df 100644
--- a/net/base/network_change_notifier_linux.cc
+++ b/net/base/network_change_notifier_linux.cc
@@ -6,9 +6,9 @@
#include <string>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/task_traits.h"
#include "base/task/thread_pool.h"
diff --git a/net/base/network_change_notifier_mac.mm b/net/base/network_change_notifier_mac.mm
index f8ff519..7fd797a 100644
--- a/net/base/network_change_notifier_mac.mm
+++ b/net/base/network_change_notifier_mac.mm
@@ -7,7 +7,7 @@
#include <netinet/in.h>
#include <resolv.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/net/base/network_change_notifier_posix.cc b/net/base/network_change_notifier_posix.cc
index c7b5c96..2267ca6 100644
--- a/net/base/network_change_notifier_posix.cc
+++ b/net/base/network_change_notifier_posix.cc
@@ -5,7 +5,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/task_traits.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
diff --git a/net/base/network_change_notifier_win.cc b/net/base/network_change_notifier_win.cc
index f900732..2ab1d1f 100644
--- a/net/base/network_change_notifier_win.cc
+++ b/net/base/network_change_notifier_win.cc
@@ -9,7 +9,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
diff --git a/net/base/network_change_notifier_win.h b/net/base/network_change_notifier_win.h
index 0d88afa..c448665e 100644
--- a/net/base/network_change_notifier_win.h
+++ b/net/base/network_change_notifier_win.h
@@ -13,8 +13,8 @@
#include <memory>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
diff --git a/net/base/network_change_notifier_win_unittest.cc b/net/base/network_change_notifier_win_unittest.cc
index e016d65..e50202e 100644
--- a/net/base/network_change_notifier_win_unittest.cc
+++ b/net/base/network_change_notifier_win_unittest.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/base/network_config_watcher_mac.cc b/net/base/network_config_watcher_mac.cc
index 6089963..3e3240b 100644
--- a/net/base/network_config_watcher_mac.cc
+++ b/net/base/network_config_watcher_mac.cc
@@ -6,8 +6,8 @@
#include <algorithm>
-#include "base/bind.h"
#include "base/compiler_specific.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/net/base/network_delegate.h b/net/base/network_delegate.h
index 16ec434..fa1feb0 100644
--- a/net/base/network_delegate.h
+++ b/net/base/network_delegate.h
@@ -10,7 +10,7 @@
#include <set>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/threading/thread_checker.h"
#include "net/base/auth.h"
diff --git a/net/base/prioritized_task_runner.cc b/net/base/prioritized_task_runner.cc
index 4ab92139..1a48c42 100644
--- a/net/base/prioritized_task_runner.cc
+++ b/net/base/prioritized_task_runner.cc
@@ -6,7 +6,7 @@
#include <algorithm>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/task_runner.h"
#include "base/task/thread_pool.h"
diff --git a/net/base/prioritized_task_runner.h b/net/base/prioritized_task_runner.h
index f11633120..d67690b 100644
--- a/net/base/prioritized_task_runner.h
+++ b/net/base/prioritized_task_runner.h
@@ -9,8 +9,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/memory/ref_counted.h"
#include "base/synchronization/lock.h"
diff --git a/net/base/prioritized_task_runner_unittest.cc b/net/base/prioritized_task_runner_unittest.cc
index c33c332..ee61013 100644
--- a/net/base/prioritized_task_runner_unittest.cc
+++ b/net/base/prioritized_task_runner_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/location.h"
#include "base/rand_util.h"
#include "base/run_loop.h"
diff --git a/net/base/priority_queue.h b/net/base/priority_queue.h
index 66e1a00..f69e512 100644
--- a/net/base/priority_queue.h
+++ b/net/base/priority_queue.h
@@ -12,9 +12,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/threading/thread_checker.h"
#if !defined(NDEBUG)
diff --git a/net/base/priority_queue_unittest.cc b/net/base/priority_queue_unittest.cc
index 738fe844..0ff64646 100644
--- a/net/base/priority_queue_unittest.cc
+++ b/net/base/priority_queue_unittest.cc
@@ -6,7 +6,7 @@
#include <cstddef>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace net {
diff --git a/net/base/rand_callback.h b/net/base/rand_callback.h
index e9d60c2..3df101c1 100644
--- a/net/base/rand_callback.h
+++ b/net/base/rand_callback.h
@@ -5,7 +5,7 @@
#ifndef NET_BASE_RAND_CALLBACK_H_
#define NET_BASE_RAND_CALLBACK_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
namespace net {
diff --git a/net/base/test_completion_callback.cc b/net/base/test_completion_callback.cc
index abdf6f6..44fde49 100644
--- a/net/base/test_completion_callback.cc
+++ b/net/base/test_completion_callback.cc
@@ -4,9 +4,9 @@
#include "net/base/test_completion_callback.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "net/base/io_buffer.h"
diff --git a/net/base/test_completion_callback.h b/net/base/test_completion_callback.h
index 3d051c24b..e0c45f6 100644
--- a/net/base/test_completion_callback.h
+++ b/net/base/test_completion_callback.h
@@ -10,8 +10,8 @@
#include <memory>
#include <utility>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "net/base/completion_once_callback.h"
#include "net/base/net_errors.h"
diff --git a/net/base/test_completion_callback_unittest.cc b/net/base/test_completion_callback_unittest.cc
index fdf6ea7..a3034890 100644
--- a/net/base/test_completion_callback_unittest.cc
+++ b/net/base/test_completion_callback_unittest.cc
@@ -6,8 +6,8 @@
#include "net/base/test_completion_callback.h"
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/notreached.h"
diff --git a/net/base/upload_file_element_reader.cc b/net/base/upload_file_element_reader.cc
index 8aabd90..69b3fa8 100644
--- a/net/base/upload_file_element_reader.cc
+++ b/net/base/upload_file_element_reader.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/task/task_runner.h"
#include "net/base/file_stream.h"
diff --git a/net/cert/caching_cert_verifier.cc b/net/cert/caching_cert_verifier.cc
index 2529212..181288d 100644
--- a/net/cert/caching_cert_verifier.cc
+++ b/net/cert/caching_cert_verifier.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/time/time.h"
#include "net/base/net_errors.h"
diff --git a/net/cert/cert_and_ct_verifier.cc b/net/cert/cert_and_ct_verifier.cc
index 1c2136c..8be4131 100644
--- a/net/cert/cert_and_ct_verifier.cc
+++ b/net/cert/cert_and_ct_verifier.cc
@@ -4,7 +4,7 @@
#include "net/cert/cert_and_ct_verifier.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "net/cert/ct_verifier.h"
namespace net {
diff --git a/net/cert/cert_database_mac.cc b/net/cert/cert_database_mac.cc
index 3e26d1b..9055cc3 100644
--- a/net/cert/cert_database_mac.cc
+++ b/net/cert/cert_database_mac.cc
@@ -6,8 +6,8 @@
#include <Security/Security.h>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/mac/mac_logging.h"
#include "base/memory/raw_ptr.h"
diff --git a/net/cert/cert_verify_proc_unittest.cc b/net/cert/cert_verify_proc_unittest.cc
index cac93a66..59afd75 100644
--- a/net/cert/cert_verify_proc_unittest.cc
+++ b/net/cert/cert_verify_proc_unittest.cc
@@ -7,10 +7,10 @@
#include <memory>
#include <vector>
-#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/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/message_loop/message_pump_type.h"
diff --git a/net/cert/cert_verify_proc_win.cc b/net/cert/cert_verify_proc_win.cc
index 08ded6f..91b1d9ce 100644
--- a/net/cert/cert_verify_proc_win.cc
+++ b/net/cert/cert_verify_proc_win.cc
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/free_deleter.h"
#include "base/metrics/histogram_macros.h"
#include "base/no_destructor.h"
diff --git a/net/cert/coalescing_cert_verifier.cc b/net/cert/coalescing_cert_verifier.cc
index 776e694..7e8376d 100644
--- a/net/cert/coalescing_cert_verifier.cc
+++ b/net/cert/coalescing_cert_verifier.cc
@@ -4,9 +4,9 @@
#include "net/cert/coalescing_cert_verifier.h"
-#include "base/bind.h"
#include "base/containers/linked_list.h"
#include "base/containers/unique_ptr_adapters.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/metrics/histogram_macros.h"
diff --git a/net/cert/coalescing_cert_verifier_unittest.cc b/net/cert/coalescing_cert_verifier_unittest.cc
index ab5f647..cd72ff6 100644
--- a/net/cert/coalescing_cert_verifier_unittest.cc
+++ b/net/cert/coalescing_cert_verifier_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/test/bind.h"
#include "base/test/metrics/histogram_tester.h"
#include "net/base/net_errors.h"
diff --git a/net/cert/internal/path_builder_trust_store_win_unittest.cc b/net/cert/internal/path_builder_trust_store_win_unittest.cc
index 22163b0..9a0a98d6d 100644
--- a/net/cert/internal/path_builder_trust_store_win_unittest.cc
+++ b/net/cert/internal/path_builder_trust_store_win_unittest.cc
@@ -7,8 +7,8 @@
#include <algorithm>
#include "base/base_paths.h"
-#include "base/callback_forward.h"
#include "base/files/file_util.h"
+#include "base/functional/callback_forward.h"
#include "base/path_service.h"
#include "base/test/bind.h"
#include "build/build_config.h"
diff --git a/net/cert/internal/trust_store_mac.cc b/net/cert/internal/trust_store_mac.cc
index cc13ecd..e58e82c7 100644
--- a/net/cert/internal/trust_store_mac.cc
+++ b/net/cert/internal/trust_store_mac.cc
@@ -7,10 +7,10 @@
#include <Security/Security.h>
#include "base/atomicops.h"
-#include "base/bind.h"
#include "base/callback_list.h"
#include "base/containers/contains.h"
#include "base/containers/flat_map.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/mac/foundation_util.h"
#include "base/mac/mac_logging.h"
diff --git a/net/cert/mock_cert_verifier.cc b/net/cert/mock_cert_verifier.cc
index a894b9f..8bd3a5a 100644
--- a/net/cert/mock_cert_verifier.cc
+++ b/net/cert/mock_cert_verifier.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/callback_list.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
diff --git a/net/cert/multi_log_ct_verifier.cc b/net/cert/multi_log_ct_verifier.cc
index 1391bac4..51484d8 100644
--- a/net/cert/multi_log_ct_verifier.cc
+++ b/net/cert/multi_log_ct_verifier.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/metrics/histogram_macros.h"
#include "base/values.h"
diff --git a/net/cert/multi_log_ct_verifier.h b/net/cert/multi_log_ct_verifier.h
index 85f44af6..c73b6ce 100644
--- a/net/cert/multi_log_ct_verifier.h
+++ b/net/cert/multi_log_ct_verifier.h
@@ -8,8 +8,8 @@
#include <map>
#include <string>
-#include "base/callback_forward.h"
#include "base/callback_list.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/string_piece.h"
diff --git a/net/cert/multi_threaded_cert_verifier.cc b/net/cert/multi_threaded_cert_verifier.cc
index 1e61c48..8aa58a6 100644
--- a/net/cert/multi_threaded_cert_verifier.cc
+++ b/net/cert/multi_threaded_cert_verifier.cc
@@ -4,9 +4,9 @@
#include "net/cert/multi_threaded_cert_verifier.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/task/thread_pool.h"
diff --git a/net/cert/multi_threaded_cert_verifier_unittest.cc b/net/cert/multi_threaded_cert_verifier_unittest.cc
index bf38709a..3a7351d 100644
--- a/net/cert/multi_threaded_cert_verifier_unittest.cc
+++ b/net/cert/multi_threaded_cert_verifier_unittest.cc
@@ -6,10 +6,10 @@
#include <memory>
-#include "base/bind.h"
#include "base/debug/leak_annotations.h"
#include "base/files/file_path.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
#include "net/base/net_errors.h"
#include "net/base/test_completion_callback.h"
#include "net/cert/cert_verify_proc.h"
diff --git a/net/cert/nss_cert_database.cc b/net/cert/nss_cert_database.cc
index 45e213b89..fb122062 100644
--- a/net/cert/nss_cert_database.cc
+++ b/net/cert/nss_cert_database.cc
@@ -14,8 +14,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/observer_list_threadsafe.h"
diff --git a/net/cert/nss_cert_database.h b/net/cert/nss_cert_database.h
index 9690881c..4884d9d 100644
--- a/net/cert/nss_cert_database.h
+++ b/net/cert/nss_cert_database.h
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "build/build_config.h"
diff --git a/net/cert/nss_cert_database_chromeos.cc b/net/cert/nss_cert_database_chromeos.cc
index 5d7a0490..46e0df2 100644
--- a/net/cert/nss_cert_database_chromeos.cc
+++ b/net/cert/nss_cert_database_chromeos.cc
@@ -11,9 +11,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/containers/cxx20_erase.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/task/thread_pool.h"
#include "base/threading/scoped_blocking_call.h"
diff --git a/net/cert/nss_cert_database_chromeos.h b/net/cert/nss_cert_database_chromeos.h
index d060b2db..f4acd4c 100644
--- a/net/cert/nss_cert_database_chromeos.h
+++ b/net/cert/nss_cert_database_chromeos.h
@@ -5,7 +5,7 @@
#ifndef NET_CERT_NSS_CERT_DATABASE_CHROMEOS_H_
#define NET_CERT_NSS_CERT_DATABASE_CHROMEOS_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "crypto/scoped_nss_types.h"
#include "net/base/net_export.h"
diff --git a/net/cert/nss_cert_database_chromeos_unittest.cc b/net/cert/nss_cert_database_chromeos_unittest.cc
index f3b26d1..29a7c65 100644
--- a/net/cert/nss_cert_database_chromeos_unittest.cc
+++ b/net/cert/nss_cert_database_chromeos_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/run_loop.h"
#include "crypto/nss_util_internal.h"
#include "crypto/scoped_test_nss_chromeos_user.h"
diff --git a/net/cert/nss_cert_database_unittest.cc b/net/cert/nss_cert_database_unittest.cc
index 6808d3b7..dabe0aab 100644
--- a/net/cert/nss_cert_database_unittest.cc
+++ b/net/cert/nss_cert_database_unittest.cc
@@ -13,9 +13,9 @@
#include <memory>
#include <string>
-#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/run_loop.h"
#include "base/strings/string_util.h"
diff --git a/net/cert/trial_comparison_cert_verifier.cc b/net/cert/trial_comparison_cert_verifier.cc
index 47158ef7..f6853e91 100644
--- a/net/cert/trial_comparison_cert_verifier.cc
+++ b/net/cert/trial_comparison_cert_verifier.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_macros.h"
diff --git a/net/cert/trial_comparison_cert_verifier_unittest.cc b/net/cert/trial_comparison_cert_verifier_unittest.cc
index 4560e8a0..a3d1b65 100644
--- a/net/cert/trial_comparison_cert_verifier_unittest.cc
+++ b/net/cert/trial_comparison_cert_verifier_unittest.cc
@@ -8,7 +8,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/task/sequenced_task_runner.h"
#include "base/test/bind.h"
diff --git a/net/cert_net/cert_net_fetcher_url_request.cc b/net/cert_net/cert_net_fetcher_url_request.cc
index 6f3acf6e..4ca53ce 100644
--- a/net/cert_net/cert_net_fetcher_url_request.cc
+++ b/net/cert_net/cert_net_fetcher_url_request.cc
@@ -62,9 +62,9 @@
#include <tuple>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/numerics/safe_math.h"
diff --git a/net/cert_net/cert_net_fetcher_url_request_unittest.cc b/net/cert_net/cert_net_fetcher_url_request_unittest.cc
index ab38845..08406ecb 100644
--- a/net/cert_net/cert_net_fetcher_url_request_unittest.cc
+++ b/net/cert_net/cert_net_fetcher_url_request_unittest.cc
@@ -8,7 +8,7 @@
#include <string>
#include <utility>
-#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/net/cookies/cookie_access_delegate.cc b/net/cookies/cookie_access_delegate.cc
index 0273e09..9811f94 100644
--- a/net/cookies/cookie_access_delegate.cc
+++ b/net/cookies/cookie_access_delegate.cc
@@ -6,7 +6,7 @@
#include <set>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "net/base/schemeful_site.h"
#include "net/cookies/cookie_partition_key.h"
#include "net/first_party_sets/first_party_set_entry.h"
diff --git a/net/cookies/cookie_access_delegate.h b/net/cookies/cookie_access_delegate.h
index 8121b55..ee8e3d0 100644
--- a/net/cookies/cookie_access_delegate.h
+++ b/net/cookies/cookie_access_delegate.h
@@ -7,9 +7,9 @@
#include <set>
-#include "base/callback_forward.h"
#include "base/containers/flat_map.h"
#include "base/containers/flat_set.h"
+#include "base/functional/callback_forward.h"
#include "net/base/net_export.h"
#include "net/base/schemeful_site.h"
#include "net/cookies/canonical_cookie.h"
diff --git a/net/cookies/cookie_change_dispatcher.h b/net/cookies/cookie_change_dispatcher.h
index 32b56ad..62cfee9 100644
--- a/net/cookies/cookie_change_dispatcher.h
+++ b/net/cookies/cookie_change_dispatcher.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "net/base/net_export.h"
#include "net/cookies/canonical_cookie.h"
#include "net/cookies/cookie_access_result.h"
diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc
index bb1018a..44f52e0c 100644
--- a/net/cookies/cookie_monster.cc
+++ b/net/cookies/cookie_monster.cc
@@ -49,10 +49,10 @@
#include <set>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/containers/flat_map.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/metrics/field_trial.h"
diff --git a/net/cookies/cookie_monster.h b/net/cookies/cookie_monster.h
index 77692a8..8a896a8 100644
--- a/net/cookies/cookie_monster.h
+++ b/net/cookies/cookie_monster.h
@@ -16,9 +16,9 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
#include "base/containers/circular_deque.h"
#include "base/containers/flat_map.h"
+#include "base/functional/callback_forward.h"
#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
diff --git a/net/cookies/cookie_monster_change_dispatcher.cc b/net/cookies/cookie_monster_change_dispatcher.cc
index 4a2414d..e1eb9d0f 100644
--- a/net/cookies/cookie_monster_change_dispatcher.cc
+++ b/net/cookies/cookie_monster_change_dispatcher.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/single_thread_task_runner.h"
#include "base/task/task_runner.h"
diff --git a/net/cookies/cookie_monster_change_dispatcher.h b/net/cookies/cookie_monster_change_dispatcher.h
index c57a141..dd022ad 100644
--- a/net/cookies/cookie_monster_change_dispatcher.h
+++ b/net/cookies/cookie_monster_change_dispatcher.h
@@ -9,9 +9,9 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/callback_list.h"
#include "base/containers/linked_list.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/net/cookies/cookie_monster_perftest.cc b/net/cookies/cookie_monster_perftest.cc
index 04caef13..0323f3d 100644
--- a/net/cookies/cookie_monster_perftest.cc
+++ b/net/cookies/cookie_monster_perftest.cc
@@ -5,7 +5,7 @@
#include <memory>
#include <utility>
-#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/net/cookies/cookie_monster_store_test.cc b/net/cookies/cookie_monster_store_test.cc
index d0944f8..f9894b74 100644
--- a/net/cookies/cookie_monster_store_test.cc
+++ b/net/cookies/cookie_monster_store_test.cc
@@ -4,7 +4,7 @@
#include "net/cookies/cookie_monster_store_test.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/strings/stringprintf.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/cookies/cookie_monster_unittest.cc b/net/cookies/cookie_monster_unittest.cc
index e62271f..2ed272a4 100644
--- a/net/cookies/cookie_monster_unittest.cc
+++ b/net/cookies/cookie_monster_unittest.cc
@@ -12,10 +12,10 @@
#include <utility>
#include <vector>
-#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/location.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
diff --git a/net/cookies/cookie_partition_key_collection.cc b/net/cookies/cookie_partition_key_collection.cc
index feebe03..646c307 100644
--- a/net/cookies/cookie_partition_key_collection.cc
+++ b/net/cookies/cookie_partition_key_collection.cc
@@ -6,11 +6,11 @@
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/containers/contains.h"
#include "base/containers/flat_map.h"
#include "base/containers/flat_set.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "net/base/schemeful_site.h"
#include "net/cookies/cookie_access_delegate.h"
#include "net/cookies/cookie_partition_key.h"
diff --git a/net/cookies/cookie_partition_key_collection.h b/net/cookies/cookie_partition_key_collection.h
index 1396b8c5..eac9659 100644
--- a/net/cookies/cookie_partition_key_collection.h
+++ b/net/cookies/cookie_partition_key_collection.h
@@ -5,8 +5,8 @@
#ifndef NET_COOKIES_COOKIE_PARTITION_KEY_COLLECTION_H_
#define NET_COOKIES_COOKIE_PARTITION_KEY_COLLECTION_H_
-#include "base/callback_forward.h"
#include "base/containers/flat_set.h"
+#include "base/functional/callback_forward.h"
#include "net/base/net_export.h"
#include "net/cookies/cookie_partition_key.h"
diff --git a/net/cookies/cookie_store.cc b/net/cookies/cookie_store.cc
index 9e87ef6..8b73d3f 100644
--- a/net/cookies/cookie_store.cc
+++ b/net/cookies/cookie_store.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"
namespace net {
diff --git a/net/cookies/cookie_store.h b/net/cookies/cookie_store.h
index f6df78d..61fd008 100644
--- a/net/cookies/cookie_store.h
+++ b/net/cookies/cookie_store.h
@@ -13,7 +13,7 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "net/base/net_export.h"
#include "net/cookies/canonical_cookie.h"
#include "net/cookies/cookie_access_delegate.h"
diff --git a/net/cookies/cookie_store_change_unittest.h b/net/cookies/cookie_store_change_unittest.h
index 0adbdad5..08b0d064 100644
--- a/net/cookies/cookie_store_change_unittest.h
+++ b/net/cookies/cookie_store_change_unittest.h
@@ -5,7 +5,7 @@
#ifndef NET_COOKIES_COOKIE_STORE_CHANGE_UNITTEST_H_
#define NET_COOKIES_COOKIE_STORE_CHANGE_UNITTEST_H_
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "net/cookies/canonical_cookie.h"
#include "net/cookies/cookie_change_dispatcher_test_helpers.h"
#include "net/cookies/cookie_constants.h"
diff --git a/net/cookies/cookie_store_test_callbacks.h b/net/cookies/cookie_store_test_callbacks.h
index 3b3b685..eb93baea 100644
--- a/net/cookies/cookie_store_test_callbacks.h
+++ b/net/cookies/cookie_store_test_callbacks.h
@@ -7,7 +7,7 @@
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/run_loop.h"
diff --git a/net/cookies/cookie_store_test_helpers.cc b/net/cookies/cookie_store_test_helpers.cc
index 5f67016..3dd89d4 100644
--- a/net/cookies/cookie_store_test_helpers.cc
+++ b/net/cookies/cookie_store_test_helpers.cc
@@ -7,7 +7,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/strings/string_util.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/cookies/cookie_store_test_helpers.h b/net/cookies/cookie_store_test_helpers.h
index 5b0da7f..ea91b1a 100644
--- a/net/cookies/cookie_store_test_helpers.h
+++ b/net/cookies/cookie_store_test_helpers.h
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/synchronization/lock.h"
#include "net/cookies/cookie_change_dispatcher.h"
#include "net/log/net_log_with_source.h"
diff --git a/net/cookies/cookie_store_unittest.h b/net/cookies/cookie_store_unittest.h
index 96f8dbe6..8469ca6 100644
--- a/net/cookies/cookie_store_unittest.h
+++ b/net/cookies/cookie_store_unittest.h
@@ -13,7 +13,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/string_tokenizer.h"
#include "base/task/current_thread.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/cookies/cookie_util.cc b/net/cookies/cookie_util.cc
index 91a8d2d..1d6de05 100644
--- a/net/cookies/cookie_util.cc
+++ b/net/cookies/cookie_util.cc
@@ -9,10 +9,10 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/notreached.h"
diff --git a/net/cookies/cookie_util.h b/net/cookies/cookie_util.h
index 30e3c4c..b78cda5 100644
--- a/net/cookies/cookie_util.h
+++ b/net/cookies/cookie_util.h
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/time/time.h"
#include "net/base/net_export.h"
#include "net/cookies/canonical_cookie.h"
diff --git a/net/cookies/cookie_util_unittest.cc b/net/cookies/cookie_util_unittest.cc
index 0e89f76..564021b 100644
--- a/net/cookies/cookie_util_unittest.cc
+++ b/net/cookies/cookie_util_unittest.cc
@@ -8,8 +8,8 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
#include "base/containers/contains.h"
+#include "base/functional/callback.h"
#include "base/strings/strcat.h"
#include "base/strings/string_split.h"
#include "base/test/bind.h"
diff --git a/net/cookies/test_cookie_access_delegate.cc b/net/cookies/test_cookie_access_delegate.cc
index 9a81021..12556f4 100644
--- a/net/cookies/test_cookie_access_delegate.cc
+++ b/net/cookies/test_cookie_access_delegate.cc
@@ -8,10 +8,10 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
#include "base/containers/contains.h"
#include "base/containers/flat_map.h"
#include "base/containers/flat_set.h"
+#include "base/functional/callback.h"
#include "base/ranges/algorithm.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/thread_pool.h"
diff --git a/net/cookies/test_cookie_access_delegate.h b/net/cookies/test_cookie_access_delegate.h
index ba78192e..211d809 100644
--- a/net/cookies/test_cookie_access_delegate.h
+++ b/net/cookies/test_cookie_access_delegate.h
@@ -9,9 +9,9 @@
#include <set>
#include <string>
-#include "base/callback_forward.h"
#include "base/containers/flat_map.h"
#include "base/containers/flat_set.h"
+#include "base/functional/callback_forward.h"
#include "net/base/schemeful_site.h"
#include "net/cookies/cookie_access_delegate.h"
#include "net/cookies/cookie_constants.h"
diff --git a/net/disk_cache/backend_cleanup_tracker.cc b/net/disk_cache/backend_cleanup_tracker.cc
index 0a1dfb1..4c4701438 100644
--- a/net/disk_cache/backend_cleanup_tracker.cc
+++ b/net/disk_cache/backend_cleanup_tracker.cc
@@ -10,8 +10,8 @@
#include <unordered_map>
#include <utility>
-#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/functional/callback.h"
#include "base/lazy_instance.h"
#include "base/memory/ref_counted.h"
#include "base/synchronization/lock.h"
diff --git a/net/disk_cache/backend_cleanup_tracker.h b/net/disk_cache/backend_cleanup_tracker.h
index 8fe6fa1..6db5624 100644
--- a/net/disk_cache/backend_cleanup_tracker.h
+++ b/net/disk_cache/backend_cleanup_tracker.h
@@ -8,8 +8,8 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "base/sequence_checker.h"
#include "net/base/net_export.h"
diff --git a/net/disk_cache/backend_cleanup_tracker_unittest.cc b/net/disk_cache/backend_cleanup_tracker_unittest.cc
index 7c0191a2..6451ba3 100644
--- a/net/disk_cache/backend_cleanup_tracker_unittest.cc
+++ b/net/disk_cache/backend_cleanup_tracker_unittest.cc
@@ -4,9 +4,9 @@
#include "net/disk_cache/backend_cleanup_tracker.h"
-#include "base/bind.h"
-#include "base/callback.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 "net/test/test_with_task_environment.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc
index 012f907..1eeb99a 100644
--- a/net/disk_cache/backend_unittest.cc
+++ b/net/disk_cache/backend_unittest.cc
@@ -6,11 +6,11 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/files/file.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/memory/memory_pressure_listener.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/field_trial.h"
diff --git a/net/disk_cache/blockfile/backend_impl.cc b/net/disk_cache/blockfile/backend_impl.cc
index a3b732a7..ca0a83b 100644
--- a/net/disk_cache/blockfile/backend_impl.cc
+++ b/net/disk_cache/blockfile/backend_impl.cc
@@ -8,11 +8,11 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.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/functional/callback_helpers.h"
#include "base/hash/hash.h"
#include "base/lazy_instance.h"
#include "base/location.h"
diff --git a/net/disk_cache/blockfile/eviction.cc b/net/disk_cache/blockfile/eviction.cc
index 82e2051f..f8251c2 100644
--- a/net/disk_cache/blockfile/eviction.cc
+++ b/net/disk_cache/blockfile/eviction.cc
@@ -32,9 +32,9 @@
#include <limits>
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/metrics/histogram_macros.h"
#include "base/notreached.h"
diff --git a/net/disk_cache/blockfile/file_ios.cc b/net/disk_cache/blockfile/file_ios.cc
index 12403b8..e8cd315 100644
--- a/net/disk_cache/blockfile/file_ios.cc
+++ b/net/disk_cache/blockfile/file_ios.cc
@@ -10,8 +10,8 @@
#include <limits>
#include <utility>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/task/thread_pool.h"
#include "net/base/net_errors.h"
diff --git a/net/disk_cache/blockfile/file_posix.cc b/net/disk_cache/blockfile/file_posix.cc
index 6c78ca0a..cccb7127 100644
--- a/net/disk_cache/blockfile/file_posix.cc
+++ b/net/disk_cache/blockfile/file_posix.cc
@@ -8,8 +8,8 @@
#include <limits>
#include <utility>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/run_loop.h"
#include "base/task/thread_pool.h"
diff --git a/net/disk_cache/blockfile/in_flight_backend_io.cc b/net/disk_cache/blockfile/in_flight_backend_io.cc
index ceebe54..22abcfb0 100644
--- a/net/disk_cache/blockfile/in_flight_backend_io.cc
+++ b/net/disk_cache/blockfile/in_flight_backend_io.cc
@@ -6,10 +6,10 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/notreached.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/disk_cache/blockfile/in_flight_io.cc b/net/disk_cache/blockfile/in_flight_io.cc
index 5503af0..9c09f13 100644
--- a/net/disk_cache/blockfile/in_flight_io.cc
+++ b/net/disk_cache/blockfile/in_flight_io.cc
@@ -4,7 +4,7 @@
#include "net/disk_cache/blockfile/in_flight_io.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/synchronization/waitable_event.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/net/disk_cache/blockfile/sparse_control.cc b/net/disk_cache/blockfile/sparse_control.cc
index 3010a74..4031e7db 100644
--- a/net/disk_cache/blockfile/sparse_control.cc
+++ b/net/disk_cache/blockfile/sparse_control.cc
@@ -6,8 +6,8 @@
#include <stdint.h>
-#include "base/bind.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/numerics/checked_math.h"
diff --git a/net/disk_cache/cache_util.cc b/net/disk_cache/cache_util.cc
index a4bebc13..e9c87fc 100644
--- a/net/disk_cache/cache_util.cc
+++ b/net/disk_cache/cache_util.cc
@@ -6,11 +6,11 @@
#include <limits>
-#include "base/bind.h"
#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/safe_base_name.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/metrics/field_trial_params.h"
#include "base/numerics/clamped_math.h"
diff --git a/net/disk_cache/cache_util.h b/net/disk_cache/cache_util.h
index 22da274..db71eab 100644
--- a/net/disk_cache/cache_util.h
+++ b/net/disk_cache/cache_util.h
@@ -7,8 +7,8 @@
#include <stdint.h>
-#include "base/callback_forward.h"
#include "base/feature_list.h"
+#include "base/functional/callback_forward.h"
#include "net/base/net_export.h"
#include "net/disk_cache/disk_cache.h"
diff --git a/net/disk_cache/disk_cache.cc b/net/disk_cache/disk_cache.cc
index 4dbb184..46136cc0 100644
--- a/net/disk_cache/disk_cache.cc
+++ b/net/disk_cache/disk_cache.cc
@@ -5,10 +5,10 @@
#include <utility>
#include "base/barrier_closure.h"
-#include "base/bind.h"
-#include "base/callback.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/memory/raw_ptr.h"
#include "base/metrics/field_trial.h"
#include "base/task/bind_post_task.h"
diff --git a/net/disk_cache/disk_cache_fuzzer.cc b/net/disk_cache/disk_cache_fuzzer.cc
index 2487a37..862780e 100644
--- a/net/disk_cache/disk_cache_fuzzer.cc
+++ b/net/disk_cache/disk_cache_fuzzer.cc
@@ -10,11 +10,11 @@
#include <string>
#include "base/at_exit.h"
-#include "base/callback.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
diff --git a/net/disk_cache/disk_cache_perftest.cc b/net/disk_cache/disk_cache_perftest.cc
index be0bec39..eff5e46 100644
--- a/net/disk_cache/disk_cache_perftest.cc
+++ b/net/disk_cache/disk_cache_perftest.cc
@@ -7,9 +7,9 @@
#include <string>
#include "base/barrier_closure.h"
-#include "base/bind.h"
#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/hash/hash.h"
#include "base/memory/raw_ptr.h"
#include "base/process/process_metrics.h"
diff --git a/net/disk_cache/disk_cache_test_base.cc b/net/disk_cache/disk_cache_test_base.cc
index 5b7b7c5..4867ea15 100644
--- a/net/disk_cache/disk_cache_test_base.cc
+++ b/net/disk_cache/disk_cache_test_base.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/path_service.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/disk_cache/entry_unittest.cc b/net/disk_cache/entry_unittest.cc
index 284eacb..edcbc58b 100644
--- a/net/disk_cache/entry_unittest.cc
+++ b/net/disk_cache/entry_unittest.cc
@@ -4,10 +4,10 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/files/file.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/field_trial_param_associator.h"
#include "base/run_loop.h"
diff --git a/net/disk_cache/memory/mem_backend_impl.cc b/net/disk_cache/memory/mem_backend_impl.cc
index 1a73699..4c31ae18 100644
--- a/net/disk_cache/memory/mem_backend_impl.cc
+++ b/net/disk_cache/memory/mem_backend_impl.cc
@@ -9,7 +9,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/system/sys_info.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/net/disk_cache/memory/mem_backend_impl.h b/net/disk_cache/memory/mem_backend_impl.h
index 28db7b99..bfd0762 100644
--- a/net/disk_cache/memory/mem_backend_impl.h
+++ b/net/disk_cache/memory/mem_backend_impl.h
@@ -12,9 +12,9 @@
#include <string>
#include <unordered_map>
-#include "base/callback_forward.h"
#include "base/compiler_specific.h"
#include "base/containers/linked_list.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/memory_pressure_listener.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/net/disk_cache/memory/mem_entry_impl.cc b/net/disk_cache/memory/mem_entry_impl.cc
index 923ffdf..e62ed1b 100644
--- a/net/disk_cache/memory/mem_entry_impl.cc
+++ b/net/disk_cache/memory/mem_entry_impl.cc
@@ -8,9 +8,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
#include "base/metrics/histogram_macros.h"
#include "base/numerics/safe_math.h"
#include "base/strings/stringprintf.h"
diff --git a/net/disk_cache/simple/post_doom_waiter.cc b/net/disk_cache/simple/post_doom_waiter.cc
index 8d508c586..aab714fa 100644
--- a/net/disk_cache/simple/post_doom_waiter.cc
+++ b/net/disk_cache/simple/post_doom_waiter.cc
@@ -4,9 +4,9 @@
#include "net/disk_cache/simple/post_doom_waiter.h"
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "net/disk_cache/simple/simple_histogram_macros.h"
namespace disk_cache {
diff --git a/net/disk_cache/simple/post_doom_waiter.h b/net/disk_cache/simple/post_doom_waiter.h
index 9a03932..c15a147 100644
--- a/net/disk_cache/simple/post_doom_waiter.h
+++ b/net/disk_cache/simple/post_doom_waiter.h
@@ -10,7 +10,7 @@
#include <unordered_map>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "net/base/cache_type.h"
diff --git a/net/disk_cache/simple/simple_backend_impl.cc b/net/disk_cache/simple/simple_backend_impl.cc
index ee51e6e..ab3b277 100644
--- a/net/disk_cache/simple/simple_backend_impl.cc
+++ b/net/disk_cache/simple/simple_backend_impl.cc
@@ -9,7 +9,7 @@
#include <functional>
#include <limits>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/thread_pool.h"
#include "build/build_config.h"
@@ -18,9 +18,9 @@
#include <sys/resource.h>
#endif
-#include "base/bind.h"
-#include "base/callback.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/net/disk_cache/simple/simple_backend_impl.h b/net/disk_cache/simple/simple_backend_impl.h
index 6533d70..d07a36c 100644
--- a/net/disk_cache/simple/simple_backend_impl.h
+++ b/net/disk_cache/simple/simple_backend_impl.h
@@ -13,9 +13,9 @@
#include <utility>
#include <vector>
-#include "base/callback_forward.h"
#include "base/compiler_specific.h"
#include "base/files/file_path.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/net/disk_cache/simple/simple_entry_impl.cc b/net/disk_cache/simple/simple_entry_impl.cc
index 3f48be8..a390c17 100644
--- a/net/disk_cache/simple/simple_entry_impl.cc
+++ b/net/disk_cache/simple/simple_entry_impl.cc
@@ -10,11 +10,11 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
#include "base/cxx17_backports.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/notreached.h"
diff --git a/net/disk_cache/simple/simple_index.cc b/net/disk_cache/simple/simple_index.cc
index 9a4d400e..28a5677 100644
--- a/net/disk_cache/simple/simple_index.cc
+++ b/net/disk_cache/simple/simple_index.cc
@@ -9,9 +9,9 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/numerics/safe_conversions.h"
#include "base/pickle.h"
#include "base/strings/string_number_conversions.h"
diff --git a/net/disk_cache/simple/simple_index.h b/net/disk_cache/simple/simple_index.h
index d513929..5d50271 100644
--- a/net/disk_cache/simple/simple_index.h
+++ b/net/disk_cache/simple/simple_index.h
@@ -13,7 +13,7 @@
#include <unordered_set>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
diff --git a/net/disk_cache/simple/simple_index_file.cc b/net/disk_cache/simple/simple_index_file.cc
index 4dd24d04..0b51f1dc 100644
--- a/net/disk_cache/simple/simple_index_file.cc
+++ b/net/disk_cache/simple/simple_index_file.cc
@@ -7,9 +7,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/files/file.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "base/pickle.h"
diff --git a/net/disk_cache/simple/simple_index_file_unittest.cc b/net/disk_cache/simple/simple_index_file_unittest.cc
index 8c0c844..aaaa8bc 100644
--- a/net/disk_cache/simple/simple_index_file_unittest.cc
+++ b/net/disk_cache/simple/simple_index_file_unittest.cc
@@ -6,11 +6,11 @@
#include <memory>
-#include "base/callback.h"
#include "base/check.h"
#include "base/files/file.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/functional/callback.h"
#include "base/hash/hash.h"
#include "base/location.h"
#include "base/pickle.h"
diff --git a/net/disk_cache/simple/simple_index_unittest.cc b/net/disk_cache/simple/simple_index_unittest.cc
index 6fc3e542..03d744c8 100644
--- a/net/disk_cache/simple/simple_index_unittest.cc
+++ b/net/disk_cache/simple/simple_index_unittest.cc
@@ -9,8 +9,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/functional/bind.h"
#include "base/hash/hash.h"
#include "base/memory/raw_ptr.h"
#include "base/pickle.h"
diff --git a/net/disk_cache/simple/simple_net_log_parameters.cc b/net/disk_cache/simple/simple_net_log_parameters.cc
index e146d13..6e31ac6e 100644
--- a/net/disk_cache/simple/simple_net_log_parameters.cc
+++ b/net/disk_cache/simple/simple_net_log_parameters.cc
@@ -6,10 +6,10 @@
#include <utility>
-#include "base/bind.h"
#include "base/check.h"
#include "base/compiler_specific.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
#include "base/strings/stringprintf.h"
#include "base/values.h"
#include "net/base/net_errors.h"
diff --git a/net/disk_cache/simple/simple_test_util.h b/net/disk_cache/simple/simple_test_util.h
index c1d7f9b..bbe1264 100644
--- a/net/disk_cache/simple/simple_test_util.h
+++ b/net/disk_cache/simple/simple_test_util.h
@@ -9,7 +9,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
namespace base {
class FilePath;
diff --git a/net/dns/address_sorter.h b/net/dns/address_sorter.h
index cb7872e..209e07e 100644
--- a/net/dns/address_sorter.h
+++ b/net/dns/address_sorter.h
@@ -8,7 +8,7 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "net/base/ip_endpoint.h"
#include "net/base/net_export.h"
diff --git a/net/dns/address_sorter_posix_unittest.cc b/net/dns/address_sorter_posix_unittest.cc
index 9353e39..a4383aef 100644
--- a/net/dns/address_sorter_posix_unittest.cc
+++ b/net/dns/address_sorter_posix_unittest.cc
@@ -8,8 +8,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/notreached.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/dns/address_sorter_unittest.cc b/net/dns/address_sorter_unittest.cc
index bacea6f..b9b8edf 100644
--- a/net/dns/address_sorter_unittest.cc
+++ b/net/dns/address_sorter_unittest.cc
@@ -13,8 +13,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/test/task_environment.h"
#include "net/base/completion_once_callback.h"
#include "net/base/ip_address.h"
diff --git a/net/dns/address_sorter_win.cc b/net/dns/address_sorter_win.cc
index a8cfe28..273710b 100644
--- a/net/dns/address_sorter_win.cc
+++ b/net/dns/address_sorter_win.cc
@@ -10,7 +10,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/free_deleter.h"
diff --git a/net/dns/context_host_resolver_unittest.cc b/net/dns/context_host_resolver_unittest.cc
index a275841..3ca952a 100644
--- a/net/dns/context_host_resolver_unittest.cc
+++ b/net/dns/context_host_resolver_unittest.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/containers/fixed_flat_map.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/test/scoped_feature_list.h"
diff --git a/net/dns/dns_client.cc b/net/dns/dns_client.cc
index c5c0b7c..d8e9ca7 100644
--- a/net/dns/dns_client.cc
+++ b/net/dns/dns_client.cc
@@ -8,7 +8,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_macros.h"
#include "base/rand_util.h"
diff --git a/net/dns/dns_client_unittest.cc b/net/dns/dns_client_unittest.cc
index 7665745..6d9dcd3 100644
--- a/net/dns/dns_client_unittest.cc
+++ b/net/dns/dns_client_unittest.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/rand_util.h"
#include "base/test/task_environment.h"
#include "net/base/ip_address.h"
diff --git a/net/dns/dns_config_service.cc b/net/dns/dns_config_service.cc
index 02e0a458..86b93656 100644
--- a/net/dns/dns_config_service.cc
+++ b/net/dns/dns_config_service.cc
@@ -7,9 +7,9 @@
#include <memory>
#include <string>
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/notreached.h"
diff --git a/net/dns/dns_config_service_android.cc b/net/dns/dns_config_service_android.cc
index 70605d8..1aed074e 100644
--- a/net/dns/dns_config_service_android.cc
+++ b/net/dns/dns_config_service_android.cc
@@ -11,8 +11,8 @@
#include <utility>
#include "base/android/build_info.h"
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/sequence_checker.h"
diff --git a/net/dns/dns_config_service_android_unittest.cc b/net/dns/dns_config_service_android_unittest.cc
index b079f40..7792a4b6 100644
--- a/net/dns/dns_config_service_android_unittest.cc
+++ b/net/dns/dns_config_service_android_unittest.cc
@@ -10,7 +10,7 @@
#include <vector>
#include "base/android/build_info.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_refptr.h"
#include "base/test/task_environment.h"
diff --git a/net/dns/dns_config_service_linux.cc b/net/dns/dns_config_service_linux.cc
index ea74a2d3..5273da51 100644
--- a/net/dns/dns_config_service_linux.cc
+++ b/net/dns/dns_config_service_linux.cc
@@ -17,11 +17,11 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check.h"
#include "base/files/file_path.h"
#include "base/files/file_path_watcher.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
diff --git a/net/dns/dns_config_service_linux_unittest.cc b/net/dns/dns_config_service_linux_unittest.cc
index 150d22da..1555f2ab 100644
--- a/net/dns/dns_config_service_linux_unittest.cc
+++ b/net/dns/dns_config_service_linux_unittest.cc
@@ -11,10 +11,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/cancelable_callback.h"
#include "base/check.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/run_loop.h"
diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
index a8a223d..a93e7cd 100644
--- a/net/dns/dns_config_service_posix.cc
+++ b/net/dns/dns_config_service_posix.cc
@@ -9,10 +9,10 @@
#include <type_traits>
#include <utility>
-#include "base/bind.h"
#include "base/files/file.h"
#include "base/files/file_path.h"
#include "base/files/file_path_watcher.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/location.h"
#include "base/logging.h"
diff --git a/net/dns/dns_config_service_posix_unittest.cc b/net/dns/dns_config_service_posix_unittest.cc
index dc37587..1257b73 100644
--- a/net/dns/dns_config_service_posix_unittest.cc
+++ b/net/dns/dns_config_service_posix_unittest.cc
@@ -8,9 +8,9 @@
#include <memory>
-#include "base/bind.h"
#include "base/cancelable_callback.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/sys_byteorder.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/net/dns/dns_config_service_unittest.cc b/net/dns/dns_config_service_unittest.cc
index 6b926d8..246e7de2 100644
--- a/net/dns/dns_config_service_unittest.cc
+++ b/net/dns/dns_config_service_unittest.cc
@@ -8,8 +8,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/cancelable_callback.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/net/dns/dns_config_service_win.cc b/net/dns/dns_config_service_win.cc
index 1e0ed41..b0736a6 100644
--- a/net/dns/dns_config_service_win.cc
+++ b/net/dns/dns_config_service_win.cc
@@ -10,11 +10,11 @@
#include <set>
#include <string>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/files/file_path.h"
#include "base/files/file_path_watcher.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/free_deleter.h"
diff --git a/net/dns/dns_config_watcher_mac.h b/net/dns/dns_config_watcher_mac.h
index 9d1fbe6..1dd72cc 100644
--- a/net/dns/dns_config_watcher_mac.h
+++ b/net/dns/dns_config_watcher_mac.h
@@ -5,7 +5,7 @@
#ifndef NET_DNS_DNS_CONFIG_WATCHER_MAC_H_
#define NET_DNS_DNS_CONFIG_WATCHER_MAC_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "net/dns/notify_watcher_mac.h"
namespace net::internal {
diff --git a/net/dns/dns_session.cc b/net/dns/dns_session.cc
index 34ab08f..3516858 100644
--- a/net/dns/dns_session.cc
+++ b/net/dns/dns_session.cc
@@ -9,7 +9,7 @@
#include <limits>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/rand_util.h"
#include "net/dns/dns_config.h"
#include "net/log/net_log.h"
diff --git a/net/dns/dns_test_util.cc b/net/dns/dns_test_util.cc
index a1ef1d7..91afaf30 100644
--- a/net/dns/dns_test_util.cc
+++ b/net/dns/dns_test_util.cc
@@ -10,8 +10,8 @@
#include <vector>
#include "base/big_endian.h"
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/numerics/safe_conversions.h"
#include "base/ranges/algorithm.h"
diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
index 14efacc..1ba2317 100644
--- a/net/dns/dns_transaction.cc
+++ b/net/dns/dns_transaction.cc
@@ -14,10 +14,10 @@
#include "base/base64url.h"
#include "base/big_endian.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/circular_deque.h"
#include "base/containers/span.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/net/dns/dns_transaction.h b/net/dns/dns_transaction.h
index c388ff8..470e5cf 100644
--- a/net/dns/dns_transaction.h
+++ b/net/dns/dns_transaction.h
@@ -10,7 +10,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/string_piece.h"
#include "base/time/time.h"
diff --git a/net/dns/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc
index 4c98706..696f6ff 100644
--- a/net/dns/dns_transaction_unittest.cc
+++ b/net/dns/dns_transaction_unittest.cc
@@ -12,8 +12,8 @@
#include <vector>
#include "base/base64url.h"
-#include "base/bind.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/numerics/safe_math.h"
#include "base/rand_util.h"
diff --git a/net/dns/fuzzed_host_resolver_util.cc b/net/dns/fuzzed_host_resolver_util.cc
index 22abd6dc..f78cfbc6 100644
--- a/net/dns/fuzzed_host_resolver_util.cc
+++ b/net/dns/fuzzed_host_resolver_util.cc
@@ -14,8 +14,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/notreached.h"
diff --git a/net/dns/host_cache.cc b/net/dns/host_cache.cc
index c3aaf7d..82a98cf 100644
--- a/net/dns/host_cache.cc
+++ b/net/dns/host_cache.cc
@@ -15,8 +15,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram_macros.h"
#include "base/numerics/safe_conversions.h"
diff --git a/net/dns/host_cache_unittest.cc b/net/dns/host_cache_unittest.cc
index 1b15ed0..a68b326 100644
--- a/net/dns/host_cache_unittest.cc
+++ b/net/dns/host_cache_unittest.cc
@@ -11,10 +11,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/format_macros.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_writer.h"
#include "base/strings/strcat.h"
diff --git a/net/dns/host_resolver.cc b/net/dns/host_resolver.cc
index c554a1c..992810e 100644
--- a/net/dns/host_resolver.cc
+++ b/net/dns/host_resolver.cc
@@ -9,8 +9,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/no_destructor.h"
#include "base/notreached.h"
#include "base/ranges/algorithm.h"
diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
index 9f4a1ab..c6bac4a 100644
--- a/net/dns/host_resolver_manager.cc
+++ b/net/dns/host_resolver_manager.cc
@@ -17,9 +17,6 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
#include "base/compiler_specific.h"
#include "base/containers/circular_deque.h"
@@ -29,6 +26,9 @@
#include "base/containers/linked_list.h"
#include "base/debug/debugger.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/functional/identity.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/net/dns/host_resolver_manager.h b/net/dns/host_resolver_manager.h
index 5f3f238c..1457a742 100644
--- a/net/dns/host_resolver_manager.h
+++ b/net/dns/host_resolver_manager.h
@@ -15,8 +15,8 @@
#include <string>
#include <vector>
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/net/dns/host_resolver_manager_fuzzer.cc b/net/dns/host_resolver_manager_fuzzer.cc
index 061d7c707..ca2cb096 100644
--- a/net/dns/host_resolver_manager_fuzzer.cc
+++ b/net/dns/host_resolver_manager_fuzzer.cc
@@ -11,8 +11,8 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/task/sequenced_task_runner.h"
#include "base/test/task_environment.h"
diff --git a/net/dns/host_resolver_manager_unittest.cc b/net/dns/host_resolver_manager_unittest.cc
index 5dbe9fd..d6f1a78 100644
--- a/net/dns/host_resolver_manager_unittest.cc
+++ b/net/dns/host_resolver_manager_unittest.cc
@@ -12,9 +12,9 @@
#include <vector>
#include "base/auto_reset.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
diff --git a/net/dns/host_resolver_mdns_task.cc b/net/dns/host_resolver_mdns_task.cc
index 58d2b03..9958faa 100644
--- a/net/dns/host_resolver_mdns_task.cc
+++ b/net/dns/host_resolver_mdns_task.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/notreached.h"
diff --git a/net/dns/host_resolver_mdns_task.h b/net/dns/host_resolver_mdns_task.h
index a5c5a07..19c208db 100644
--- a/net/dns/host_resolver_mdns_task.h
+++ b/net/dns/host_resolver_mdns_task.h
@@ -9,8 +9,8 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
#include "base/containers/unique_ptr_adapters.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
diff --git a/net/dns/host_resolver_nat64_task.cc b/net/dns/host_resolver_nat64_task.cc
index 2d957e1f..c87f66b 100644
--- a/net/dns/host_resolver_nat64_task.cc
+++ b/net/dns/host_resolver_nat64_task.cc
@@ -7,8 +7,8 @@
#include <algorithm>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/functional/callback.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
diff --git a/net/dns/mdns_cache.h b/net/dns/mdns_cache.h
index a8e91bc7..0909c53 100644
--- a/net/dns/mdns_cache.h
+++ b/net/dns/mdns_cache.h
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "net/base/net_export.h"
diff --git a/net/dns/mdns_cache_unittest.cc b/net/dns/mdns_cache_unittest.cc
index 1b23e2b..844d0c18 100644
--- a/net/dns/mdns_cache_unittest.cc
+++ b/net/dns/mdns_cache_unittest.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/time/time.h"
#include "net/dns/dns_response.h"
#include "net/dns/dns_test_util.h"
diff --git a/net/dns/mdns_client.h b/net/dns/mdns_client.h
index a41a015..f9f8fb1 100644
--- a/net/dns/mdns_client.h
+++ b/net/dns/mdns_client.h
@@ -12,7 +12,7 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "net/base/ip_endpoint.h"
#include "net/base/net_export.h"
diff --git a/net/dns/mdns_client_impl.cc b/net/dns/mdns_client_impl.cc
index 22f1b66..8088f05 100644
--- a/net/dns/mdns_client_impl.cc
+++ b/net/dns/mdns_client_impl.cc
@@ -10,7 +10,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/observer_list.h"
#include "base/strings/string_util.h"
diff --git a/net/dns/mdns_client_unittest.cc b/net/dns/mdns_client_unittest.cc
index 9a3d884..955d652b 100644
--- a/net/dns/mdns_client_unittest.cc
+++ b/net/dns/mdns_client_unittest.cc
@@ -6,7 +6,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/net/dns/mock_host_resolver.cc b/net/dns/mock_host_resolver.cc
index a0b82ff2..78562f5 100644
--- a/net/dns/mock_host_resolver.cc
+++ b/net/dns/mock_host_resolver.cc
@@ -11,9 +11,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/net/dns/mock_mdns_socket_factory.cc b/net/dns/mock_mdns_socket_factory.cc
index d21da91..66ea2d69 100644
--- a/net/dns/mock_mdns_socket_factory.cc
+++ b/net/dns/mock_mdns_socket_factory.cc
@@ -7,8 +7,8 @@
#include <algorithm>
#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/single_thread_task_runner.h"
#include "net/base/net_errors.h"
diff --git a/net/dns/notify_watcher_mac.cc b/net/dns/notify_watcher_mac.cc
index 9ff51957..b703403 100644
--- a/net/dns/notify_watcher_mac.cc
+++ b/net/dns/notify_watcher_mac.cc
@@ -6,8 +6,8 @@
#include <notify.h>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/mac/mac_util.h"
#include "base/posix/eintr_wrapper.h"
diff --git a/net/dns/notify_watcher_mac.h b/net/dns/notify_watcher_mac.h
index 04009ae..dc06e42 100644
--- a/net/dns/notify_watcher_mac.h
+++ b/net/dns/notify_watcher_mac.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback.h"
#include "base/files/file_descriptor_watcher_posix.h"
+#include "base/functional/callback.h"
namespace net {
diff --git a/net/dns/nsswitch_reader.cc b/net/dns/nsswitch_reader.cc
index d31eaec..dfe06799 100644
--- a/net/dns/nsswitch_reader.cc
+++ b/net/dns/nsswitch_reader.cc
@@ -8,10 +8,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.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/metrics/histogram_macros.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_split.h"
diff --git a/net/dns/nsswitch_reader.h b/net/dns/nsswitch_reader.h
index 4c71dca8..b234ff3 100644
--- a/net/dns/nsswitch_reader.h
+++ b/net/dns/nsswitch_reader.h
@@ -9,7 +9,7 @@
#include <tuple>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "net/base/net_export.h"
namespace net {
diff --git a/net/dns/nsswitch_reader_unittest.cc b/net/dns/nsswitch_reader_unittest.cc
index 1a502bc..b5f984f6 100644
--- a/net/dns/nsswitch_reader_unittest.cc
+++ b/net/dns/nsswitch_reader_unittest.cc
@@ -8,8 +8,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/dns/public/resolv_reader.cc b/net/dns/public/resolv_reader.cc
index 302ad8b..20670f3 100644
--- a/net/dns/public/resolv_reader.cc
+++ b/net/dns/public/resolv_reader.cc
@@ -13,8 +13,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "build/build_config.h"
#include "net/base/ip_endpoint.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/net/dns/public/resolv_reader_unittest.cc b/net/dns/public/resolv_reader_unittest.cc
index f91f2b8..603ab251 100644
--- a/net/dns/public/resolv_reader_unittest.cc
+++ b/net/dns/public/resolv_reader_unittest.cc
@@ -11,9 +11,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/cancelable_callback.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/sys_byteorder.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/net/dns/public/win_dns_system_settings.cc b/net/dns/public/win_dns_system_settings.cc
index 49d4486..7a2f1a0 100644
--- a/net/dns/public/win_dns_system_settings.cc
+++ b/net/dns/public/win_dns_system_settings.cc
@@ -11,8 +11,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/free_deleter.h"
diff --git a/net/dns/resolve_context_unittest.cc b/net/dns/resolve_context_unittest.cc
index 22c5d9c..3e6840f 100644
--- a/net/dns/resolve_context_unittest.cc
+++ b/net/dns/resolve_context_unittest.cc
@@ -9,7 +9,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
diff --git a/net/dns/serial_worker.cc b/net/dns/serial_worker.cc
index e1506c7..0198a30 100644
--- a/net/dns/serial_worker.cc
+++ b/net/dns/serial_worker.cc
@@ -7,9 +7,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/notreached.h"
#include "base/task/thread_pool.h"
diff --git a/net/dns/serial_worker.h b/net/dns/serial_worker.h
index c4158ca4..197cc021 100644
--- a/net/dns/serial_worker.h
+++ b/net/dns/serial_worker.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
#include "base/task/task_traits.h"
diff --git a/net/dns/serial_worker_unittest.cc b/net/dns/serial_worker_unittest.cc
index 5c80d2d..c2dd5542 100644
--- a/net/dns/serial_worker_unittest.cc
+++ b/net/dns/serial_worker_unittest.cc
@@ -7,9 +7,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/net/dns/system_dns_config_change_notifier.cc b/net/dns/system_dns_config_change_notifier.cc
index 05bc600..48f62e2 100644
--- a/net/dns/system_dns_config_change_notifier.cc
+++ b/net/dns/system_dns_config_change_notifier.cc
@@ -7,8 +7,8 @@
#include <map>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/net/dns/system_dns_config_change_notifier_unittest.cc b/net/dns/system_dns_config_change_notifier_unittest.cc
index d18422dc..bf6f8f75 100644
--- a/net/dns/system_dns_config_change_notifier_unittest.cc
+++ b/net/dns/system_dns_config_change_notifier_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/run_loop.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/net/dns/test_dns_config_service.h b/net/dns/test_dns_config_service.h
index a8da79e..938394e6 100644
--- a/net/dns/test_dns_config_service.h
+++ b/net/dns/test_dns_config_service.h
@@ -8,8 +8,8 @@
#include <memory>
#include <utility>
-#include "base/callback.h"
#include "base/check.h"
+#include "base/functional/callback.h"
#include "net/base/net_export.h"
#include "net/dns/dns_config_service.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store.cc b/net/extras/sqlite/sqlite_persistent_cookie_store.cc
index cea0648..fcaf3ebb 100644
--- a/net/extras/sqlite/sqlite_persistent_cookie_store.cc
+++ b/net/extras/sqlite/sqlite_persistent_cookie_store.cc
@@ -11,11 +11,11 @@
#include <tuple>
#include <unordered_set>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/feature_list.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/location.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store.h b/net/extras/sqlite/sqlite_persistent_cookie_store.h
index 72bca851..bb026cb9 100644
--- a/net/extras/sqlite/sqlite_persistent_cookie_store.h
+++ b/net/extras/sqlite/sqlite_persistent_cookie_store.h
@@ -10,8 +10,8 @@
#include <utility>
#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/task/task_traits.h"
#include "net/cookies/cookie_monster.h"
diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store_perftest.cc b/net/extras/sqlite/sqlite_persistent_cookie_store_perftest.cc
index b3bfe2b3..5bd15e5 100644
--- a/net/extras/sqlite/sqlite_persistent_cookie_store_perftest.cc
+++ b/net/extras/sqlite/sqlite_persistent_cookie_store_perftest.cc
@@ -6,9 +6,9 @@
#include <vector>
-#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/functional/bind.h"
#include "base/rand_util.h"
#include "base/strings/stringprintf.h"
#include "base/synchronization/waitable_event.h"
diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc b/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc
index 446b4f91..f56be25 100644
--- a/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc
+++ b/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc
@@ -11,11 +11,11 @@
#include <set>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/containers/span.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/location.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
diff --git a/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.cc b/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.cc
index d38c869..acd5130 100644
--- a/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.cc
+++ b/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.cc
@@ -11,11 +11,11 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/feature_list.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/json/json_reader.h"
#include "base/json/json_string_value_serializer.h"
#include "base/metrics/histogram_macros.h"
diff --git a/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store_unittest.cc b/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store_unittest.cc
index c1b8ffab..2a88dd4 100644
--- a/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store_unittest.cc
+++ b/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store_unittest.cc
@@ -7,9 +7,9 @@
#include <memory>
#include <vector>
-#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/synchronization/waitable_event.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/net/extras/sqlite/sqlite_persistent_store_backend_base.cc b/net/extras/sqlite/sqlite_persistent_store_backend_base.cc
index c270c5a..0397c93 100644
--- a/net/extras/sqlite/sqlite_persistent_store_backend_base.cc
+++ b/net/extras/sqlite/sqlite_persistent_store_backend_base.cc
@@ -6,9 +6,9 @@
#include <utility>
-#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/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros_local.h"
diff --git a/net/extras/sqlite/sqlite_persistent_store_backend_base.h b/net/extras/sqlite/sqlite_persistent_store_backend_base.h
index 092c7bcd1..57c91a5 100644
--- a/net/extras/sqlite/sqlite_persistent_store_backend_base.h
+++ b/net/extras/sqlite/sqlite_persistent_store_backend_base.h
@@ -8,10 +8,10 @@
#include <memory>
#include <string>
-#include "base/callback.h"
-#include "base/callback_forward.h"
#include "base/component_export.h"
#include "base/files/file_path.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/ref_counted.h"
#include "base/thread_annotations.h"
#include "sql/meta_table.h"
diff --git a/net/filter/brotli_source_stream.cc b/net/filter/brotli_source_stream.cc
index 45b2094..72350ad 100644
--- a/net/filter/brotli_source_stream.cc
+++ b/net/filter/brotli_source_stream.cc
@@ -4,9 +4,9 @@
#include "net/filter/brotli_source_stream.h"
-#include "base/bind.h"
#include "base/bit_cast.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_macros.h"
#include "net/base/io_buffer.h"
diff --git a/net/filter/brotli_source_stream_unittest.cc b/net/filter/brotli_source_stream_unittest.cc
index 1638300..cbbfb7a 100644
--- a/net/filter/brotli_source_stream_unittest.cc
+++ b/net/filter/brotli_source_stream_unittest.cc
@@ -5,9 +5,9 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/path_service.h"
#include "base/run_loop.h"
diff --git a/net/filter/filter_source_stream.cc b/net/filter/filter_source_stream.cc
index 845f6d883..f40438e 100644
--- a/net/filter/filter_source_stream.cc
+++ b/net/filter/filter_source_stream.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/metrics/histogram_macros.h"
#include "base/notreached.h"
#include "base/numerics/safe_conversions.h"
diff --git a/net/filter/filter_source_stream_unittest.cc b/net/filter/filter_source_stream_unittest.cc
index 543d529d..e238e4c 100644
--- a/net/filter/filter_source_stream_unittest.cc
+++ b/net/filter/filter_source_stream_unittest.cc
@@ -5,8 +5,8 @@
#include <algorithm>
#include <string>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/numerics/safe_conversions.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
diff --git a/net/filter/fuzzed_source_stream.cc b/net/filter/fuzzed_source_stream.cc
index 58d09c5d..2804efe 100644
--- a/net/filter/fuzzed_source_stream.cc
+++ b/net/filter/fuzzed_source_stream.cc
@@ -10,7 +10,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
#include "net/base/io_buffer.h"
diff --git a/net/filter/gzip_source_stream.cc b/net/filter/gzip_source_stream.cc
index 129ca79..8bd5c8e 100644
--- a/net/filter/gzip_source_stream.cc
+++ b/net/filter/gzip_source_stream.cc
@@ -8,9 +8,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/bit_cast.h"
#include "base/check_op.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/net/filter/gzip_source_stream_unittest.cc b/net/filter/gzip_source_stream_unittest.cc
index c4a109c..85c3202 100644
--- a/net/filter/gzip_source_stream_unittest.cc
+++ b/net/filter/gzip_source_stream_unittest.cc
@@ -5,8 +5,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "net/base/io_buffer.h"
#include "net/base/test_completion_callback.h"
diff --git a/net/filter/source_stream.h b/net/filter/source_stream.h
index 0b865b5b..0a37d66 100644
--- a/net/filter/source_stream.h
+++ b/net/filter/source_stream.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "net/base/completion_once_callback.h"
#include "net/base/net_errors.h"
#include "net/base/net_export.h"
diff --git a/net/http/bidirectional_stream.cc b/net/http/bidirectional_stream.cc
index fdff1da..fd1b8da 100644
--- a/net/http/bidirectional_stream.cc
+++ b/net/http/bidirectional_stream.cc
@@ -7,7 +7,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
diff --git a/net/http/broken_alternative_services.cc b/net/http/broken_alternative_services.cc
index f2021ec..ad9045c 100644
--- a/net/http/broken_alternative_services.cc
+++ b/net/http/broken_alternative_services.cc
@@ -4,8 +4,8 @@
#include "net/http/broken_alternative_services.h"
-#include "base/bind.h"
#include "base/containers/adapters.h"
+#include "base/functional/bind.h"
#include "base/memory/singleton.h"
#include "base/time/tick_clock.h"
#include "base/time/time.h"
diff --git a/net/http/http_auth_controller.cc b/net/http/http_auth_controller.cc
index 81f79ca4..597880a 100644
--- a/net/http/http_auth_controller.cc
+++ b/net/http/http_auth_controller.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/net/http/http_auth_gssapi_posix_unittest.cc b/net/http/http_auth_gssapi_posix_unittest.cc
index c474a27..90cb4ac 100644
--- a/net/http/http_auth_gssapi_posix_unittest.cc
+++ b/net/http/http_auth_gssapi_posix_unittest.cc
@@ -7,8 +7,8 @@
#include <memory>
#include "base/base_paths.h"
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/json/json_reader.h"
#include "base/native_library.h"
#include "base/path_service.h"
diff --git a/net/http/http_auth_handler.cc b/net/http/http_auth_handler.cc
index a5bd1d6d..c3a516b 100644
--- a/net/http/http_auth_handler.cc
+++ b/net/http/http_auth_handler.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 "net/base/net_errors.h"
#include "net/http/http_auth_challenge_tokenizer.h"
#include "net/log/net_log.h"
diff --git a/net/http/http_auth_handler_factory_unittest.cc b/net/http/http_auth_handler_factory_unittest.cc
index 9c388b0..2143419 100644
--- a/net/http/http_auth_handler_factory_unittest.cc
+++ b/net/http/http_auth_handler_factory_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "build/build_config.h"
#include "net/base/net_errors.h"
#include "net/base/network_isolation_key.h"
diff --git a/net/http/http_auth_handler_mock.cc b/net/http/http_auth_handler_mock.cc
index 4e6ceabb..9fb9e7e 100644
--- a/net/http/http_auth_handler_mock.cc
+++ b/net/http/http_auth_handler_mock.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/strings/string_util.h"
diff --git a/net/http/http_auth_handler_negotiate.cc b/net/http/http_auth_handler_negotiate.cc
index cc488fa..c79ae8b7d 100644
--- a/net/http/http_auth_handler_negotiate.cc
+++ b/net/http/http_auth_handler_negotiate.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 "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
diff --git a/net/http/http_auth_handler_negotiate_unittest.cc b/net/http/http_auth_handler_negotiate_unittest.cc
index f61ca4c..c8c4354 100644
--- a/net/http/http_auth_handler_negotiate_unittest.cc
+++ b/net/http/http_auth_handler_negotiate_unittest.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/strings/string_util.h"
diff --git a/net/http/http_auth_mechanism.h b/net/http/http_auth_mechanism.h
index 5e3a4db..6919abd 100644
--- a/net/http/http_auth_mechanism.h
+++ b/net/http/http_auth_mechanism.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "net/base/completion_once_callback.h"
#include "net/base/net_export.h"
#include "net/http/http_auth.h"
diff --git a/net/http/http_auth_preferences.h b/net/http/http_auth_preferences.h
index 677a3524f..3e87d95 100644
--- a/net/http/http_auth_preferences.h
+++ b/net/http/http_auth_preferences.h
@@ -9,7 +9,7 @@
#include <set>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
#include "net/base/net_export.h"
diff --git a/net/http/http_auth_preferences_unittest.cc b/net/http/http_auth_preferences_unittest.cc
index 57557fb..e3f866c 100644
--- a/net/http/http_auth_preferences_unittest.cc
+++ b/net/http/http_auth_preferences_unittest.cc
@@ -7,8 +7,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
#include "base/threading/thread.h"
diff --git a/net/http/http_auth_sspi_win_unittest.cc b/net/http/http_auth_sspi_win_unittest.cc
index b665b0f5..95ae9f91 100644
--- a/net/http/http_auth_sspi_win_unittest.cc
+++ b/net/http/http_auth_sspi_win_unittest.cc
@@ -7,7 +7,7 @@
#include <vector>
#include "base/base64.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/json/json_reader.h"
#include "net/base/net_errors.h"
#include "net/http/http_auth.h"
diff --git a/net/http/http_basic_stream.cc b/net/http/http_basic_stream.cc
index 6f9d4a7..429c89e 100644
--- a/net/http/http_basic_stream.cc
+++ b/net/http/http_basic_stream.cc
@@ -7,7 +7,7 @@
#include <set>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "net/http/http_network_session.h"
#include "net/http/http_raw_request_headers.h"
#include "net/http/http_request_info.h"
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index 7af00221..e68e3b77 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -6,13 +6,13 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
#include "base/feature_list.h"
#include "base/files/file_util.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/net/http/http_cache.h b/net/http/http_cache.h
index 2297d581..481ed0d 100644
--- a/net/http/http_cache.h
+++ b/net/http/http_cache.h
@@ -21,8 +21,8 @@
#include <unordered_map>
#include <unordered_set>
-#include "base/callback.h"
#include "base/files/file_path.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/net/http/http_cache_lookup_manager.cc b/net/http/http_cache_lookup_manager.cc
index e20baca0..d1a469a 100644
--- a/net/http/http_cache_lookup_manager.cc
+++ b/net/http/http_cache_lookup_manager.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/values.h"
#include "net/base/load_flags.h"
#include "net/base/network_anonymization_key.h"
diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc
index 8701120..f29a570 100644
--- a/net/http/http_cache_transaction.cc
+++ b/net/http/http_cache_transaction.cc
@@ -18,12 +18,12 @@
#include <utility>
#include "base/auto_reset.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
#include "base/containers/fixed_flat_set.h"
#include "base/cxx17_backports.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
diff --git a/net/http/http_cache_unittest.cc b/net/http/http_cache_unittest.cc
index a88baeb..961ded4 100644
--- a/net/http/http_cache_unittest.cc
+++ b/net/http/http_cache_unittest.cc
@@ -12,11 +12,11 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/cxx20_erase.h"
#include "base/files/scoped_temp_dir.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/net/http/http_cache_writers.cc b/net/http/http_cache_writers.cc
index c48bba4..4630b52 100644
--- a/net/http/http_cache_writers.cc
+++ b/net/http/http_cache_writers.cc
@@ -8,10 +8,10 @@
#include <utility>
#include "base/auto_reset.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/debug/crash_logging.h"
#include "base/debug/dump_without_crashing.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/net/http/http_cache_writers_unittest.cc b/net/http/http_cache_writers_unittest.cc
index 4fdc2c9c..4b43e5d 100644
--- a/net/http/http_cache_writers_unittest.cc
+++ b/net/http/http_cache_writers_unittest.cc
@@ -10,7 +10,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "crypto/secure_hash.h"
#include "net/http/http_cache.h"
diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index a0a9c183..5f12179f 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -15,9 +15,9 @@
#include <unordered_set>
#include <vector>
-#include "base/bind.h"
#include "base/containers/flat_set.h"
#include "base/containers/unique_ptr_adapters.h"
+#include "base/functional/bind.h"
#include "base/memory/memory_pressure_monitor.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 84f5b7e..d8c1a38 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -9,11 +9,11 @@
#include <vector>
#include "base/base64url.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
#include "base/feature_list.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 8a93826..e4effed 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -15,10 +15,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/json/json_writer.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/net/http/http_proxy_client_socket.cc b/net/http/http_proxy_client_socket.cc
index 91757dd1..b6bd7f0 100644
--- a/net/http/http_proxy_client_socket.cc
+++ b/net/http/http_proxy_client_socket.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/strings/string_util.h"
#include "base/values.h"
#include "net/base/auth.h"
diff --git a/net/http/http_proxy_connect_job.cc b/net/http/http_proxy_connect_job.cc
index 849d6dd..4a54955 100644
--- a/net/http/http_proxy_connect_job.cc
+++ b/net/http/http_proxy_connect_job.cc
@@ -7,9 +7,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/cxx17_backports.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/field_trial_params.h"
#include "base/metrics/histogram_functions.h"
diff --git a/net/http/http_proxy_connect_job.h b/net/http/http_proxy_connect_job.h
index 17d26d8..1836158 100644
--- a/net/http/http_proxy_connect_job.h
+++ b/net/http/http_proxy_connect_job.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/ref_counted.h"
#include "base/time/time.h"
#include "net/base/host_port_pair.h"
diff --git a/net/http/http_raw_request_headers.h b/net/http/http_raw_request_headers.h
index 4cd2c745..7340a94 100644
--- a/net/http/http_raw_request_headers.h
+++ b/net/http/http_raw_request_headers.h
@@ -9,7 +9,7 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/strings/string_piece.h"
#include "net/base/net_export.h"
diff --git a/net/http/http_response_body_drainer.cc b/net/http/http_response_body_drainer.cc
index b4887a43..76850120 100644
--- a/net/http/http_response_body_drainer.cc
+++ b/net/http/http_response_body_drainer.cc
@@ -4,9 +4,9 @@
#include "net/http/http_response_body_drainer.h"
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/notreached.h"
#include "net/base/io_buffer.h"
diff --git a/net/http/http_response_body_drainer_unittest.cc b/net/http/http_response_body_drainer_unittest.cc
index 1f8bc350..15cec29 100644
--- a/net/http/http_response_body_drainer_unittest.cc
+++ b/net/http/http_response_body_drainer_unittest.cc
@@ -10,8 +10,8 @@
#include <set>
#include <utility>
-#include "base/bind.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/net/http/http_response_headers.h b/net/http/http_response_headers.h
index 7417b51d..8741679c 100644
--- a/net/http/http_response_headers.h
+++ b/net/http/http_response_headers.h
@@ -12,7 +12,7 @@
#include <unordered_set>
#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/time/time.h"
diff --git a/net/http/http_server_properties.cc b/net/http/http_server_properties.cc
index 0eecf6d..deb0d09 100644
--- a/net/http/http_server_properties.cc
+++ b/net/http/http_server_properties.cc
@@ -4,11 +4,11 @@
#include "net/http/http_server_properties.h"
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/containers/adapters.h"
#include "base/containers/contains.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/string_util.h"
diff --git a/net/http/http_server_properties.h b/net/http/http_server_properties.h
index de99080a..5ba2ec0 100644
--- a/net/http/http_server_properties.h
+++ b/net/http/http_server_properties.h
@@ -15,8 +15,8 @@
#include <tuple>
#include <vector>
-#include "base/callback.h"
#include "base/containers/lru_cache.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/net/http/http_server_properties_manager.cc b/net/http/http_server_properties_manager.cc
index d3de117..478df65 100644
--- a/net/http/http_server_properties_manager.cc
+++ b/net/http/http_server_properties_manager.cc
@@ -7,9 +7,9 @@
#include <algorithm>
#include <utility>
-#include "base/bind.h"
#include "base/containers/adapters.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/string_number_conversions.h"
#include "base/time/tick_clock.h"
diff --git a/net/http/http_server_properties_manager.h b/net/http/http_server_properties_manager.h
index 5412cab..7db5703e 100644
--- a/net/http/http_server_properties_manager.h
+++ b/net/http/http_server_properties_manager.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/net/http/http_server_properties_manager_unittest.cc b/net/http/http_server_properties_manager_unittest.cc
index 4c5c7f2d..4500e6e3 100644
--- a/net/http/http_server_properties_manager_unittest.cc
+++ b/net/http/http_server_properties_manager_unittest.cc
@@ -6,9 +6,9 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/memory/ptr_util.h"
diff --git a/net/http/http_server_properties_unittest.cc b/net/http/http_server_properties_unittest.cc
index 3ee4e28..d229884 100644
--- a/net/http/http_server_properties_unittest.cc
+++ b/net/http/http_server_properties_unittest.cc
@@ -8,10 +8,10 @@
#include <string>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/json/json_writer.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/net/http/http_stream_factory_job.cc b/net/http/http_stream_factory_job.cc
index 1762e97..1c50981f 100644
--- a/net/http/http_stream_factory_job.cc
+++ b/net/http/http_stream_factory_job.cc
@@ -9,12 +9,12 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/check_op.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/location.h"
#include "base/metrics/histogram_macros.h"
#include "base/metrics/sparse_histogram.h"
diff --git a/net/http/http_stream_factory_job_controller.cc b/net/http/http_stream_factory_job_controller.cc
index 559bde1..97883ff 100644
--- a/net/http/http_stream_factory_job_controller.cc
+++ b/net/http/http_stream_factory_job_controller.cc
@@ -7,8 +7,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/string_number_conversions.h"
diff --git a/net/http/http_stream_parser.cc b/net/http/http_stream_parser.cc
index 268d4f2..09630b4 100644
--- a/net/http/http_stream_parser.cc
+++ b/net/http/http_stream_parser.cc
@@ -8,8 +8,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_macros.h"
diff --git a/net/http/http_stream_parser_unittest.cc b/net/http/http_stream_parser_unittest.cc
index e620eea..f1fb696 100644
--- a/net/http/http_stream_parser_unittest.cc
+++ b/net/http/http_stream_parser_unittest.cc
@@ -12,10 +12,10 @@
#include <utility>
#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/memory/ref_counted.h"
#include "base/run_loop.h"
#include "base/strings/string_piece.h"
diff --git a/net/http/http_stream_request.cc b/net/http/http_stream_request.cc
index 6d7f574..1d83967 100644
--- a/net/http/http_stream_request.cc
+++ b/net/http/http_stream_request.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/callback.h"
#include "base/check.h"
+#include "base/functional/callback.h"
#include "net/http/bidirectional_stream_impl.h"
#include "net/log/net_log_event_type.h"
#include "net/spdy/bidirectional_stream_spdy_impl.h"
diff --git a/net/http/http_transaction_test_util.cc b/net/http/http_transaction_test_util.cc
index b3035bb..f8c8460e 100644
--- a/net/http/http_transaction_test_util.cc
+++ b/net/http/http_transaction_test_util.cc
@@ -8,8 +8,8 @@
#include <unordered_map>
#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/run_loop.h"
#include "base/strings/stringprintf.h"
diff --git a/net/http/http_transaction_test_util.h b/net/http/http_transaction_test_util.h
index aaa3fcd..88e388b0 100644
--- a/net/http/http_transaction_test_util.h
+++ b/net/http/http_transaction_test_util.h
@@ -14,8 +14,8 @@
#include <string>
#include <vector>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
diff --git a/net/http/mock_http_cache.cc b/net/http/mock_http_cache.cc
index eb1f88b..ddaf9b45 100644
--- a/net/http/mock_http_cache.cc
+++ b/net/http/mock_http_cache.cc
@@ -9,10 +9,10 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
#include "net/base/features.h"
diff --git a/net/http/partial_data.cc b/net/http/partial_data.cc
index 1b691a0..7b3bc39a 100644
--- a/net/http/partial_data.cc
+++ b/net/http/partial_data.cc
@@ -7,9 +7,9 @@
#include <limits>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
diff --git a/net/http/transport_security_persister.cc b/net/http/transport_security_persister.cc
index 35f4d0bc..7e18017 100644
--- a/net/http/transport_security_persister.cc
+++ b/net/http/transport_security_persister.cc
@@ -11,11 +11,11 @@
#include <vector>
#include "base/base64.h"
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/feature_list.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/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/location.h"
diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc
index 38e9ac1..5f88b75 100644
--- a/net/http/transport_security_state.cc
+++ b/net/http/transport_security_state.cc
@@ -12,11 +12,11 @@
#include <vector>
#include "base/base64.h"
-#include "base/bind.h"
#include "base/build_time.h"
#include "base/containers/contains.h"
#include "base/containers/span.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/json/json_writer.h"
#include "base/logging.h"
#include "base/metrics/field_trial.h"
diff --git a/net/http/transport_security_state.h b/net/http/transport_security_state.h
index 289c137a..2f8c0b5 100644
--- a/net/http/transport_security_state.h
+++ b/net/http/transport_security_state.h
@@ -12,8 +12,8 @@
#include <set>
#include <string>
-#include "base/callback.h"
#include "base/feature_list.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/memory/raw_ptr.h"
#include "base/strings/string_piece.h"
diff --git a/net/http/transport_security_state_unittest.cc b/net/http/transport_security_state_unittest.cc
index 81ef3df6..71ec9a2 100644
--- a/net/http/transport_security_state_unittest.cc
+++ b/net/http/transport_security_state_unittest.cc
@@ -13,8 +13,8 @@
#include <vector>
#include "base/base64.h"
-#include "base/callback_helpers.h"
#include "base/files/file_path.h"
+#include "base/functional/callback_helpers.h"
#include "base/json/json_reader.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/field_trial.h"
diff --git a/net/log/file_net_log_observer.cc b/net/log/file_net_log_observer.cc
index 8b03493..d868ae4 100644
--- a/net/log/file_net_log_observer.cc
+++ b/net/log/file_net_log_observer.cc
@@ -9,10 +9,10 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/containers/queue.h"
#include "base/files/file.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/json/json_writer.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/net/log/file_net_log_observer.h b/net/log/file_net_log_observer.h
index 7bcdf8fc..b8934ae 100644
--- a/net/log/file_net_log_observer.h
+++ b/net/log/file_net_log_observer.h
@@ -8,8 +8,8 @@
#include <limits>
#include <memory>
-#include "base/callback.h"
#include "base/files/file.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "net/base/net_export.h"
#include "net/log/net_log.h"
diff --git a/net/log/file_net_log_observer_unittest.cc b/net/log/file_net_log_observer_unittest.cc
index 9587525..1868855 100644
--- a/net/log/file_net_log_observer_unittest.cc
+++ b/net/log/file_net_log_observer_unittest.cc
@@ -7,13 +7,13 @@
#include <string>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/files/file.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/scoped_file.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/memory/raw_ptr.h"
diff --git a/net/log/test_net_log.h b/net/log/test_net_log.h
index 9cf0819..9bbc697 100644
--- a/net/log/test_net_log.h
+++ b/net/log/test_net_log.h
@@ -9,8 +9,8 @@
#include <vector>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "net/log/net_log.h"
#include "net/log/net_log_event_type.h"
diff --git a/net/log/trace_net_log_observer_unittest.cc b/net/log/trace_net_log_observer_unittest.cc
index 80c07107..fd2b7dd 100644
--- a/net/log/trace_net_log_observer_unittest.cc
+++ b/net/log/trace_net_log_observer_unittest.cc
@@ -8,8 +8,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/json/json_reader.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
diff --git a/net/network_error_logging/mock_persistent_nel_store.h b/net/network_error_logging/mock_persistent_nel_store.h
index 6324e96..739c182 100644
--- a/net/network_error_logging/mock_persistent_nel_store.h
+++ b/net/network_error_logging/mock_persistent_nel_store.h
@@ -7,7 +7,7 @@
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "net/network_error_logging/network_error_logging_service.h"
#include "url/origin.h"
diff --git a/net/network_error_logging/network_error_logging_service.cc b/net/network_error_logging/network_error_logging_service.cc
index 8386057..04bb10f 100644
--- a/net/network_error_logging/network_error_logging_service.cc
+++ b/net/network_error_logging/network_error_logging_service.cc
@@ -9,8 +9,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/json/json_reader.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
diff --git a/net/network_error_logging/network_error_logging_service_unittest.cc b/net/network_error_logging/network_error_logging_service_unittest.cc
index 5152eba..7296b66b 100644
--- a/net/network_error_logging/network_error_logging_service_unittest.cc
+++ b/net/network_error_logging/network_error_logging_service_unittest.cc
@@ -6,8 +6,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/strings/stringprintf.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/simple_test_clock.h"
diff --git a/net/network_error_logging/network_error_logging_test_util.h b/net/network_error_logging/network_error_logging_test_util.h
index 0a273379..24ef088 100644
--- a/net/network_error_logging/network_error_logging_test_util.h
+++ b/net/network_error_logging/network_error_logging_test_util.h
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "net/base/address_list.h"
#include "net/base/ip_address.h"
#include "net/network_error_logging/network_error_logging_service.h"
diff --git a/net/nqe/event_creator.cc b/net/nqe/event_creator.cc
index 5007dc0..bb0b981 100644
--- a/net/nqe/event_creator.cc
+++ b/net/nqe/event_creator.cc
@@ -8,8 +8,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "net/log/net_log_capture_mode.h"
diff --git a/net/nqe/network_qualities_prefs_manager.cc b/net/nqe/network_qualities_prefs_manager.cc
index d01d951..bff2264 100644
--- a/net/nqe/network_qualities_prefs_manager.cc
+++ b/net/nqe/network_qualities_prefs_manager.cc
@@ -7,7 +7,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/metrics/histogram_macros_local.h"
#include "base/rand_util.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/net/nqe/network_quality_estimator.cc b/net/nqe/network_quality_estimator.cc
index 763d4a2..ba7c9c6 100644
--- a/net/nqe/network_quality_estimator.cc
+++ b/net/nqe/network_quality_estimator.cc
@@ -10,9 +10,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/metrics/field_trial_params.h"
#include "base/metrics/histogram.h"
diff --git a/net/nqe/network_quality_estimator_util.cc b/net/nqe/network_quality_estimator_util.cc
index 570707e..41de2d1c 100644
--- a/net/nqe/network_quality_estimator_util.cc
+++ b/net/nqe/network_quality_estimator_util.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/notreached.h"
#include "net/base/address_list.h"
#include "net/base/host_port_pair.h"
diff --git a/net/nqe/network_quality_store.cc b/net/nqe/network_quality_store.cc
index 3f5e88c..2ab17a8 100644
--- a/net/nqe/network_quality_store.cc
+++ b/net/nqe/network_quality_store.cc
@@ -4,7 +4,7 @@
#include "net/nqe/network_quality_store.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/observer_list.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/nqe/socket_watcher.cc b/net/nqe/socket_watcher.cc
index 8f782fa..a8ad99a339 100644
--- a/net/nqe/socket_watcher.cc
+++ b/net/nqe/socket_watcher.cc
@@ -4,7 +4,7 @@
#include "net/nqe/socket_watcher.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/tick_clock.h"
diff --git a/net/nqe/socket_watcher.h b/net/nqe/socket_watcher.h
index b759b36..f31959c 100644
--- a/net/nqe/socket_watcher.h
+++ b/net/nqe/socket_watcher.h
@@ -5,7 +5,7 @@
#ifndef NET_NQE_SOCKET_WATCHER_H_
#define NET_NQE_SOCKET_WATCHER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/net/nqe/socket_watcher_factory.h b/net/nqe/socket_watcher_factory.h
index ee4313d..7fcd8db6 100644
--- a/net/nqe/socket_watcher_factory.h
+++ b/net/nqe/socket_watcher_factory.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/net/nqe/socket_watcher_unittest.cc b/net/nqe/socket_watcher_unittest.cc
index 3b20bca..cba4790 100644
--- a/net/nqe/socket_watcher_unittest.cc
+++ b/net/nqe/socket_watcher_unittest.cc
@@ -4,7 +4,7 @@
#include "net/nqe/socket_watcher.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/simple_test_tick_clock.h"
diff --git a/net/nqe/throughput_analyzer.cc b/net/nqe/throughput_analyzer.cc
index abb2336a..7e384b1 100644
--- a/net/nqe/throughput_analyzer.cc
+++ b/net/nqe/throughput_analyzer.cc
@@ -6,7 +6,7 @@
#include <cmath>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/metrics/histogram_macros.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/nqe/throughput_analyzer.h b/net/nqe/throughput_analyzer.h
index dd6bc38..c1515fe 100644
--- a/net/nqe/throughput_analyzer.h
+++ b/net/nqe/throughput_analyzer.h
@@ -10,7 +10,7 @@
#include <unordered_map>
#include <unordered_set>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/sequence_checker.h"
diff --git a/net/nqe/throughput_analyzer_unittest.cc b/net/nqe/throughput_analyzer_unittest.cc
index 779ba26..32ea5d19 100644
--- a/net/nqe/throughput_analyzer_unittest.cc
+++ b/net/nqe/throughput_analyzer_unittest.cc
@@ -12,9 +12,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/run_loop.h"
#include "base/strings/string_number_conversions.h"
diff --git a/net/proxy_resolution/configured_proxy_resolution_request.cc b/net/proxy_resolution/configured_proxy_resolution_request.cc
index 4934465..fb13933e3 100644
--- a/net/proxy_resolution/configured_proxy_resolution_request.cc
+++ b/net/proxy_resolution/configured_proxy_resolution_request.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 "net/base/net_errors.h"
#include "net/log/net_log_event_type.h"
#include "net/proxy_resolution/configured_proxy_resolution_service.h"
diff --git a/net/proxy_resolution/configured_proxy_resolution_service.cc b/net/proxy_resolution/configured_proxy_resolution_service.cc
index 09f8244..cd91e01c 100644
--- a/net/proxy_resolution/configured_proxy_resolution_service.cc
+++ b/net/proxy_resolution/configured_proxy_resolution_service.cc
@@ -9,9 +9,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
diff --git a/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc b/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc
index 1ac9a3b..a0c8c19f 100644
--- a/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc
+++ b/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc
@@ -10,9 +10,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/check.h"
#include "base/format_macros.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/net/proxy_resolution/multi_threaded_proxy_resolver.cc b/net/proxy_resolution/multi_threaded_proxy_resolver.cc
index fcfa4b8..10b99a34e 100644
--- a/net/proxy_resolution/multi_threaded_proxy_resolver.cc
+++ b/net/proxy_resolution/multi_threaded_proxy_resolver.cc
@@ -8,9 +8,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/strings/string_util.h"
diff --git a/net/proxy_resolution/multi_threaded_proxy_resolver_unittest.cc b/net/proxy_resolution/multi_threaded_proxy_resolver_unittest.cc
index 52e1dd6..c3d38c8 100644
--- a/net/proxy_resolution/multi_threaded_proxy_resolver_unittest.cc
+++ b/net/proxy_resolution/multi_threaded_proxy_resolver_unittest.cc
@@ -8,7 +8,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/strings/string_util.h"
diff --git a/net/proxy_resolution/network_delegate_error_observer.cc b/net/proxy_resolution/network_delegate_error_observer.cc
index 448fda64..b63dfec 100644
--- a/net/proxy_resolution/network_delegate_error_observer.cc
+++ b/net/proxy_resolution/network_delegate_error_observer.cc
@@ -4,7 +4,7 @@
#include "net/proxy_resolution/network_delegate_error_observer.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/proxy_resolution/network_delegate_error_observer_unittest.cc b/net/proxy_resolution/network_delegate_error_observer_unittest.cc
index 5789860..f53faca 100644
--- a/net/proxy_resolution/network_delegate_error_observer_unittest.cc
+++ b/net/proxy_resolution/network_delegate_error_observer_unittest.cc
@@ -4,8 +4,8 @@
#include "net/proxy_resolution/network_delegate_error_observer.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/run_loop.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/proxy_resolution/pac_file_decider.cc b/net/proxy_resolution/pac_file_decider.cc
index 0189a56..4deba5e 100644
--- a/net/proxy_resolution/pac_file_decider.cc
+++ b/net/proxy_resolution/pac_file_decider.cc
@@ -6,11 +6,11 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
#include "base/compiler_specific.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/metrics/histogram_macros.h"
#include "base/notreached.h"
#include "base/strings/string_util.h"
diff --git a/net/proxy_resolution/pac_file_decider_unittest.cc b/net/proxy_resolution/pac_file_decider_unittest.cc
index 748a2ec7..8f25c2f0 100644
--- a/net/proxy_resolution/pac_file_decider_unittest.cc
+++ b/net/proxy_resolution/pac_file_decider_unittest.cc
@@ -5,7 +5,7 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/net/proxy_resolution/pac_file_fetcher_impl.cc b/net/proxy_resolution/pac_file_fetcher_impl.cc
index b7651062..485dd7a 100644
--- a/net/proxy_resolution/pac_file_fetcher_impl.cc
+++ b/net/proxy_resolution/pac_file_fetcher_impl.cc
@@ -4,8 +4,8 @@
#include "net/proxy_resolution/pac_file_fetcher_impl.h"
-#include "base/bind.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/net/proxy_resolution/polling_proxy_config_service.cc b/net/proxy_resolution/polling_proxy_config_service.cc
index 386d7639..b49dca1 100644
--- a/net/proxy_resolution/polling_proxy_config_service.cc
+++ b/net/proxy_resolution/polling_proxy_config_service.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/observer_list.h"
#include "base/synchronization/lock.h"
diff --git a/net/proxy_resolution/proxy_config_service_android.cc b/net/proxy_resolution/proxy_config_service_android.cc
index 2e614257..ebbad2b 100644
--- a/net/proxy_resolution/proxy_config_service_android.cc
+++ b/net/proxy_resolution/proxy_config_service_android.cc
@@ -8,10 +8,10 @@
#include "base/android/jni_array.h"
#include "base/android/jni_string.h"
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check_op.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
diff --git a/net/proxy_resolution/proxy_config_service_android.h b/net/proxy_resolution/proxy_config_service_android.h
index 869efcc..2664eb2 100644
--- a/net/proxy_resolution/proxy_config_service_android.h
+++ b/net/proxy_resolution/proxy_config_service_android.h
@@ -8,8 +8,8 @@
#include <string>
#include "base/android/jni_android.h"
-#include "base/callback_forward.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "net/base/net_export.h"
#include "net/proxy_resolution/proxy_config_service.h"
diff --git a/net/proxy_resolution/proxy_config_service_android_unittest.cc b/net/proxy_resolution/proxy_config_service_android_unittest.cc
index 2cc00ab..f31b10d 100644
--- a/net/proxy_resolution/proxy_config_service_android_unittest.cc
+++ b/net/proxy_resolution/proxy_config_service_android_unittest.cc
@@ -8,9 +8,9 @@
#include <memory>
#include <string>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
#include "net/net_test_jni_headers/AndroidProxyConfigServiceTestUtil_jni.h"
diff --git a/net/proxy_resolution/proxy_config_service_linux.cc b/net/proxy_resolution/proxy_config_service_linux.cc
index 1f3405b..62ad8e5 100644
--- a/net/proxy_resolution/proxy_config_service_linux.cc
+++ b/net/proxy_resolution/proxy_config_service_linux.cc
@@ -13,11 +13,11 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/files/file_descriptor_watcher_posix.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/scoped_file.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/net/proxy_resolution/proxy_config_service_linux_unittest.cc b/net/proxy_resolution/proxy_config_service_linux_unittest.cc
index 094ce51e..0769117 100644
--- a/net/proxy_resolution/proxy_config_service_linux_unittest.cc
+++ b/net/proxy_resolution/proxy_config_service_linux_unittest.cc
@@ -8,12 +8,12 @@
#include <string>
#include <vector>
-#include "base/bind.h"
#include "base/check.h"
#include "base/compiler_specific.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/location.h"
#include "base/memory/raw_ptr.h"
#include "base/message_loop/message_pump_type.h"
diff --git a/net/proxy_resolution/proxy_config_service_mac.cc b/net/proxy_resolution/proxy_config_service_mac.cc
index e51583a..ef3b46ee 100644
--- a/net/proxy_resolution/proxy_config_service_mac.cc
+++ b/net/proxy_resolution/proxy_config_service_mac.cc
@@ -9,7 +9,7 @@
#include <memory>
-#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/net/proxy_resolution/proxy_list.cc b/net/proxy_resolution/proxy_list.cc
index 13f77002..80a276d 100644
--- a/net/proxy_resolution/proxy_list.cc
+++ b/net/proxy_resolution/proxy_list.cc
@@ -4,8 +4,8 @@
#include "net/proxy_resolution/proxy_list.h"
-#include "base/callback.h"
#include "base/check.h"
+#include "base/functional/callback.h"
#include "base/notreached.h"
#include "base/strings/string_tokenizer.h"
#include "base/time/time.h"
diff --git a/net/proxy_resolution/proxy_resolver.h b/net/proxy_resolution/proxy_resolver.h
index 666a7c2b..ae8ec46 100644
--- a/net/proxy_resolution/proxy_resolver.h
+++ b/net/proxy_resolution/proxy_resolver.h
@@ -5,7 +5,7 @@
#ifndef NET_PROXY_RESOLUTION_PROXY_RESOLVER_H_
#define NET_PROXY_RESOLUTION_PROXY_RESOLVER_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "net/base/completion_once_callback.h"
#include "net/base/load_states.h"
#include "net/base/net_export.h"
diff --git a/net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win.cc b/net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win.cc
index 0245b68..2edd449 100644
--- a/net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win.cc
+++ b/net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win.cc
@@ -4,8 +4,8 @@
#include "net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/free_deleter.h"
diff --git a/net/proxy_resolution/win/dhcp_pac_file_fetcher_win.cc b/net/proxy_resolution/win/dhcp_pac_file_fetcher_win.cc
index 3db8560..e0453a3 100644
--- a/net/proxy_resolution/win/dhcp_pac_file_fetcher_win.cc
+++ b/net/proxy_resolution/win/dhcp_pac_file_fetcher_win.cc
@@ -7,9 +7,9 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/queue.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/free_deleter.h"
#include "base/synchronization/lock.h"
#include "base/task/task_runner.h"
diff --git a/net/proxy_resolution/win/dhcp_pac_file_fetcher_win_unittest.cc b/net/proxy_resolution/win/dhcp_pac_file_fetcher_win_unittest.cc
index d2b0f8d..64b3774 100644
--- a/net/proxy_resolution/win/dhcp_pac_file_fetcher_win_unittest.cc
+++ b/net/proxy_resolution/win/dhcp_pac_file_fetcher_win_unittest.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/rand_util.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
diff --git a/net/proxy_resolution/win/proxy_config_service_win.cc b/net/proxy_resolution/win/proxy_config_service_win.cc
index a4071a5..042a938e7d8 100644
--- a/net/proxy_resolution/win/proxy_config_service_win.cc
+++ b/net/proxy_resolution/win/proxy_config_service_win.cc
@@ -7,9 +7,9 @@
#include <windows.h>
#include <winhttp.h>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/ranges/algorithm.h"
#include "base/strings/string_tokenizer.h"
diff --git a/net/quic/bidirectional_stream_quic_impl.cc b/net/quic/bidirectional_stream_quic_impl.cc
index dedf1eee..9cf0470 100644
--- a/net/quic/bidirectional_stream_quic_impl.cc
+++ b/net/quic/bidirectional_stream_quic_impl.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
diff --git a/net/quic/crypto/proof_verifier_chromium.cc b/net/quic/crypto/proof_verifier_chromium.cc
index 9f3e9af1..28cf482 100644
--- a/net/quic/crypto/proof_verifier_chromium.cc
+++ b/net/quic/crypto/proof_verifier_chromium.cc
@@ -6,9 +6,9 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_functions.h"
diff --git a/net/quic/crypto_test_utils_chromium.cc b/net/quic/crypto_test_utils_chromium.cc
index 31127511..2ccfc17 100644
--- a/net/quic/crypto_test_utils_chromium.cc
+++ b/net/quic/crypto_test_utils_chromium.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/callback_helpers.h"
#include "base/check.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ref_counted.h"
#include "net/base/net_errors.h"
#include "net/base/network_anonymization_key.h"
diff --git a/net/quic/quic_chromium_alarm_factory.cc b/net/quic/quic_chromium_alarm_factory.cc
index 4c82eef..0c7ef923 100644
--- a/net/quic/quic_chromium_alarm_factory.cc
+++ b/net/quic/quic_chromium_alarm_factory.cc
@@ -4,8 +4,8 @@
#include "net/quic/quic_chromium_alarm_factory.h"
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/net/quic/quic_chromium_client_session.cc b/net/quic/quic_chromium_client_session.cc
index 44eea64..e761d5d 100644
--- a/net/quic/quic_chromium_client_session.cc
+++ b/net/quic/quic_chromium_client_session.cc
@@ -8,9 +8,9 @@
#include <set>
#include <utility>
-#include "base/bind.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/memory/ptr_util.h"
diff --git a/net/quic/quic_chromium_client_session_test.cc b/net/quic/quic_chromium_client_session_test.cc
index 32b76c61..ddd020f 100644
--- a/net/quic/quic_chromium_client_session_test.cc
+++ b/net/quic/quic_chromium_client_session_test.cc
@@ -5,8 +5,8 @@
#include "net/quic/quic_chromium_client_session.h"
#include "base/base64.h"
-#include "base/bind.h"
#include "base/files/file_path.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/net/quic/quic_chromium_client_stream.cc b/net/quic/quic_chromium_client_stream.cc
index 615ec07..9d9c97d 100644
--- a/net/quic/quic_chromium_client_stream.cc
+++ b/net/quic/quic_chromium_client_stream.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/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/net/quic/quic_chromium_client_stream.h b/net/quic/quic_chromium_client_stream.h
index b89907c..8760b9e 100644
--- a/net/quic/quic_chromium_client_stream.h
+++ b/net/quic/quic_chromium_client_stream.h
@@ -12,8 +12,8 @@
#include <memory>
#include <vector>
-#include "base/callback_forward.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/time/time.h"
#include "net/base/completion_once_callback.h"
diff --git a/net/quic/quic_chromium_client_stream_test.cc b/net/quic/quic_chromium_client_stream_test.cc
index 7a47c25..dd458b83 100644
--- a/net/quic/quic_chromium_client_stream_test.cc
+++ b/net/quic/quic_chromium_client_stream_test.cc
@@ -6,8 +6,8 @@
#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/run_loop.h"
diff --git a/net/quic/quic_chromium_packet_reader.cc b/net/quic/quic_chromium_packet_reader.cc
index 63f2903..1a6de07 100644
--- a/net/quic/quic_chromium_packet_reader.cc
+++ b/net/quic/quic_chromium_packet_reader.cc
@@ -4,7 +4,7 @@
#include "net/quic/quic_chromium_packet_reader.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/metrics/histogram_macros.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/quic/quic_chromium_packet_writer.cc b/net/quic/quic_chromium_packet_writer.cc
index 7732c9d..77f4868 100644
--- a/net/quic/quic_chromium_packet_writer.cc
+++ b/net/quic/quic_chromium_packet_writer.cc
@@ -7,8 +7,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/metrics/histogram_macros.h"
#include "base/metrics/sparse_histogram.h"
diff --git a/net/quic/quic_http_stream.cc b/net/quic/quic_http_stream.cc
index 3a35564..0f075242 100644
--- a/net/quic/quic_http_stream.cc
+++ b/net/quic/quic_http_stream.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "base/auto_reset.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/metrics/histogram_functions.h"
#include "base/strings/string_split.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc
index 2d9a36e4..57e0289e1 100644
--- a/net/quic/quic_http_stream_test.cc
+++ b/net/quic/quic_http_stream_test.cc
@@ -9,7 +9,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/net/quic/quic_network_transaction_unittest.cc b/net/quic/quic_network_transaction_unittest.cc
index a244f76..d152c77e 100644
--- a/net/quic/quic_network_transaction_unittest.cc
+++ b/net/quic/quic_network_transaction_unittest.cc
@@ -8,8 +8,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/strings/strcat.h"
diff --git a/net/quic/quic_proxy_client_socket.cc b/net/quic/quic_proxy_client_socket.cc
index 3c8e30f..2056091 100644
--- a/net/quic/quic_proxy_client_socket.cc
+++ b/net/quic/quic_proxy_client_socket.cc
@@ -7,8 +7,8 @@
#include <cstdio>
#include <utility>
-#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 "net/base/proxy_delegate.h"
#include "net/http/http_auth_controller.h"
diff --git a/net/quic/quic_proxy_client_socket_unittest.cc b/net/quic/quic_proxy_client_socket_unittest.cc
index 43554df..5d4621a 100644
--- a/net/quic/quic_proxy_client_socket_unittest.cc
+++ b/net/quic/quic_proxy_client_socket_unittest.cc
@@ -9,7 +9,7 @@
#include <utility>
#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/run_loop.h"
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
index f8da5142..c52c7283 100644
--- a/net/quic/quic_stream_factory.cc
+++ b/net/quic/quic_stream_factory.cc
@@ -9,9 +9,9 @@
#include <tuple>
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/memory_pressure_monitor.h"
#include "base/memory/raw_ptr.h"
diff --git a/net/quic/quic_stream_factory_test.cc b/net/quic/quic_stream_factory_test.cc
index 94799dcfc..b9b66be0 100644
--- a/net/quic/quic_stream_factory_test.cc
+++ b/net/quic/quic_stream_factory_test.cc
@@ -9,8 +9,8 @@
#include <set>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/strings/strcat.h"
diff --git a/net/quic/test_task_runner.h b/net/quic/test_task_runner.h
index 5309a8d..4ba30ed 100644
--- a/net/quic/test_task_runner.h
+++ b/net/quic/test_task_runner.h
@@ -9,7 +9,7 @@
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/task_runner.h"
diff --git a/net/reporting/mock_persistent_reporting_store.h b/net/reporting/mock_persistent_reporting_store.h
index 4642a56..cf39a9f 100644
--- a/net/reporting/mock_persistent_reporting_store.h
+++ b/net/reporting/mock_persistent_reporting_store.h
@@ -7,7 +7,7 @@
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "net/base/network_anonymization_key.h"
#include "net/reporting/reporting_cache.h"
#include "net/reporting/reporting_endpoint.h"
diff --git a/net/reporting/reporting_browsing_data_remover.h b/net/reporting/reporting_browsing_data_remover.h
index f1445d9..bff87f18 100644
--- a/net/reporting/reporting_browsing_data_remover.h
+++ b/net/reporting/reporting_browsing_data_remover.h
@@ -5,7 +5,7 @@
#ifndef NET_REPORTING_REPORTING_BROWSING_DATA_REMOVER_H_
#define NET_REPORTING_REPORTING_BROWSING_DATA_REMOVER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "net/base/net_export.h"
#include "url/origin.h"
diff --git a/net/reporting/reporting_browsing_data_remover_unittest.cc b/net/reporting/reporting_browsing_data_remover_unittest.cc
index 5d96fb6..73cdda9 100644
--- a/net/reporting/reporting_browsing_data_remover_unittest.cc
+++ b/net/reporting/reporting_browsing_data_remover_unittest.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/test/simple_test_tick_clock.h"
#include "net/base/network_anonymization_key.h"
#include "net/reporting/reporting_cache.h"
diff --git a/net/reporting/reporting_cache.h b/net/reporting/reporting_cache.h
index b9e7017..6f8922b 100644
--- a/net/reporting/reporting_cache.h
+++ b/net/reporting/reporting_cache.h
@@ -10,9 +10,9 @@
#include <string>
#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/time/time.h"
#include "base/unguessable_token.h"
#include "base/values.h"
diff --git a/net/reporting/reporting_cache_unittest.cc b/net/reporting/reporting_cache_unittest.cc
index 3c8cae2..e60e51b 100644
--- a/net/reporting/reporting_cache_unittest.cc
+++ b/net/reporting/reporting_cache_unittest.cc
@@ -7,8 +7,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/test/scoped_feature_list.h"
diff --git a/net/reporting/reporting_context.cc b/net/reporting/reporting_context.cc
index 1867ac1..b8ebd028 100644
--- a/net/reporting/reporting_context.cc
+++ b/net/reporting/reporting_context.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/observer_list.h"
#include "base/rand_util.h"
#include "base/time/clock.h"
diff --git a/net/reporting/reporting_delegate.h b/net/reporting/reporting_delegate.h
index 665f1c6..ca09c65 100644
--- a/net/reporting/reporting_delegate.h
+++ b/net/reporting/reporting_delegate.h
@@ -8,7 +8,7 @@
#include <memory>
#include <set>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "net/base/net_export.h"
class GURL;
diff --git a/net/reporting/reporting_delivery_agent.cc b/net/reporting/reporting_delivery_agent.cc
index 529653b..4adb28e 100644
--- a/net/reporting/reporting_delivery_agent.cc
+++ b/net/reporting/reporting_delivery_agent.cc
@@ -11,9 +11,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/check.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/json/json_writer.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_functions.h"
diff --git a/net/reporting/reporting_garbage_collector.cc b/net/reporting/reporting_garbage_collector.cc
index 4db08e0..5690fc3 100644
--- a/net/reporting/reporting_garbage_collector.cc
+++ b/net/reporting/reporting_garbage_collector.cc
@@ -7,8 +7,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/containers/flat_set.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/time/tick_clock.h"
#include "base/time/time.h"
diff --git a/net/reporting/reporting_header_parser.cc b/net/reporting/reporting_header_parser.cc
index 9bc7d46..30f9897 100644
--- a/net/reporting/reporting_header_parser.cc
+++ b/net/reporting/reporting_header_parser.cc
@@ -9,9 +9,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/check.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/json/json_reader.h"
#include "base/metrics/histogram_functions.h"
#include "base/time/time.h"
diff --git a/net/reporting/reporting_header_parser_unittest.cc b/net/reporting/reporting_header_parser_unittest.cc
index 3d617e7..2244757 100644
--- a/net/reporting/reporting_header_parser_unittest.cc
+++ b/net/reporting/reporting_header_parser_unittest.cc
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/json/json_reader.h"
#include "base/strings/strcat.h"
#include "base/strings/string_number_conversions.h"
diff --git a/net/reporting/reporting_network_change_observer_unittest.cc b/net/reporting/reporting_network_change_observer_unittest.cc
index bb5edce..70c01bc 100644
--- a/net/reporting/reporting_network_change_observer_unittest.cc
+++ b/net/reporting/reporting_network_change_observer_unittest.cc
@@ -4,7 +4,7 @@
#include "net/reporting/reporting_network_change_observer.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/simple_test_tick_clock.h"
#include "base/unguessable_token.h"
diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_service.cc
index 4c4fa2c..4849ca1 100644
--- a/net/reporting/reporting_service.cc
+++ b/net/reporting/reporting_service.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/json/json_reader.h"
#include "base/logging.h"
#include "base/memory/weak_ptr.h"
diff --git a/net/reporting/reporting_service.h b/net/reporting/reporting_service.h
index 7bdae36..aca4d90 100644
--- a/net/reporting/reporting_service.h
+++ b/net/reporting/reporting_service.h
@@ -8,8 +8,8 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/containers/flat_map.h"
+#include "base/functional/callback.h"
#include "base/unguessable_token.h"
#include "net/base/net_export.h"
#include "net/reporting/reporting_cache.h"
diff --git a/net/reporting/reporting_service_unittest.cc b/net/reporting/reporting_service_unittest.cc
index 1901b38..292ff92 100644
--- a/net/reporting/reporting_service_unittest.cc
+++ b/net/reporting/reporting_service_unittest.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/test/scoped_feature_list.h"
diff --git a/net/reporting/reporting_test_util.cc b/net/reporting/reporting_test_util.cc
index bfe5089..b768e21 100644
--- a/net/reporting/reporting_test_util.cc
+++ b/net/reporting/reporting_test_util.cc
@@ -8,8 +8,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/json/json_reader.h"
#include "base/memory/ptr_util.h"
#include "base/notreached.h"
diff --git a/net/reporting/reporting_uploader.cc b/net/reporting/reporting_uploader.cc
index d7df44d..bc630dc 100644
--- a/net/reporting/reporting_uploader.cc
+++ b/net/reporting/reporting_uploader.cc
@@ -8,7 +8,7 @@
#include <utility>
#include <vector>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
diff --git a/net/reporting/reporting_uploader.h b/net/reporting/reporting_uploader.h
index 5466773..26055df 100644
--- a/net/reporting/reporting_uploader.h
+++ b/net/reporting/reporting_uploader.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "net/base/net_export.h"
class GURL;
diff --git a/net/reporting/reporting_uploader_unittest.cc b/net/reporting/reporting_uploader_unittest.cc
index b8b4ed4..366fa42 100644
--- a/net/reporting/reporting_uploader_unittest.cc
+++ b/net/reporting/reporting_uploader_unittest.cc
@@ -8,8 +8,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/run_loop.h"
#include "base/test/scoped_feature_list.h"
#include "net/base/features.h"
diff --git a/net/server/http_server.cc b/net/server/http_server.cc
index c6c2d9e1..75d6bb41 100644
--- a/net/server/http_server.cc
+++ b/net/server/http_server.cc
@@ -6,8 +6,8 @@
#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/strings/string_number_conversions.h"
diff --git a/net/server/http_server_unittest.cc b/net/server/http_server_unittest.cc
index 7c6d1ee..8edeac5e 100644
--- a/net/server/http_server_unittest.cc
+++ b/net/server/http_server_unittest.cc
@@ -13,12 +13,12 @@
#include <vector>
#include "base/auto_reset.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
#include "base/compiler_specific.h"
#include "base/cxx17_backports.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
diff --git a/net/socket/client_socket_handle.cc b/net/socket/client_socket_handle.cc
index e0534344..1b401b4 100644
--- a/net/socket/client_socket_handle.cc
+++ b/net/socket/client_socket_handle.cc
@@ -6,10 +6,10 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/notreached.h"
#include "base/trace_event/trace_event.h"
#include "net/base/net_errors.h"
diff --git a/net/socket/client_socket_handle.h b/net/socket/client_socket_handle.h
index b518358..b6b71c2 100644
--- a/net/socket/client_socket_handle.h
+++ b/net/socket/client_socket_handle.h
@@ -8,8 +8,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/time/time.h"
diff --git a/net/socket/client_socket_pool.cc b/net/socket/client_socket_pool.cc
index 8531095..2c0504c 100644
--- a/net/socket/client_socket_pool.cc
+++ b/net/socket/client_socket_pool.cc
@@ -7,9 +7,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "net/base/features.h"
#include "net/base/host_port_pair.h"
#include "net/base/proxy_server.h"
diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index 32e01e7e8..712e5bda 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -7,10 +7,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
diff --git a/net/socket/connect_job.h b/net/socket/connect_job.h
index 1661bac..2650f15 100644
--- a/net/socket/connect_job.h
+++ b/net/socket/connect_job.h
@@ -9,8 +9,8 @@
#include <set>
#include <string>
-#include "base/callback_forward.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_forward.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/time/time.h"
diff --git a/net/socket/connect_job_unittest.cc b/net/socket/connect_job_unittest.cc
index 54cbb9b..cead9b4 100644
--- a/net/socket/connect_job_unittest.cc
+++ b/net/socket/connect_job_unittest.cc
@@ -4,8 +4,8 @@
#include "net/socket/connect_job.h"
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "net/base/address_list.h"
diff --git a/net/socket/fuzzed_datagram_client_socket.cc b/net/socket/fuzzed_datagram_client_socket.cc
index 7688d50..9241162 100644
--- a/net/socket/fuzzed_datagram_client_socket.cc
+++ b/net/socket/fuzzed_datagram_client_socket.cc
@@ -8,8 +8,8 @@
#include <string>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/ranges/algorithm.h"
#include "base/strings/string_piece.h"
diff --git a/net/socket/fuzzed_server_socket.cc b/net/socket/fuzzed_server_socket.cc
index 1932cc3..ca9b19a 100644
--- a/net/socket/fuzzed_server_socket.cc
+++ b/net/socket/fuzzed_server_socket.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 "net/socket/fuzzed_socket.h"
diff --git a/net/socket/fuzzed_socket.cc b/net/socket/fuzzed_socket.cc
index 819bc76..775c273 100644
--- a/net/socket/fuzzed_socket.cc
+++ b/net/socket/fuzzed_socket.cc
@@ -6,8 +6,8 @@
#include <fuzzer/FuzzedDataProvider.h>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/notreached.h"
#include "base/ranges/algorithm.h"
diff --git a/net/socket/sequenced_socket_data_unittest.cc b/net/socket/sequenced_socket_data_unittest.cc
index caea8e0..bf1e4cd 100644
--- a/net/socket/sequenced_socket_data_unittest.cc
+++ b/net/socket/sequenced_socket_data_unittest.cc
@@ -5,7 +5,7 @@
#include <memory>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
diff --git a/net/socket/socket_bio_adapter.cc b/net/socket/socket_bio_adapter.cc
index 02d43ed..8017b59 100644
--- a/net/socket/socket_bio_adapter.cc
+++ b/net/socket/socket_bio_adapter.cc
@@ -8,8 +8,8 @@
#include <algorithm>
-#include "base/bind.h"
#include "base/check_op.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/net/socket/socket_net_log_params.cc b/net/socket/socket_net_log_params.cc
index fccaa4e6..4c520f9 100644
--- a/net/socket/socket_net_log_params.cc
+++ b/net/socket/socket_net_log_params.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/values.h"
#include "net/base/host_port_pair.h"
#include "net/base/ip_endpoint.h"
diff --git a/net/socket/socket_posix.cc b/net/socket/socket_posix.cc
index 3f458f7..0327ba11 100644
--- a/net/socket/socket_posix.cc
+++ b/net/socket/socket_posix.cc
@@ -11,9 +11,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/posix/eintr_wrapper.h"
#include "base/task/current_thread.h"
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 251e69f..a7069421 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -13,10 +13,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/rand_util.h"
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
index 1b45d9a..1d0beb3 100644
--- a/net/socket/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -14,10 +14,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check_op.h"
#include "base/containers/span.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc
index a3f842e..1cf2583 100644
--- a/net/socket/socks5_client_socket.cc
+++ b/net/socket/socks5_client_socket.cc
@@ -6,10 +6,10 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/strings/string_util.h"
#include "base/sys_byteorder.h"
#include "base/trace_event/trace_event.h"
diff --git a/net/socket/socks_client_socket.cc b/net/socket/socks_client_socket.cc
index 5c1db1ea..e280e63 100644
--- a/net/socket/socks_client_socket.cc
+++ b/net/socket/socks_client_socket.cc
@@ -6,9 +6,9 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/sys_byteorder.h"
#include "net/base/address_list.h"
#include "net/base/io_buffer.h"
diff --git a/net/socket/socks_connect_job.cc b/net/socket/socks_connect_job.cc
index 7347c72b..92c2a71 100644
--- a/net/socket/socks_connect_job.cc
+++ b/net/socket/socks_connect_job.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "net/base/net_errors.h"
#include "net/log/net_log_source_type.h"
#include "net/log/net_log_with_source.h"
diff --git a/net/socket/socks_connect_job_unittest.cc b/net/socket/socks_connect_job_unittest.cc
index e38b66b..5fb0a2d 100644
--- a/net/socket/socks_connect_job_unittest.cc
+++ b/net/socket/socks_connect_job_unittest.cc
@@ -4,9 +4,9 @@
#include "net/socket/socks_connect_job.h"
-#include "base/callback.h"
#include "base/containers/flat_set.h"
#include "base/containers/span.h"
+#include "base/functional/callback.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "base/time/time.h"
diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc
index 56904f01..286bf304a 100644
--- a/net/socket/ssl_client_socket_impl.cc
+++ b/net/socket/ssl_client_socket_impl.cc
@@ -13,10 +13,10 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/span.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/lazy_instance.h"
#include "base/location.h"
#include "base/memory/singleton.h"
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index 9e0a8fa..ef870d81 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -12,9 +12,9 @@
#include <tuple>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
diff --git a/net/socket/ssl_connect_job.cc b/net/socket/ssl_connect_job.cc
index 027f21c2..12550452e 100644
--- a/net/socket/ssl_connect_job.cc
+++ b/net/socket/ssl_connect_job.cc
@@ -8,9 +8,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
#include "base/trace_event/trace_event.h"
diff --git a/net/socket/ssl_connect_job_unittest.cc b/net/socket/ssl_connect_job_unittest.cc
index a0ad43f..b8588983 100644
--- a/net/socket/ssl_connect_job_unittest.cc
+++ b/net/socket/ssl_connect_job_unittest.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/metrics/histogram_tester.h"
diff --git a/net/socket/ssl_server_socket_impl.cc b/net/socket/ssl_server_socket_impl.cc
index 5bfd2a8..052638af 100644
--- a/net/socket/ssl_server_socket_impl.cc
+++ b/net/socket/ssl_server_socket_impl.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc
index 1d36c149..eed11bd 100644
--- a/net/socket/ssl_server_socket_unittest.cc
+++ b/net/socket/ssl_server_socket_unittest.cc
@@ -21,13 +21,13 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check.h"
#include "base/compiler_specific.h"
#include "base/containers/queue.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/location.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
diff --git a/net/socket/stream_socket.h b/net/socket/stream_socket.h
index d097325..8982977 100644
--- a/net/socket/stream_socket.h
+++ b/net/socket/stream_socket.h
@@ -7,7 +7,7 @@
#include <stdint.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "net/base/net_errors.h"
#include "net/base/net_export.h"
#include "net/dns/public/resolve_error_info.h"
diff --git a/net/socket/tcp_client_socket.cc b/net/socket/tcp_client_socket.cc
index d092f32..a5fc051 100644
--- a/net/socket/tcp_client_socket.cc
+++ b/net/socket/tcp_client_socket.cc
@@ -7,9 +7,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/notreached.h"
diff --git a/net/socket/tcp_server_socket.cc b/net/socket/tcp_server_socket.cc
index 31461540..b69ea2c 100644
--- a/net/socket/tcp_server_socket.cc
+++ b/net/socket/tcp_server_socket.cc
@@ -7,9 +7,9 @@
#include <memory>
#include <utility>
-#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 "net/base/net_errors.h"
#include "net/socket/socket_descriptor.h"
diff --git a/net/socket/tcp_socket_posix.cc b/net/socket/tcp_socket_posix.cc
index 4e7a6ed..693197f 100644
--- a/net/socket/tcp_socket_posix.cc
+++ b/net/socket/tcp_socket_posix.cc
@@ -12,9 +12,9 @@
#include <memory>
#include "base/atomicops.h"
-#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
diff --git a/net/socket/tcp_socket_posix.h b/net/socket/tcp_socket_posix.h
index 5cd9670..c13274b 100644
--- a/net/socket/tcp_socket_posix.h
+++ b/net/socket/tcp_socket_posix.h
@@ -9,7 +9,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "net/base/address_family.h"
#include "net/base/completion_once_callback.h"
#include "net/base/net_export.h"
diff --git a/net/socket/tcp_socket_unittest.cc b/net/socket/tcp_socket_unittest.cc
index 1cb50d2e..e2d04f6 100644
--- a/net/socket/tcp_socket_unittest.cc
+++ b/net/socket/tcp_socket_unittest.cc
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted.h"
#include "base/test/bind.h"
#include "base/time/time.h"
diff --git a/net/socket/tcp_socket_win.cc b/net/socket/tcp_socket_win.cc
index 7293368..168b59e0 100644
--- a/net/socket/tcp_socket_win.cc
+++ b/net/socket/tcp_socket_win.cc
@@ -11,10 +11,10 @@
#include <memory>
#include <utility>
-#include "base/bind.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_helpers.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "net/base/address_list.h"
diff --git a/net/socket/transport_client_socket_pool.cc b/net/socket/transport_client_socket_pool.cc
index dac685b2e6..69c599b 100644
--- a/net/socket/transport_client_socket_pool.cc
+++ b/net/socket/transport_client_socket_pool.cc
@@ -8,12 +8,12 @@
#include "base/auto_reset.h"
#include "base/barrier_closure.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
#include "base/compiler_specific.h"
#include "base/containers/contains.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
diff --git a/net/socket/transport_client_socket_pool_test_util.cc b/net/socket/transport_client_socket_pool_test_util.cc
index 1777a22..3db3d85 100644
--- a/net/socket/transport_client_socket_pool_test_util.cc
+++ b/net/socket/transport_client_socket_pool_test_util.cc
@@ -8,8 +8,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/weak_ptr.h"
#include "base/notreached.h"
diff --git a/net/socket/transport_client_socket_pool_test_util.h b/net/socket/transport_client_socket_pool_test_util.h
index d208d75..535f525 100644
--- a/net/socket/transport_client_socket_pool_test_util.h
+++ b/net/socket/transport_client_socket_pool_test_util.h
@@ -12,10 +12,10 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/containers/queue.h"
#include "base/containers/span.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/time/time.h"
#include "net/base/address_list.h"
diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc
index 1ef2149..ebb3a9f 100644
--- a/net/socket/transport_client_socket_pool_unittest.cc
+++ b/net/socket/transport_client_socket_pool_unittest.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/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
diff --git a/net/socket/transport_client_socket_unittest.cc b/net/socket/transport_client_socket_unittest.cc
index 1a192e2..773cbac93 100644
--- a/net/socket/transport_client_socket_unittest.cc
+++ b/net/socket/transport_client_socket_unittest.cc
@@ -6,7 +6,7 @@
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
diff --git a/net/socket/transport_connect_job.cc b/net/socket/transport_connect_job.cc
index 5d3fc52..66e5727c 100644
--- a/net/socket/transport_connect_job.cc
+++ b/net/socket/transport_connect_job.cc
@@ -7,9 +7,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/feature_list.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/metrics/histogram_macros.h"
diff --git a/net/socket/transport_connect_sub_job.cc b/net/socket/transport_connect_sub_job.cc
index 674a2e6..e1042c35 100644
--- a/net/socket/transport_connect_sub_job.cc
+++ b/net/socket/transport_connect_sub_job.cc
@@ -8,8 +8,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/notreached.h"
#include "net/base/ip_endpoint.h"
#include "net/base/net_errors.h"
diff --git a/net/socket/udp_socket_perftest.cc b/net/socket/udp_socket_perftest.cc
index 2e3a147a..6069aa0 100644
--- a/net/socket/udp_socket_perftest.cc
+++ b/net/socket/udp_socket_perftest.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/memory/weak_ptr.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
diff --git a/net/socket/udp_socket_posix.cc b/net/socket/udp_socket_posix.cc
index aad2203..45c4901 100644
--- a/net/socket/udp_socket_posix.cc
+++ b/net/socket/udp_socket_posix.cc
@@ -22,12 +22,12 @@
#include <memory>
-#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/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
#include "base/posix/eintr_wrapper.h"
diff --git a/net/socket/udp_socket_unittest.cc b/net/socket/udp_socket_unittest.cc
index 6ab0b39c7..4bf0e62 100644
--- a/net/socket/udp_socket_unittest.cc
+++ b/net/socket/udp_socket_unittest.cc
@@ -6,8 +6,8 @@
#include <algorithm>
-#include "base/bind.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/net/socket/udp_socket_win.cc b/net/socket/udp_socket_win.cc
index f22c1e12..bebf140a 100644
--- a/net/socket/udp_socket_win.cc
+++ b/net/socket/udp_socket_win.cc
@@ -9,9 +9,9 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/lazy_instance.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_functions.h"
diff --git a/net/socket/unix_domain_client_socket_posix_unittest.cc b/net/socket/unix_domain_client_socket_posix_unittest.cc
index 61041a3..29dd7e6 100644
--- a/net/socket/unix_domain_client_socket_posix_unittest.cc
+++ b/net/socket/unix_domain_client_socket_posix_unittest.cc
@@ -9,9 +9,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/functional/bind.h"
#include "base/posix/eintr_wrapper.h"
#include "build/build_config.h"
#include "net/base/io_buffer.h"
diff --git a/net/socket/unix_domain_server_socket_posix.cc b/net/socket/unix_domain_server_socket_posix.cc
index 60f5894..3d53a92 100644
--- a/net/socket/unix_domain_server_socket_posix.cc
+++ b/net/socket/unix_domain_server_socket_posix.cc
@@ -10,7 +10,7 @@
#include <unistd.h>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "build/build_config.h"
#include "net/base/net_errors.h"
diff --git a/net/socket/unix_domain_server_socket_posix.h b/net/socket/unix_domain_server_socket_posix.h
index 50b0622f..6cfc9dc 100644
--- a/net/socket/unix_domain_server_socket_posix.h
+++ b/net/socket/unix_domain_server_socket_posix.h
@@ -11,7 +11,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "build/build_config.h"
#include "net/base/completion_once_callback.h"
diff --git a/net/socket/unix_domain_server_socket_posix_unittest.cc b/net/socket/unix_domain_server_socket_posix_unittest.cc
index 104a1f9..17d4618 100644
--- a/net/socket/unix_domain_server_socket_posix_unittest.cc
+++ b/net/socket/unix_domain_server_socket_posix_unittest.cc
@@ -7,9 +7,9 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "build/build_config.h"
diff --git a/net/socket/websocket_endpoint_lock_manager.cc b/net/socket/websocket_endpoint_lock_manager.cc
index 6f0a5bb..a280207 100644
--- a/net/socket/websocket_endpoint_lock_manager.cc
+++ b/net/socket/websocket_endpoint_lock_manager.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/socket/websocket_transport_client_socket_pool.cc b/net/socket/websocket_transport_client_socket_pool.cc
index 8d52c9b8..b8f15ee 100644
--- a/net/socket/websocket_transport_client_socket_pool.cc
+++ b/net/socket/websocket_transport_client_socket_pool.cc
@@ -6,10 +6,10 @@
#include <algorithm>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/notreached.h"
#include "base/numerics/safe_conversions.h"
diff --git a/net/socket/websocket_transport_client_socket_pool_unittest.cc b/net/socket/websocket_transport_client_socket_pool_unittest.cc
index 42eccd36..44401095 100644
--- a/net/socket/websocket_transport_client_socket_pool_unittest.cc
+++ b/net/socket/websocket_transport_client_socket_pool_unittest.cc
@@ -8,10 +8,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/cxx17_backports.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
diff --git a/net/spdy/bidirectional_stream_spdy_impl.cc b/net/spdy/bidirectional_stream_spdy_impl.cc
index c0f02d7..3fbed23 100644
--- a/net/spdy/bidirectional_stream_spdy_impl.cc
+++ b/net/spdy/bidirectional_stream_spdy_impl.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/spdy/spdy_buffer.cc b/net/spdy/spdy_buffer.cc
index 110c95a3..bb89988 100644
--- a/net/spdy/spdy_buffer.cc
+++ b/net/spdy/spdy_buffer.cc
@@ -7,8 +7,8 @@
#include <cstring>
#include <utility>
-#include "base/callback.h"
#include "base/check_op.h"
+#include "base/functional/callback.h"
#include "base/trace_event/memory_usage_estimator.h"
#include "net/base/io_buffer.h"
#include "net/third_party/quiche/src/quiche/spdy/core/spdy_protocol.h"
diff --git a/net/spdy/spdy_buffer.h b/net/spdy/spdy_buffer.h
index 85d77be..49edec5 100644
--- a/net/spdy/spdy_buffer.h
+++ b/net/spdy/spdy_buffer.h
@@ -9,7 +9,7 @@
#include <memory>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/ref_counted.h"
#include "net/base/net_export.h"
diff --git a/net/spdy/spdy_buffer_unittest.cc b/net/spdy/spdy_buffer_unittest.cc
index 7f0e00c..eb89650b 100644
--- a/net/spdy/spdy_buffer_unittest.cc
+++ b/net/spdy/spdy_buffer_unittest.cc
@@ -9,8 +9,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "net/base/io_buffer.h"
#include "net/third_party/quiche/src/quiche/spdy/core/spdy_protocol.h"
diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc
index 67aaff96..7272c9b 100644
--- a/net/spdy/spdy_http_stream.cc
+++ b/net/spdy/spdy_http_stream.cc
@@ -10,8 +10,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/metrics/histogram_macros.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/spdy/spdy_http_stream_unittest.cc b/net/spdy/spdy_http_stream_unittest.cc
index bdd4179..fedb398c 100644
--- a/net/spdy/spdy_http_stream_unittest.cc
+++ b/net/spdy/spdy_http_stream_unittest.cc
@@ -9,7 +9,7 @@
#include <set>
#include <string>
-#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/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index fe2c5b8..31baeac 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -6,10 +6,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.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/strings/string_number_conversions.h"
diff --git a/net/spdy/spdy_proxy_client_socket.cc b/net/spdy/spdy_proxy_client_socket.cc
index 9b5b47a..0aa3803 100644
--- a/net/spdy/spdy_proxy_client_socket.cc
+++ b/net/spdy/spdy_proxy_client_socket.cc
@@ -7,9 +7,9 @@
#include <algorithm> // min
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/notreached.h"
#include "base/strings/string_util.h"
diff --git a/net/spdy/spdy_proxy_client_socket_unittest.cc b/net/spdy/spdy_proxy_client_socket_unittest.cc
index 335d427..43fdfe1 100644
--- a/net/spdy/spdy_proxy_client_socket_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_unittest.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/strings/string_piece.h"
diff --git a/net/spdy/spdy_read_queue_unittest.cc b/net/spdy/spdy_read_queue_unittest.cc
index e97fbe9..85f85d7 100644
--- a/net/spdy/spdy_read_queue_unittest.cc
+++ b/net/spdy/spdy_read_queue_unittest.cc
@@ -10,8 +10,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "net/spdy/spdy_buffer.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index c6e4e71b..f9a56ef 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -10,8 +10,8 @@
#include <tuple>
#include <utility>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
diff --git a/net/spdy/spdy_session_pool.cc b/net/spdy/spdy_session_pool.cc
index 190c3d1..a3bab31 100644
--- a/net/spdy/spdy_session_pool.cc
+++ b/net/spdy/spdy_session_pool.cc
@@ -7,9 +7,9 @@
#include <set>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/metrics/histogram_macros.h"
#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/spdy/spdy_session_pool_unittest.cc b/net/spdy/spdy_session_pool_unittest.cc
index bda4d30..97580bf 100644
--- a/net/spdy/spdy_session_pool_unittest.cc
+++ b/net/spdy/spdy_session_pool_unittest.cc
@@ -8,8 +8,8 @@
#include <tuple>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc
index cab3092..95bca028 100644
--- a/net/spdy/spdy_session_unittest.cc
+++ b/net/spdy/spdy_session_unittest.cc
@@ -10,8 +10,8 @@
#include <utility>
#include "base/base64.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/run_loop.h"
#include "base/strings/string_number_conversions.h"
diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc
index 7f7fb9b..f952cc1 100644
--- a/net/spdy/spdy_stream.cc
+++ b/net/spdy/spdy_stream.cc
@@ -8,9 +8,9 @@
#include <limits>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/metrics/histogram_functions.h"
#include "base/metrics/histogram_macros.h"
diff --git a/net/spdy/spdy_stream_unittest.cc b/net/spdy/spdy_stream_unittest.cc
index 33c773cf..e641000 100644
--- a/net/spdy/spdy_stream_unittest.cc
+++ b/net/spdy/spdy_stream_unittest.cc
@@ -14,7 +14,7 @@
#include <utility>
#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_piece.h"
diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc
index c0b359a..573b1b57 100644
--- a/net/spdy/spdy_test_util_common.cc
+++ b/net/spdy/spdy_test_util_common.cc
@@ -8,10 +8,10 @@
#include <utility>
#include "base/base64.h"
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/compiler_specific.h"
#include "base/containers/span.h"
+#include "base/functional/bind.h"
#include "base/notreached.h"
#include "base/strings/abseil_string_conversions.h"
#include "base/strings/string_number_conversions.h"
diff --git a/net/spdy/spdy_write_queue_unittest.cc b/net/spdy/spdy_write_queue_unittest.cc
index a2626c1..96c7466 100644
--- a/net/spdy/spdy_write_queue_unittest.cc
+++ b/net/spdy/spdy_write_queue_unittest.cc
@@ -9,7 +9,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted.h"
#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
diff --git a/net/ssl/client_cert_identity.cc b/net/ssl/client_cert_identity.cc
index e431f84..a3bfbff 100644
--- a/net/ssl/client_cert_identity.cc
+++ b/net/ssl/client_cert_identity.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "net/cert/x509_util.h"
#include "net/ssl/ssl_private_key.h"
diff --git a/net/ssl/client_cert_identity.h b/net/ssl/client_cert_identity.h
index b584809..d45e628 100644
--- a/net/ssl/client_cert_identity.h
+++ b/net/ssl/client_cert_identity.h
@@ -5,7 +5,7 @@
#ifndef NET_SSL_CLIENT_CERT_IDENTITY_H_
#define NET_SSL_CLIENT_CERT_IDENTITY_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "net/base/net_export.h"
#include "net/cert/x509_certificate.h"
diff --git a/net/ssl/client_cert_store.h b/net/ssl/client_cert_store.h
index 3c9d10f6..29b8ed8d 100644
--- a/net/ssl/client_cert_store.h
+++ b/net/ssl/client_cert_store.h
@@ -5,7 +5,7 @@
#ifndef NET_SSL_CLIENT_CERT_STORE_H_
#define NET_SSL_CLIENT_CERT_STORE_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "net/base/net_export.h"
#include "net/cert/x509_certificate.h"
#include "net/ssl/client_cert_identity.h"
diff --git a/net/ssl/client_cert_store_mac.cc b/net/ssl/client_cert_store_mac.cc
index e6aef54..548b84cb 100644
--- a/net/ssl/client_cert_store_mac.cc
+++ b/net/ssl/client_cert_store_mac.cc
@@ -16,9 +16,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/logging.h"
#include "base/mac/mac_logging.h"
#include "base/mac/scoped_cftyperef.h"
diff --git a/net/ssl/client_cert_store_mac.h b/net/ssl/client_cert_store_mac.h
index 073b685..09aa585 100644
--- a/net/ssl/client_cert_store_mac.h
+++ b/net/ssl/client_cert_store_mac.h
@@ -5,7 +5,7 @@
#ifndef NET_SSL_CLIENT_CERT_STORE_MAC_H_
#define NET_SSL_CLIENT_CERT_STORE_MAC_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "net/base/net_export.h"
#include "net/ssl/client_cert_store.h"
#include "net/ssl/ssl_cert_request_info.h"
diff --git a/net/ssl/client_cert_store_nss.cc b/net/ssl/client_cert_store_nss.cc
index 314c740..56e7ce66 100644
--- a/net/ssl/client_cert_store_nss.cc
+++ b/net/ssl/client_cert_store_nss.cc
@@ -12,8 +12,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/location.h"
#include "base/logging.h"
#include "base/strings/string_piece.h"
diff --git a/net/ssl/client_cert_store_nss.h b/net/ssl/client_cert_store_nss.h
index 5ab6e12..a333bbd 100644
--- a/net/ssl/client_cert_store_nss.h
+++ b/net/ssl/client_cert_store_nss.h
@@ -5,7 +5,7 @@
#ifndef NET_SSL_CLIENT_CERT_STORE_NSS_H_
#define NET_SSL_CLIENT_CERT_STORE_NSS_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "net/base/net_export.h"
#include "net/ssl/client_cert_store.h"
diff --git a/net/ssl/client_cert_store_nss_unittest.cc b/net/ssl/client_cert_store_nss_unittest.cc
index b70b4d1..4cc895cf 100644
--- a/net/ssl/client_cert_store_nss_unittest.cc
+++ b/net/ssl/client_cert_store_nss_unittest.cc
@@ -11,8 +11,8 @@
#include <memory>
#include <string>
-#include "base/bind.h"
#include "base/files/file_util.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/net/ssl/client_cert_store_win.cc b/net/ssl/client_cert_store_win.cc
index 07e5be1..4e332f4 100644
--- a/net/ssl/client_cert_store_win.cc
+++ b/net/ssl/client_cert_store_win.cc
@@ -13,9 +13,9 @@
#include <windows.h>
#include <security.h>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "base/scoped_generic.h"
diff --git a/net/ssl/client_cert_store_win.h b/net/ssl/client_cert_store_win.h
index a31b1ae..f4c9659 100644
--- a/net/ssl/client_cert_store_win.h
+++ b/net/ssl/client_cert_store_win.h
@@ -5,7 +5,7 @@
#ifndef NET_SSL_CLIENT_CERT_STORE_WIN_H_
#define NET_SSL_CLIENT_CERT_STORE_WIN_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/win/wincrypt_shim.h"
#include "crypto/scoped_capi_types.h"
#include "net/base/net_export.h"
diff --git a/net/ssl/ssl_client_auth_cache_unittest.cc b/net/ssl/ssl_client_auth_cache_unittest.cc
index bbdc9ae..367d69a 100644
--- a/net/ssl/ssl_client_auth_cache_unittest.cc
+++ b/net/ssl/ssl_client_auth_cache_unittest.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "net/cert/x509_certificate.h"
#include "net/ssl/ssl_private_key.h"
diff --git a/net/ssl/ssl_client_session_cache.h b/net/ssl/ssl_client_session_cache.h
index ed3fe22b..d3857acd 100644
--- a/net/ssl/ssl_client_session_cache.h
+++ b/net/ssl/ssl_client_session_cache.h
@@ -11,8 +11,8 @@
#include <memory>
#include <string>
-#include "base/bind.h"
#include "base/containers/lru_cache.h"
+#include "base/functional/bind.h"
#include "base/memory/memory_pressure_monitor.h"
#include "base/memory/raw_ptr.h"
#include "net/base/host_port_pair.h"
diff --git a/net/ssl/ssl_key_logger_impl.cc b/net/ssl/ssl_key_logger_impl.cc
index 9f0f1a3..29c450e9 100644
--- a/net/ssl/ssl_key_logger_impl.cc
+++ b/net/ssl/ssl_key_logger_impl.cc
@@ -9,9 +9,9 @@
#include <algorithm>
#include <utility>
-#include "base/bind.h"
#include "base/files/file_util.h"
#include "base/files/scoped_file.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
diff --git a/net/ssl/ssl_private_key.h b/net/ssl/ssl_private_key.h
index 97ed9eba..7472b3b 100644
--- a/net/ssl/ssl_private_key.h
+++ b/net/ssl/ssl_private_key.h
@@ -9,8 +9,8 @@
#include <vector>
-#include "base/callback_forward.h"
#include "base/containers/span.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/ref_counted.h"
#include "net/base/net_errors.h"
#include "net/base/net_export.h"
diff --git a/net/ssl/ssl_private_key_test_util.cc b/net/ssl/ssl_private_key_test_util.cc
index 23fd22d..5ce7576c 100644
--- a/net/ssl/ssl_private_key_test_util.cc
+++ b/net/ssl/ssl_private_key_test_util.cc
@@ -8,8 +8,8 @@
#include <vector>
-#include "base/bind.h"
#include "base/containers/span.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/run_loop.h"
#include "crypto/openssl_util.h"
diff --git a/net/ssl/ssl_server_config.h b/net/ssl/ssl_server_config.h
index bbef49d..1490c55 100644
--- a/net/ssl/ssl_server_config.h
+++ b/net/ssl/ssl_server_config.h
@@ -10,8 +10,8 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
#include "base/containers/flat_map.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "net/base/net_export.h"
#include "net/socket/next_proto.h"
diff --git a/net/ssl/threaded_ssl_private_key.cc b/net/ssl/threaded_ssl_private_key.cc
index 197f803..af814f0 100644
--- a/net/ssl/threaded_ssl_private_key.cc
+++ b/net/ssl/threaded_ssl_private_key.cc
@@ -8,7 +8,7 @@
#include <tuple>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/test/android/net_test_jni_onload.cc b/net/test/android/net_test_jni_onload.cc
index d329119..49d1d3d 100644
--- a/net/test/android/net_test_jni_onload.cc
+++ b/net/test/android/net_test_jni_onload.cc
@@ -6,7 +6,7 @@
#include "base/android/base_jni_onload.h"
#include "base/android/jni_android.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "net/test/embedded_test_server/android/embedded_test_server_android.h"
namespace net::test {
diff --git a/net/test/embedded_test_server/android/embedded_test_server_android.cc b/net/test/embedded_test_server/android/embedded_test_server_android.cc
index 08a9c45..2637e1a 100644
--- a/net/test/embedded_test_server/android/embedded_test_server_android.cc
+++ b/net/test/embedded_test_server/android/embedded_test_server_android.cc
@@ -7,8 +7,8 @@
#include "base/android/jni_array.h"
#include "base/android/jni_string.h"
#include "base/android/scoped_java_ref.h"
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/test/test_support_android.h"
#include "base/trace_event/trace_event.h"
#include "net/net_test_jni_headers/EmbeddedTestServerImpl_jni.h"
diff --git a/net/test/embedded_test_server/controllable_http_response.cc b/net/test/embedded_test_server/controllable_http_response.cc
index 5c22125e..146a985 100644
--- a/net/test/embedded_test_server/controllable_http_response.cc
+++ b/net/test/embedded_test_server/controllable_http_response.cc
@@ -4,8 +4,8 @@
#include "net/test/embedded_test_server/controllable_http_response.h"
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/strings/stringprintf.h"
#include "base/task/single_thread_task_runner.h"
#include "base/trace_event/typed_macros.h"
diff --git a/net/test/embedded_test_server/default_handlers.cc b/net/test/embedded_test_server/default_handlers.cc
index b99a9724..3ea0e52 100644
--- a/net/test/embedded_test_server/default_handlers.cc
+++ b/net/test/embedded_test_server/default_handlers.cc
@@ -13,11 +13,11 @@
#include <vector>
#include "base/base64.h"
-#include "base/bind.h"
-#include "base/callback_forward.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_forward.h"
+#include "base/functional/callback_helpers.h"
#include "base/hash/md5.h"
#include "base/logging.h"
#include "base/memory/weak_ptr.h"
diff --git a/net/test/embedded_test_server/embedded_test_server.cc b/net/test/embedded_test_server/embedded_test_server.cc
index bd996a67..d112bec7 100644
--- a/net/test/embedded_test_server/embedded_test_server.cc
+++ b/net/test/embedded_test_server/embedded_test_server.cc
@@ -9,10 +9,10 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_forward.h"
-#include "base/callback_helpers.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_forward.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/message_loop/message_pump_type.h"
diff --git a/net/test/embedded_test_server/embedded_test_server.h b/net/test/embedded_test_server/embedded_test_server.h
index c81931c..fa5fa3f 100644
--- a/net/test/embedded_test_server/embedded_test_server.h
+++ b/net/test/embedded_test_server/embedded_test_server.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 "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/net/test/embedded_test_server/embedded_test_server_unittest.cc b/net/test/embedded_test_server/embedded_test_server_unittest.cc
index 09fc1b6..087d422 100644
--- a/net/test/embedded_test_server/embedded_test_server_unittest.cc
+++ b/net/test/embedded_test_server/embedded_test_server_unittest.cc
@@ -7,8 +7,8 @@
#include <tuple>
#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/weak_ptr.h"
#include "base/message_loop/message_pump_type.h"
#include "base/path_service.h"
diff --git a/net/test/embedded_test_server/http1_connection.cc b/net/test/embedded_test_server/http1_connection.cc
index ace1573c..c4b23ff 100644
--- a/net/test/embedded_test_server/http1_connection.cc
+++ b/net/test/embedded_test_server/http1_connection.cc
@@ -6,9 +6,9 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_forward.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_forward.h"
+#include "base/functional/callback_helpers.h"
#include "base/strings/stringprintf.h"
#include "net/base/completion_once_callback.h"
#include "net/base/net_errors.h"
diff --git a/net/test/embedded_test_server/http1_connection.h b/net/test/embedded_test_server/http1_connection.h
index b3e82ac..a3d0146 100644
--- a/net/test/embedded_test_server/http1_connection.h
+++ b/net/test/embedded_test_server/http1_connection.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback.h"
-#include "base/callback_forward.h"
+#include "base/functional/callback.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/net/test/embedded_test_server/http2_connection.cc b/net/test/embedded_test_server/http2_connection.cc
index 90d42ce..9e1c701 100644
--- a/net/test/embedded_test_server/http2_connection.cc
+++ b/net/test/embedded_test_server/http2_connection.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/raw_ref.h"
#include "base/strings/abseil_string_conversions.h"
diff --git a/net/test/embedded_test_server/http_connection.h b/net/test/embedded_test_server/http_connection.h
index a92e03ff..c324330 100644
--- a/net/test/embedded_test_server/http_connection.h
+++ b/net/test/embedded_test_server/http_connection.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/weak_ptr.h"
#include "net/base/completion_once_callback.h"
#include "net/test/embedded_test_server/embedded_test_server_connection_listener.h"
diff --git a/net/test/embedded_test_server/http_response.cc b/net/test/embedded_test_server/http_response.cc
index 8e657c3..1465c45 100644
--- a/net/test/embedded_test_server/http_response.cc
+++ b/net/test/embedded_test_server/http_response.cc
@@ -9,11 +9,11 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_forward.h"
#include "base/check.h"
#include "base/containers/flat_map.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_forward.h"
#include "base/logging.h"
#include "base/ranges/algorithm.h"
#include "base/strings/string_number_conversions.h"
diff --git a/net/test/embedded_test_server/http_response.h b/net/test/embedded_test_server/http_response.h
index f9b8112..faa1af2 100644
--- a/net/test/embedded_test_server/http_response.h
+++ b/net/test/embedded_test_server/http_response.h
@@ -7,10 +7,10 @@
#include <string>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/compiler_specific.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/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
diff --git a/net/test/quic_simple_test_server.cc b/net/test/quic_simple_test_server.cc
index 25c79b1..9e147a7 100644
--- a/net/test/quic_simple_test_server.cc
+++ b/net/test/quic_simple_test_server.cc
@@ -7,9 +7,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/message_loop/message_pump_type.h"
#include "base/path_service.h"
#include "base/strings/string_number_conversions.h"
diff --git a/net/test/run_all_unittests.cc b/net/test/run_all_unittests.cc
index d1c2c98..f738c3ec 100644
--- a/net/test/run_all_unittests.cc
+++ b/net/test/run_all_unittests.cc
@@ -4,8 +4,8 @@
#include <iostream>
-#include "base/bind.h"
#include "base/build_time.h"
+#include "base/functional/bind.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "build/build_config.h"
#include "net/socket/transport_client_socket_pool.h"
diff --git a/net/test/scoped_disable_exit_on_dfatal.cc b/net/test/scoped_disable_exit_on_dfatal.cc
index b784647..c66ab9a 100644
--- a/net/test/scoped_disable_exit_on_dfatal.cc
+++ b/net/test/scoped_disable_exit_on_dfatal.cc
@@ -4,8 +4,8 @@
#include "net/test/scoped_disable_exit_on_dfatal.h"
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/strings/string_piece.h"
namespace net::test {
diff --git a/net/test/spawned_test_server/local_test_server_win.cc b/net/test/spawned_test_server/local_test_server_win.cc
index e18e0a2..0621c00d 100644
--- a/net/test/spawned_test_server/local_test_server_win.cc
+++ b/net/test/spawned_test_server/local_test_server_win.cc
@@ -7,10 +7,10 @@
#include <windows.h>
#include "base/base_paths.h"
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/environment.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/path_service.h"
#include "base/process/launch.h"
diff --git a/net/test/spawned_test_server/remote_test_server_spawner_request.cc b/net/test/spawned_test_server/remote_test_server_spawner_request.cc
index 26a19d1..808fa2d2 100644
--- a/net/test/spawned_test_server/remote_test_server_spawner_request.cc
+++ b/net/test/spawned_test_server/remote_test_server_spawner_request.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/synchronization/waitable_event.h"
diff --git a/net/test/test_doh_server.cc b/net/test/test_doh_server.cc
index b792fd705..97249240 100644
--- a/net/test/test_doh_server.cc
+++ b/net/test/test_doh_server.cc
@@ -9,8 +9,8 @@
#include <memory>
#include "base/base64url.h"
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/scoped_refptr.h"
#include "base/strings/string_number_conversions.h"
diff --git a/net/test/url_request/ssl_certificate_error_job.cc b/net/test/url_request/ssl_certificate_error_job.cc
index 09a396e..88ab06c 100644
--- a/net/test/url_request/ssl_certificate_error_job.cc
+++ b/net/test/url_request/ssl_certificate_error_job.cc
@@ -6,7 +6,7 @@
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/stringprintf.h"
#include "base/task/single_thread_task_runner.h"
#include "net/ssl/ssl_info.h"
diff --git a/net/test/url_request/url_request_failed_job.cc b/net/test/url_request/url_request_failed_job.cc
index d30430f4..eb79a2fb 100644
--- a/net/test/url_request/url_request_failed_job.cc
+++ b/net/test/url_request/url_request_failed_job.cc
@@ -4,8 +4,8 @@
#include "net/test/url_request/url_request_failed_job.h"
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/strings/string_number_conversions.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/test/url_request/url_request_hanging_read_job.cc b/net/test/url_request/url_request_hanging_read_job.cc
index 0e8c482..486ed13 100644
--- a/net/test/url_request/url_request_hanging_read_job.cc
+++ b/net/test/url_request/url_request_hanging_read_job.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/strings/stringprintf.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/test/url_request/url_request_mock_data_job.cc b/net/test/url_request/url_request_mock_data_job.cc
index ff5cefb43..de5d9a8 100644
--- a/net/test/url_request/url_request_mock_data_job.cc
+++ b/net/test/url_request/url_request_mock_data_job.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
diff --git a/net/test/url_request/url_request_mock_http_job.cc b/net/test/url_request/url_request_mock_http_job.cc
index 449afaa1..37d47d9 100644
--- a/net/test/url_request/url_request_mock_http_job.cc
+++ b/net/test/url_request/url_request_mock_http_job.cc
@@ -4,8 +4,8 @@
#include "net/test/url_request/url_request_mock_http_job.h"
-#include "base/bind.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/net/test/url_request/url_request_test_job_backed_by_file.cc b/net/test/url_request/url_request_test_job_backed_by_file.cc
index 182eb77a..e7786fd2 100644
--- a/net/test/url_request/url_request_test_job_backed_by_file.cc
+++ b/net/test/url_request/url_request_test_job_backed_by_file.cc
@@ -20,9 +20,9 @@
#include "net/test/url_request/url_request_test_job_backed_by_file.h"
-#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/strings/string_util.h"
#include "base/synchronization/lock.h"
#include "base/task/task_runner.h"
diff --git a/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc b/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc
index 746513e..49fb00d 100644
--- a/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc
+++ b/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc
@@ -8,10 +8,10 @@
#include <iostream>
#include "base/at_exit.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/containers/span.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/message_loop/message_pump_type.h"
#include "base/strings/string_number_conversions.h"
diff --git a/net/tools/cert_verify_tool/cert_verify_tool.cc b/net/tools/cert_verify_tool/cert_verify_tool.cc
index f1328b89..5f7f67b 100644
--- a/net/tools/cert_verify_tool/cert_verify_tool.cc
+++ b/net/tools/cert_verify_tool/cert_verify_tool.cc
@@ -5,9 +5,9 @@
#include <iostream>
#include "base/at_exit.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/message_loop/message_pump_type.h"
#include "base/strings/string_split.h"
diff --git a/net/tools/disk_cache_memory_test/disk_cache_memory_test.cc b/net/tools/disk_cache_memory_test/disk_cache_memory_test.cc
index 1d52d67b..8dedd44 100644
--- a/net/tools/disk_cache_memory_test/disk_cache_memory_test.cc
+++ b/net/tools/disk_cache_memory_test/disk_cache_memory_test.cc
@@ -10,10 +10,10 @@
#include <vector>
#include "base/at_exit.h"
-#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/logging.h"
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_pump_type.h"
diff --git a/net/tools/quic/quic_simple_server.cc b/net/tools/quic/quic_simple_server.cc
index 2424ca4..cd70c35 100644
--- a/net/tools/quic/quic_simple_server.cc
+++ b/net/tools/quic/quic_simple_server.cc
@@ -8,7 +8,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/tools/quic/quic_simple_server_packet_writer.cc b/net/tools/quic/quic_simple_server_packet_writer.cc
index 306e01d..bebfe87 100644
--- a/net/tools/quic/quic_simple_server_packet_writer.cc
+++ b/net/tools/quic/quic_simple_server_packet_writer.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/metrics/histogram_functions.h"
#include "net/base/io_buffer.h"
diff --git a/net/tools/quic/quic_simple_server_packet_writer.h b/net/tools/quic/quic_simple_server_packet_writer.h
index a026df3..3ca2bfd 100644
--- a/net/tools/quic/quic_simple_server_packet_writer.h
+++ b/net/tools/quic/quic_simple_server_packet_writer.h
@@ -7,7 +7,7 @@
#include <stddef.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "net/third_party/quiche/src/quiche/quic/core/quic_connection.h"
#include "net/third_party/quiche/src/quiche/quic/core/quic_packet_writer.h"
diff --git a/net/tools/quic/synchronous_host_resolver.cc b/net/tools/quic/synchronous_host_resolver.cc
index a14d98e..a09c04c 100644
--- a/net/tools/quic/synchronous_host_resolver.cc
+++ b/net/tools/quic/synchronous_host_resolver.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "base/at_exit.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_pump_type.h"
diff --git a/net/tools/stress_cache/stress_cache.cc b/net/tools/stress_cache/stress_cache.cc
index 94e9f255..c6d278e 100644
--- a/net/tools/stress_cache/stress_cache.cc
+++ b/net/tools/stress_cache/stress_cache.cc
@@ -18,11 +18,11 @@
#include <vector>
#include "base/at_exit.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/debug/debugger.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/message_loop/message_pump_type.h"
diff --git a/net/url_request/http_with_dns_over_https_unittest.cc b/net/url_request/http_with_dns_over_https_unittest.cc
index db1c4b4..8a83d59a8 100644
--- a/net/url_request/http_with_dns_over_https_unittest.cc
+++ b/net/url_request/http_with_dns_over_https_unittest.cc
@@ -6,7 +6,7 @@
#include <vector>
#include "base/big_endian.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/strings/strcat.h"
diff --git a/net/url_request/report_sender.h b/net/url_request/report_sender.h
index f0eb4d6..2119ca92 100644
--- a/net/url_request/report_sender.h
+++ b/net/url_request/report_sender.h
@@ -8,7 +8,7 @@
#include <map>
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "net/base/net_export.h"
#include "net/http/transport_security_state.h"
diff --git a/net/url_request/report_sender_unittest.cc b/net/url_request/report_sender_unittest.cc
index 4d244f3..ea84239 100644
--- a/net/url_request/report_sender_unittest.cc
+++ b/net/url_request/report_sender_unittest.cc
@@ -4,8 +4,8 @@
#include "net/url_request/report_sender.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 "net/base/load_flags.h"
#include "net/base/network_delegate_impl.h"
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index 5d6c1984..6d15414 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -6,10 +6,10 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/metrics/histogram_macros.h"
#include "base/rand_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/net/url_request/url_request_context_builder.h b/net/url_request/url_request_context_builder.h
index 4b7e4674..e726346 100644
--- a/net/url_request/url_request_context_builder.h
+++ b/net/url_request/url_request_context_builder.h
@@ -22,8 +22,8 @@
#include <utility>
#include <vector>
-#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/task/task_traits.h"
diff --git a/net/url_request/url_request_context_builder_unittest.cc b/net/url_request/url_request_context_builder_unittest.cc
index 2ce47c00..6f5f39d 100644
--- a/net/url_request/url_request_context_builder_unittest.cc
+++ b/net/url_request/url_request_context_builder_unittest.cc
@@ -4,7 +4,7 @@
#include "net/url_request/url_request_context_builder.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
#include "base/task/thread_pool.h"
diff --git a/net/url_request/url_request_error_job.cc b/net/url_request/url_request_error_job.cc
index bacf34e2..d22bd5d 100644
--- a/net/url_request/url_request_error_job.cc
+++ b/net/url_request/url_request_error_job.cc
@@ -4,8 +4,8 @@
#include "net/url_request/url_request_error_job.h"
-#include "base/bind.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
#include "net/base/net_errors.h"
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index 2b33cf1c..31b8af5 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -11,13 +11,13 @@
#include <vector>
#include "base/base_switches.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/containers/adapters.h"
#include "base/file_version_info.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/field_trial.h"
diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc
index 00f9b21..51eb3ae 100644
--- a/net/url_request/url_request_job.cc
+++ b/net/url_request/url_request_job.cc
@@ -6,9 +6,9 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/metrics/histogram_macros.h"
diff --git a/net/url_request/url_request_job_factory_unittest.cc b/net/url_request/url_request_job_factory_unittest.cc
index aaab1ffa..bb4e531 100644
--- a/net/url_request/url_request_job_factory_unittest.cc
+++ b/net/url_request/url_request_job_factory_unittest.cc
@@ -4,7 +4,7 @@
#include "net/url_request/url_request_job_factory.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/weak_ptr.h"
#include "base/run_loop.h"
diff --git a/net/url_request/url_request_quic_perftest.cc b/net/url_request/url_request_quic_perftest.cc
index e576d80..c36f8fc 100644
--- a/net/url_request/url_request_quic_perftest.cc
+++ b/net/url_request/url_request_quic_perftest.cc
@@ -6,9 +6,9 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted_memory.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
diff --git a/net/url_request/url_request_quic_unittest.cc b/net/url_request/url_request_quic_unittest.cc
index 31bc247..581d88d 100644
--- a/net/url_request/url_request_quic_unittest.cc
+++ b/net/url_request/url_request_quic_unittest.cc
@@ -4,10 +4,10 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/feature_list.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
#include "base/test/bind.h"
diff --git a/net/url_request/url_request_redirect_job.cc b/net/url_request/url_request_redirect_job.cc
index 18242ed0..614fa5f 100644
--- a/net/url_request/url_request_redirect_job.cc
+++ b/net/url_request/url_request_redirect_job.cc
@@ -6,9 +6,9 @@
#include <string>
-#include "base/bind.h"
#include "base/check.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/strings/stringprintf.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/net/url_request/url_request_test_job.cc b/net/url_request/url_request_test_job.cc
index 413625b..4fc0612 100644
--- a/net/url_request/url_request_test_job.cc
+++ b/net/url_request/url_request_test_job.cc
@@ -8,9 +8,9 @@
#include <list>
#include <memory>
-#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/containers/cxx20_erase_list.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/location.h"
#include "base/strings/string_util.h"
diff --git a/net/url_request/url_request_throttler_entry.cc b/net/url_request/url_request_throttler_entry.cc
index 02055a6..fa08ce8 100644
--- a/net/url_request/url_request_throttler_entry.cc
+++ b/net/url_request/url_request_throttler_entry.cc
@@ -7,8 +7,8 @@
#include <cmath>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram_macros.h"
#include "base/rand_util.h"
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index f4e13189..deadb1c 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -10,13 +10,13 @@
#include <utility>
#include "base/base64url.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/format_macros.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/json/json_reader.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
diff --git a/net/websockets/websocket_basic_handshake_stream.cc b/net/websockets/websocket_basic_handshake_stream.cc
index 5ad9818..13944903 100644
--- a/net/websockets/websocket_basic_handshake_stream.cc
+++ b/net/websockets/websocket_basic_handshake_stream.cc
@@ -11,9 +11,9 @@
#include <utility>
#include "base/base64.h"
-#include "base/bind.h"
#include "base/check_op.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/metrics/histogram_functions.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
diff --git a/net/websockets/websocket_basic_stream.cc b/net/websockets/websocket_basic_stream.cc
index 89ead44..ef26145 100644
--- a/net/websockets/websocket_basic_stream.cc
+++ b/net/websockets/websocket_basic_stream.cc
@@ -11,7 +11,7 @@
#include <limits>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "build/build_config.h"
diff --git a/net/websockets/websocket_basic_stream_adapters.cc b/net/websockets/websocket_basic_stream_adapters.cc
index 2c69e42..1fd9c2e 100644
--- a/net/websockets/websocket_basic_stream_adapters.cc
+++ b/net/websockets/websocket_basic_stream_adapters.cc
@@ -8,7 +8,7 @@
#include <cstring>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
#include "net/base/io_buffer.h"
diff --git a/net/websockets/websocket_basic_stream_adapters_test.cc b/net/websockets/websocket_basic_stream_adapters_test.cc
index 0c2168a..00fd848a 100644
--- a/net/websockets/websocket_basic_stream_adapters_test.cc
+++ b/net/websockets/websocket_basic_stream_adapters_test.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/net/websockets/websocket_channel.cc b/net/websockets/websocket_channel.cc
index a75fc25..b84eca3 100644
--- a/net/websockets/websocket_channel.cc
+++ b/net/websockets/websocket_channel.cc
@@ -11,8 +11,8 @@
#include <vector>
#include "base/big_endian.h"
-#include "base/bind.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/net/websockets/websocket_channel.h b/net/websockets/websocket_channel.h
index 954c94b..577af831 100644
--- a/net/websockets/websocket_channel.h
+++ b/net/websockets/websocket_channel.h
@@ -11,8 +11,8 @@
#include <string>
#include <vector>
-#include "base/callback.h"
#include "base/containers/queue.h"
+#include "base/functional/callback.h"
#include "base/i18n/streaming_utf8_validator.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
diff --git a/net/websockets/websocket_channel_test.cc b/net/websockets/websocket_channel_test.cc
index 26746b9..5137d2a 100644
--- a/net/websockets/websocket_channel_test.cc
+++ b/net/websockets/websocket_channel_test.cc
@@ -15,9 +15,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/location.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/net/websockets/websocket_deflate_stream.cc b/net/websockets/websocket_deflate_stream.cc
index 00ab620..4837975 100644
--- a/net/websockets/websocket_deflate_stream.cc
+++ b/net/websockets/websocket_deflate_stream.cc
@@ -11,7 +11,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/scoped_refptr.h"
#include "net/base/io_buffer.h"
diff --git a/net/websockets/websocket_deflate_stream_test.cc b/net/websockets/websocket_deflate_stream_test.cc
index 11bfbdf..829f0e5 100644
--- a/net/websockets/websocket_deflate_stream_test.cc
+++ b/net/websockets/websocket_deflate_stream_test.cc
@@ -12,9 +12,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/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
diff --git a/net/websockets/websocket_end_to_end_test.cc b/net/websockets/websocket_end_to_end_test.cc
index 3078fc3..a4afca9 100644
--- a/net/websockets/websocket_end_to_end_test.cc
+++ b/net/websockets/websocket_end_to_end_test.cc
@@ -14,10 +14,10 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/net/websockets/websocket_event_interface.h b/net/websockets/websocket_event_interface.h
index 45115239..caf5e4e 100644
--- a/net/websockets/websocket_event_interface.h
+++ b/net/websockets/websocket_event_interface.h
@@ -11,8 +11,8 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
#include "base/containers/span.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "net/base/net_export.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/net/websockets/websocket_http2_handshake_stream.cc b/net/websockets/websocket_http2_handshake_stream.cc
index 0dd56a54..665f92ff 100644
--- a/net/websockets/websocket_http2_handshake_stream.cc
+++ b/net/websockets/websocket_http2_handshake_stream.cc
@@ -8,8 +8,8 @@
#include <set>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/notreached.h"
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
diff --git a/net/websockets/websocket_stream.cc b/net/websockets/websocket_stream.cc
index 64ace35..cc96c0e 100644
--- a/net/websockets/websocket_stream.cc
+++ b/net/websockets/websocket_stream.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/net/websockets/websocket_stream.h b/net/websockets/websocket_stream.h
index ed0efde..c4e7f1d 100644
--- a/net/websockets/websocket_stream.h
+++ b/net/websockets/websocket_stream.h
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/time/time.h"
#include "net/base/completion_once_callback.h"
diff --git a/net/websockets/websocket_stream_cookie_test.cc b/net/websockets/websocket_stream_cookie_test.cc
index 72644b87..1e97a2c 100644
--- a/net/websockets/websocket_stream_cookie_test.cc
+++ b/net/websockets/websocket_stream_cookie_test.cc
@@ -5,7 +5,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/weak_ptr.h"
#include "base/run_loop.h"
#include "base/strings/string_util.h"
diff --git a/net/websockets/websocket_stream_create_test_base.cc b/net/websockets/websocket_stream_create_test_base.cc
index 27ea5026..14a8f17 100644
--- a/net/websockets/websocket_stream_create_test_base.cc
+++ b/net/websockets/websocket_stream_create_test_base.cc
@@ -7,7 +7,7 @@
#include <utility>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "net/base/ip_endpoint.h"
#include "net/http/http_request_headers.h"
#include "net/http/http_response_headers.h"
