Update header includes for /base/functional in /r*
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: I7cace513100cdf727d14419cf5817fda92941012
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4157696
Reviewed-by: Daniel Cheng <[email protected]>
Commit-Queue: Daniel Cheng <[email protected]>
Auto-Submit: Avi Drissman <[email protected]>
Owners-Override: Daniel Cheng <[email protected]>
Commit-Queue: Avi Drissman <[email protected]>
Owners-Override: Avi Drissman <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1091527}
diff --git a/remoting/base/auto_thread.cc b/remoting/base/auto_thread.cc
index 495cc8be..d34fdb0 100644
--- a/remoting/base/auto_thread.cc
+++ b/remoting/base/auto_thread.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/lazy_instance.h"
#include "base/logging.h"
#include "base/run_loop.h"
diff --git a/remoting/base/auto_thread.h b/remoting/base/auto_thread.h
index 04b85bc5..3e9a772 100644
--- a/remoting/base/auto_thread.h
+++ b/remoting/base/auto_thread.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/message_loop/message_pump_type.h"
#include "base/threading/platform_thread.h"
diff --git a/remoting/base/auto_thread_task_runner.h b/remoting/base/auto_thread_task_runner.h
index ebcdc7bc..4a3da53 100644
--- a/remoting/base/auto_thread_task_runner.h
+++ b/remoting/base/auto_thread_task_runner.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_BASE_AUTO_THREAD_TASK_RUNNER_H_
#define REMOTING_BASE_AUTO_THREAD_TASK_RUNNER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/task/single_thread_task_runner.h"
#include "build/buildflag.h"
diff --git a/remoting/base/auto_thread_task_runner_unittest.cc b/remoting/base/auto_thread_task_runner_unittest.cc
index 61d456d..dccd8a1c 100644
--- a/remoting/base/auto_thread_task_runner_unittest.cc
+++ b/remoting/base/auto_thread_task_runner_unittest.cc
@@ -4,7 +4,7 @@
#include "remoting/base/auto_thread_task_runner.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/base/auto_thread_unittest.cc b/remoting/base/auto_thread_unittest.cc
index dd4d075..09fc939f 100644
--- a/remoting/base/auto_thread_unittest.cc
+++ b/remoting/base/auto_thread_unittest.cc
@@ -4,8 +4,8 @@
#include "remoting/base/auto_thread.h"
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted.h"
#include "base/message_loop/message_pump_type.h"
#include "base/run_loop.h"
diff --git a/remoting/base/buffered_socket_writer.cc b/remoting/base/buffered_socket_writer.cc
index ae4ec36..a29a9fa 100644
--- a/remoting/base/buffered_socket_writer.cc
+++ b/remoting/base/buffered_socket_writer.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/io_buffer.h"
#include "net/base/net_errors.h"
#include "net/socket/socket.h"
diff --git a/remoting/base/buffered_socket_writer.h b/remoting/base/buffered_socket_writer.h
index 2ada676..e6acba5 100644
--- a/remoting/base/buffered_socket_writer.h
+++ b/remoting/base/buffered_socket_writer.h
@@ -8,7 +8,7 @@
#include <list>
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread_checker.h"
diff --git a/remoting/base/buffered_socket_writer_unittest.cc b/remoting/base/buffered_socket_writer_unittest.cc
index 961573a..c81c1aa 100644
--- a/remoting/base/buffered_socket_writer_unittest.cc
+++ b/remoting/base/buffered_socket_writer_unittest.cc
@@ -9,8 +9,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "net/base/io_buffer.h"
diff --git a/remoting/base/chromium_url_request.cc b/remoting/base/chromium_url_request.cc
index d84726414..cd8b295 100644
--- a/remoting/base/chromium_url_request.cc
+++ b/remoting/base/chromium_url_request.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "net/base/load_flags.h"
#include "services/network/public/cpp/resource_request.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
diff --git a/remoting/base/chromium_url_request.h b/remoting/base/chromium_url_request.h
index c38c173..a005341 100644
--- a/remoting/base/chromium_url_request.h
+++ b/remoting/base/chromium_url_request.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "net/traffic_annotation/network_traffic_annotation.h"
#include "remoting/base/url_request.h"
diff --git a/remoting/base/compound_buffer_unittest.cc b/remoting/base/compound_buffer_unittest.cc
index 9e92f79d..8e0da56 100644
--- a/remoting/base/compound_buffer_unittest.cc
+++ b/remoting/base/compound_buffer_unittest.cc
@@ -10,8 +10,8 @@
#include <memory>
#include <string>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "net/base/io_buffer.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/remoting/base/directory_service_client.cc b/remoting/base/directory_service_client.cc
index 13f3c2e..ddbbc644 100644
--- a/remoting/base/directory_service_client.cc
+++ b/remoting/base/directory_service_client.cc
@@ -4,7 +4,7 @@
#include "remoting/base/directory_service_client.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "remoting/base/protobuf_http_request.h"
#include "remoting/base/protobuf_http_request_config.h"
#include "remoting/base/service_urls.h"
diff --git a/remoting/base/directory_service_client.h b/remoting/base/directory_service_client.h
index 8b03bb0..964178f 100644
--- a/remoting/base/directory_service_client.h
+++ b/remoting/base/directory_service_client.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "remoting/base/protobuf_http_client.h"
namespace google {
diff --git a/remoting/base/fake_oauth_token_getter.cc b/remoting/base/fake_oauth_token_getter.cc
index 7e495b56..ba62afd 100644
--- a/remoting/base/fake_oauth_token_getter.cc
+++ b/remoting/base/fake_oauth_token_getter.cc
@@ -4,7 +4,7 @@
#include "remoting/base/fake_oauth_token_getter.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/base/fake_oauth_token_getter.h b/remoting/base/fake_oauth_token_getter.h
index 6651dd0..ef9bda5 100644
--- a/remoting/base/fake_oauth_token_getter.h
+++ b/remoting/base/fake_oauth_token_getter.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "remoting/base/oauth_token_getter.h"
namespace remoting {
diff --git a/remoting/base/oauth_client.h b/remoting/base/oauth_client.h
index 05bf085d..46ca52a 100644
--- a/remoting/base/oauth_client.h
+++ b/remoting/base/oauth_client.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
namespace gaia {
struct OAuthClientInfo;
diff --git a/remoting/base/oauth_token_getter.h b/remoting/base/oauth_token_getter.h
index c2db610b..24f6efd 100644
--- a/remoting/base/oauth_token_getter.h
+++ b/remoting/base/oauth_token_getter.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
namespace remoting {
diff --git a/remoting/base/oauth_token_getter_impl.cc b/remoting/base/oauth_token_getter_impl.cc
index db6155e..4e55293 100644
--- a/remoting/base/oauth_token_getter_impl.cc
+++ b/remoting/base/oauth_token_getter_impl.cc
@@ -7,9 +7,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/containers/queue.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/strings/string_util.h"
#include "google_apis/google_api_keys.h"
#include "remoting/base/logging.h"
diff --git a/remoting/base/oauth_token_getter_impl.h b/remoting/base/oauth_token_getter_impl.h
index e3cf7d5..62d3314 100644
--- a/remoting/base/oauth_token_getter_impl.h
+++ b/remoting/base/oauth_token_getter_impl.h
@@ -5,8 +5,8 @@
#ifndef REMOTING_BASE_OAUTH_TOKEN_GETTER_IMPL_H_
#define REMOTING_BASE_OAUTH_TOKEN_GETTER_IMPL_H_
-#include "base/callback.h"
#include "base/containers/queue.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
#include "base/time/time.h"
diff --git a/remoting/base/oauth_token_getter_proxy.cc b/remoting/base/oauth_token_getter_proxy.cc
index eab28a2..6f57133 100644
--- a/remoting/base/oauth_token_getter_proxy.cc
+++ b/remoting/base/oauth_token_getter_proxy.cc
@@ -4,7 +4,7 @@
#include "remoting/base/oauth_token_getter_proxy.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
#include "base/threading/thread_checker.h"
diff --git a/remoting/base/oauth_token_getter_proxy.h b/remoting/base/oauth_token_getter_proxy.h
index cb10f43..9053cb8 100644
--- a/remoting/base/oauth_token_getter_proxy.h
+++ b/remoting/base/oauth_token_getter_proxy.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_BASE_OAUTH_TOKEN_GETTER_PROXY_H_
#define REMOTING_BASE_OAUTH_TOKEN_GETTER_PROXY_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "remoting/base/oauth_token_getter.h"
diff --git a/remoting/base/oauth_token_getter_proxy_unittest.cc b/remoting/base/oauth_token_getter_proxy_unittest.cc
index 61a88a3..7eb919d2 100644
--- a/remoting/base/oauth_token_getter_proxy_unittest.cc
+++ b/remoting/base/oauth_token_getter_proxy_unittest.cc
@@ -4,9 +4,9 @@
#include "remoting/base/oauth_token_getter_proxy.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/memory/weak_ptr.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
diff --git a/remoting/base/passthrough_oauth_token_getter.cc b/remoting/base/passthrough_oauth_token_getter.cc
index 8a8ed3e..8369ac6 100644
--- a/remoting/base/passthrough_oauth_token_getter.cc
+++ b/remoting/base/passthrough_oauth_token_getter.cc
@@ -4,7 +4,7 @@
#include "remoting/base/passthrough_oauth_token_getter.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
namespace remoting {
diff --git a/remoting/base/protobuf_http_client_unittest.cc b/remoting/base/protobuf_http_client_unittest.cc
index e1b14ebb..2434974f 100644
--- a/remoting/base/protobuf_http_client_unittest.cc
+++ b/remoting/base/protobuf_http_client_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/test/bind.h"
#include "base/test/gmock_callback_support.h"
diff --git a/remoting/base/protobuf_http_request.h b/remoting/base/protobuf_http_request.h
index 1c7d2e5..ef37da6c 100644
--- a/remoting/base/protobuf_http_request.h
+++ b/remoting/base/protobuf_http_request.h
@@ -5,8 +5,8 @@
#ifndef REMOTING_BASE_PROTOBUF_HTTP_REQUEST_H_
#define REMOTING_BASE_PROTOBUF_HTTP_REQUEST_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 "remoting/base/protobuf_http_request_base.h"
diff --git a/remoting/base/protobuf_http_request_base.h b/remoting/base/protobuf_http_request_base.h
index 8245ddb..6ad40ec 100644
--- a/remoting/base/protobuf_http_request_base.h
+++ b/remoting/base/protobuf_http_request_base.h
@@ -8,8 +8,8 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/dcheck_is_on.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
#include "remoting/base/protobuf_http_status.h"
diff --git a/remoting/base/protobuf_http_stream_parser.h b/remoting/base/protobuf_http_stream_parser.h
index 0a5a7349..e1cb2caf2 100644
--- a/remoting/base/protobuf_http_stream_parser.h
+++ b/remoting/base/protobuf_http_stream_parser.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_BASE_PROTOBUF_HTTP_STREAM_PARSER_H_
#define REMOTING_BASE_PROTOBUF_HTTP_STREAM_PARSER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/string_piece_forward.h"
diff --git a/remoting/base/protobuf_http_stream_request.cc b/remoting/base/protobuf_http_stream_request.cc
index 352b29a3..b0e9cde 100644
--- a/remoting/base/protobuf_http_stream_request.cc
+++ b/remoting/base/protobuf_http_stream_request.cc
@@ -4,7 +4,7 @@
#include "remoting/base/protobuf_http_stream_request.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/time/time.h"
#include "remoting/base/protobuf_http_client.h"
diff --git a/remoting/base/protobuf_http_stream_request.h b/remoting/base/protobuf_http_stream_request.h
index dc542ed..07697a7 100644
--- a/remoting/base/protobuf_http_stream_request.h
+++ b/remoting/base/protobuf_http_stream_request.h
@@ -5,8 +5,8 @@
#ifndef REMOTING_BASE_PROTOBUF_HTTP_STREAM_REQUEST_H_
#define REMOTING_BASE_PROTOBUF_HTTP_STREAM_REQUEST_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/timer/timer.h"
#include "remoting/base/protobuf_http_request_base.h"
diff --git a/remoting/base/queued_task_poster.cc b/remoting/base/queued_task_poster.cc
index 21eb354..310175c 100644
--- a/remoting/base/queued_task_poster.cc
+++ b/remoting/base/queued_task_poster.cc
@@ -4,8 +4,8 @@
#include "remoting/base/queued_task_poster.h"
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/base/queued_task_poster.h b/remoting/base/queued_task_poster.h
index 087bf37..401201d 100644
--- a/remoting/base/queued_task_poster.h
+++ b/remoting/base/queued_task_poster.h
@@ -5,8 +5,8 @@
#ifndef REMOTING_BASE_QUEUED_TASK_POSTER_H_
#define REMOTING_BASE_QUEUED_TASK_POSTER_H_
-#include "base/callback.h"
#include "base/containers/queue.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/base/queued_task_poster_unittest.cc b/remoting/base/queued_task_poster_unittest.cc
index 9bf2a73e..0ab9eb09 100644
--- a/remoting/base/queued_task_poster_unittest.cc
+++ b/remoting/base/queued_task_poster_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/base/run_all_unittests.cc b/remoting/base/run_all_unittests.cc
index 3e66fa0e..1335f10 100644
--- a/remoting/base/run_all_unittests.cc
+++ b/remoting/base/run_all_unittests.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/bind.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/message_loop/message_pump_type.h"
#include "base/path_service.h"
#include "base/test/launcher/unit_test_launcher.h"
diff --git a/remoting/base/scoped_protobuf_http_request.h b/remoting/base/scoped_protobuf_http_request.h
index 10a1e13..2d33cec 100644
--- a/remoting/base/scoped_protobuf_http_request.h
+++ b/remoting/base/scoped_protobuf_http_request.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_BASE_SCOPED_PROTOBUF_HTTP_REQUEST_H_
#define REMOTING_BASE_SCOPED_PROTOBUF_HTTP_REQUEST_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
namespace remoting {
diff --git a/remoting/base/socket_reader.cc b/remoting/base/socket_reader.cc
index 06f1c1a2..93be3a7b 100644
--- a/remoting/base/socket_reader.cc
+++ b/remoting/base/socket_reader.cc
@@ -4,8 +4,8 @@
#include "remoting/base/socket_reader.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/io_buffer.h"
diff --git a/remoting/base/socket_reader.h b/remoting/base/socket_reader.h
index 40a7005..79d56453 100644
--- a/remoting/base/socket_reader.h
+++ b/remoting/base/socket_reader.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_BASE_SOCKET_READER_H_
#define REMOTING_BASE_SOCKET_READER_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/remoting/base/task_util.h b/remoting/base/task_util.h
index 834f7c5..7bc0532 100644
--- a/remoting/base/task_util.h
+++ b/remoting/base/task_util.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_BASE_TASK_UTIL_H_
#define REMOTING_BASE_TASK_UTIL_H_
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "base/threading/sequence_bound.h"
diff --git a/remoting/base/telemetry_log_writer.cc b/remoting/base/telemetry_log_writer.cc
index c1cce0365..f900ad62 100644
--- a/remoting/base/telemetry_log_writer.cc
+++ b/remoting/base/telemetry_log_writer.cc
@@ -6,9 +6,9 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/adapters.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/json/json_string_value_serializer.h"
#include "base/logging.h"
#include "net/http/http_status_code.h"
diff --git a/remoting/base/telemetry_log_writer.h b/remoting/base/telemetry_log_writer.h
index 3df97c7..71b1613 100644
--- a/remoting/base/telemetry_log_writer.h
+++ b/remoting/base/telemetry_log_writer.h
@@ -7,8 +7,8 @@
#include <string>
-#include "base/callback.h"
#include "base/containers/circular_deque.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/threading/thread_checker.h"
#include "base/timer/timer.h"
diff --git a/remoting/base/telemetry_log_writer_unittest.cc b/remoting/base/telemetry_log_writer_unittest.cc
index e3a536d2..91aa1c4 100644
--- a/remoting/base/telemetry_log_writer_unittest.cc
+++ b/remoting/base/telemetry_log_writer_unittest.cc
@@ -6,9 +6,9 @@
#include <array>
-#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/logging.h"
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
diff --git a/remoting/base/url_request.h b/remoting/base/url_request.h
index cba1c3e..e79b744 100644
--- a/remoting/base/url_request.h
+++ b/remoting/base/url_request.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "net/traffic_annotation/network_traffic_annotation.h"
namespace remoting {
diff --git a/remoting/client/audio/audio_jitter_buffer.h b/remoting/client/audio/audio_jitter_buffer.h
index bf6070e..f15c615 100644
--- a/remoting/client/audio/audio_jitter_buffer.h
+++ b/remoting/client/audio/audio_jitter_buffer.h
@@ -8,7 +8,7 @@
#include <list>
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "base/time/time.h"
diff --git a/remoting/client/audio/audio_jitter_buffer_unittest.cc b/remoting/client/audio/audio_jitter_buffer_unittest.cc
index dfc4ff7..5f97937 100644
--- a/remoting/client/audio/audio_jitter_buffer_unittest.cc
+++ b/remoting/client/audio/audio_jitter_buffer_unittest.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <string>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/time/time.h"
#include "remoting/client/audio/audio_jitter_buffer.h"
diff --git a/remoting/client/audio/audio_playback_stream.cc b/remoting/client/audio/audio_playback_stream.cc
index 9fe3d4c..e1117de 100644
--- a/remoting/client/audio/audio_playback_stream.cc
+++ b/remoting/client/audio/audio_playback_stream.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/single_thread_task_runner.h"
#include "remoting/client/audio/audio_jitter_buffer.h"
#include "remoting/client/audio/audio_playback_sink.h"
diff --git a/remoting/client/audio/audio_player.cc b/remoting/client/audio/audio_player.cc
index 1b201c3..7fa9b6e 100644
--- a/remoting/client/audio/audio_player.cc
+++ b/remoting/client/audio/audio_player.cc
@@ -8,8 +8,8 @@
#include <string>
#include <utility>
-#include "base/callback_helpers.h"
#include "base/check_op.h"
+#include "base/functional/callback_helpers.h"
#include "base/time/time.h"
// If queue grows bigger than 150ms we start dropping packets.
diff --git a/remoting/client/audio/audio_player_unittest.cc b/remoting/client/audio/audio_player_unittest.cc
index bb3053d..213d9c8 100644
--- a/remoting/client/audio/audio_player_unittest.cc
+++ b/remoting/client/audio/audio_player_unittest.cc
@@ -7,8 +7,8 @@
#include <cstdint>
#include <memory>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
diff --git a/remoting/client/chromoting_client.h b/remoting/client/chromoting_client.h
index cf92f2a2..15776f2 100644
--- a/remoting/client/chromoting_client.h
+++ b/remoting/client/chromoting_client.h
@@ -10,7 +10,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
diff --git a/remoting/client/chromoting_client_runtime.cc b/remoting/client/chromoting_client_runtime.cc
index c0e19a0..8b2d8e9 100644
--- a/remoting/client/chromoting_client_runtime.cc
+++ b/remoting/client/chromoting_client_runtime.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/singleton.h"
#include "base/message_loop/message_pump_type.h"
diff --git a/remoting/client/chromoting_session.cc b/remoting/client/chromoting_session.cc
index 51fb812..87be6431 100644
--- a/remoting/client/chromoting_session.cc
+++ b/remoting/client/chromoting_session.cc
@@ -10,10 +10,10 @@
#include <memory>
#include <utility>
-#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/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/client/client_telemetry_logger.h b/remoting/client/client_telemetry_logger.h
index aa8f8008..0f31189 100644
--- a/remoting/client/client_telemetry_logger.h
+++ b/remoting/client/client_telemetry_logger.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
diff --git a/remoting/client/cursor_shape_stub_proxy.cc b/remoting/client/cursor_shape_stub_proxy.cc
index c060bdcf..799e66d 100644
--- a/remoting/client/cursor_shape_stub_proxy.cc
+++ b/remoting/client/cursor_shape_stub_proxy.cc
@@ -4,7 +4,7 @@
#include "remoting/client/cursor_shape_stub_proxy.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
#include "remoting/proto/control.pb.h"
diff --git a/remoting/client/display/gl_renderer.cc b/remoting/client/display/gl_renderer.cc
index 35df32f..9448f4d 100644
--- a/remoting/client/display/gl_renderer.cc
+++ b/remoting/client/display/gl_renderer.cc
@@ -6,8 +6,8 @@
#include <algorithm>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/task/single_thread_task_runner.h"
#include "remoting/client/display/drawable.h"
#include "remoting/client/display/gl_canvas.h"
diff --git a/remoting/client/display/gl_renderer.h b/remoting/client/display/gl_renderer.h
index 5ce0ae7..334e353 100644
--- a/remoting/client/display/gl_renderer.h
+++ b/remoting/client/display/gl_renderer.h
@@ -7,8 +7,8 @@
#include <vector>
-#include "base/callback.h"
#include "base/containers/queue.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "remoting/client/display/gl_cursor.h"
diff --git a/remoting/client/display/gl_renderer_unittest.cc b/remoting/client/display/gl_renderer_unittest.cc
index 6b90cc612..f1c8e05 100644
--- a/remoting/client/display/gl_renderer_unittest.cc
+++ b/remoting/client/display/gl_renderer_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "remoting/client/display/fake_canvas.h"
diff --git a/remoting/client/display/renderer_proxy.cc b/remoting/client/display/renderer_proxy.cc
index 4914ebf..6c1d29f 100644
--- a/remoting/client/display/renderer_proxy.cc
+++ b/remoting/client/display/renderer_proxy.cc
@@ -4,8 +4,8 @@
#include "remoting/client/display/renderer_proxy.h"
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/task/single_thread_task_runner.h"
#include "remoting/base/queued_task_poster.h"
#include "remoting/client/display/gl_renderer.h"
diff --git a/remoting/client/dual_buffer_frame_consumer.cc b/remoting/client/dual_buffer_frame_consumer.cc
index a66aefa..ab6c5b62 100644
--- a/remoting/client/dual_buffer_frame_consumer.cc
+++ b/remoting/client/dual_buffer_frame_consumer.cc
@@ -6,9 +6,9 @@
#include <memory>
-#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/location.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/client/dual_buffer_frame_consumer.h b/remoting/client/dual_buffer_frame_consumer.h
index 02459e4..82ef80a 100644
--- a/remoting/client/dual_buffer_frame_consumer.h
+++ b/remoting/client/dual_buffer_frame_consumer.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_CLIENT_DUAL_BUFFER_FRAME_CONSUMER_H_
#define REMOTING_CLIENT_DUAL_BUFFER_FRAME_CONSUMER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/client/dual_buffer_frame_consumer_unittest.cc b/remoting/client/dual_buffer_frame_consumer_unittest.cc
index 52ebca2d..cefb99b7 100644
--- a/remoting/client/dual_buffer_frame_consumer_unittest.cc
+++ b/remoting/client/dual_buffer_frame_consumer_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
#include "third_party/webrtc/modules/desktop_capture/shared_desktop_frame.h"
diff --git a/remoting/client/gesture_interpreter.cc b/remoting/client/gesture_interpreter.cc
index 9ec06f1..73c452d 100644
--- a/remoting/client/gesture_interpreter.cc
+++ b/remoting/client/gesture_interpreter.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/time/time.h"
#include "remoting/client/chromoting_session.h"
#include "remoting/client/display/renderer_proxy.h"
diff --git a/remoting/client/input/key_event_mapper.h b/remoting/client/input/key_event_mapper.h
index 756f547..6ffe0a2f 100644
--- a/remoting/client/input/key_event_mapper.h
+++ b/remoting/client/input/key_event_mapper.h
@@ -10,8 +10,8 @@
#include <map>
#include <set>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "remoting/protocol/input_filter.h"
namespace remoting {
diff --git a/remoting/client/input/key_event_mapper_unittest.cc b/remoting/client/input/key_event_mapper_unittest.cc
index b970543..f9509f18 100644
--- a/remoting/client/input/key_event_mapper_unittest.cc
+++ b/remoting/client/input/key_event_mapper_unittest.cc
@@ -6,7 +6,7 @@
#include <stdint.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "remoting/proto/event.pb.h"
#include "remoting/protocol/protocol_mock_objects.h"
#include "remoting/protocol/test_event_matchers.h"
diff --git a/remoting/client/jni/jni_directory_service.cc b/remoting/client/jni/jni_directory_service.cc
index 609eaf1..27274da 100644
--- a/remoting/client/jni/jni_directory_service.cc
+++ b/remoting/client/jni/jni_directory_service.cc
@@ -11,7 +11,7 @@
#include "base/android/jni_android.h"
#include "base/android/jni_array.h"
#include "base/android/jni_string.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "remoting/android/jni_headers/DirectoryService_jni.h"
#include "remoting/base/oauth_token_getter.h"
diff --git a/remoting/client/jni/jni_gl_display_handler.cc b/remoting/client/jni/jni_gl_display_handler.cc
index 4d970147..cb13bea 100644
--- a/remoting/client/jni/jni_gl_display_handler.cc
+++ b/remoting/client/jni/jni_gl_display_handler.cc
@@ -9,8 +9,8 @@
#include <memory>
#include "base/android/jni_android.h"
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "remoting/android/jni_headers/GlDisplay_jni.h"
#include "remoting/client/chromoting_client_runtime.h"
diff --git a/remoting/client/jni/jni_notification_presenter.cc b/remoting/client/jni/jni_notification_presenter.cc
index b2b5c84f..87d8381 100644
--- a/remoting/client/jni/jni_notification_presenter.cc
+++ b/remoting/client/jni/jni_notification_presenter.cc
@@ -6,7 +6,7 @@
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "remoting/android/jni_headers/NotificationPresenter_jni.h"
#include "remoting/client/chromoting_client_runtime.h"
diff --git a/remoting/client/jni/jni_runtime_delegate.cc b/remoting/client/jni/jni_runtime_delegate.cc
index 3714730b..dc499bd1 100644
--- a/remoting/client/jni/jni_runtime_delegate.cc
+++ b/remoting/client/jni/jni_runtime_delegate.cc
@@ -9,8 +9,8 @@
#include "base/android/jni_string.h"
#include "base/android/library_loader/library_loader_hooks.h"
#include "base/android/scoped_java_ref.h"
-#include "base/bind.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/singleton.h"
#include "base/synchronization/waitable_event.h"
diff --git a/remoting/client/notification/json_fetcher.h b/remoting/client/notification/json_fetcher.h
index bafef02..0475344 100644
--- a/remoting/client/notification/json_fetcher.h
+++ b/remoting/client/notification/json_fetcher.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
namespace base {
diff --git a/remoting/client/notification/notification_client.cc b/remoting/client/notification/notification_client.cc
index 9fcb498..48d9bbb 100644
--- a/remoting/client/notification/notification_client.cc
+++ b/remoting/client/notification/notification_client.cc
@@ -6,8 +6,8 @@
#include <algorithm>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/hash/hash.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
diff --git a/remoting/client/notification/notification_client.h b/remoting/client/notification/notification_client.h
index c454c3f4..6d334cd 100644
--- a/remoting/client/notification/notification_client.h
+++ b/remoting/client/notification/notification_client.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/task/single_thread_task_runner.h"
#include "base/values.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/remoting/client/software_video_renderer.cc b/remoting/client/software_video_renderer.cc
index 0e2b540..544ef40 100644
--- a/remoting/client/software_video_renderer.cc
+++ b/remoting/client/software_video_renderer.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/location.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/remoting/client/software_video_renderer_unittest.cc b/remoting/client/software_video_renderer_unittest.cc
index 0e45304..f7d850c 100644
--- a/remoting/client/software_video_renderer_unittest.cc
+++ b/remoting/client/software_video_renderer_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 "base/test/task_environment.h"
#include "base/threading/thread.h"
diff --git a/remoting/client/ui/desktop_viewport.h b/remoting/client/ui/desktop_viewport.h
index cc68d34..1db12f1c 100644
--- a/remoting/client/ui/desktop_viewport.h
+++ b/remoting/client/ui/desktop_viewport.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_CLIENT_UI_DESKTOP_VIEWPORT_H_
#define REMOTING_CLIENT_UI_DESKTOP_VIEWPORT_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "remoting/client/ui/view_matrix.h"
namespace remoting {
diff --git a/remoting/client/ui/desktop_viewport_unittest.cc b/remoting/client/ui/desktop_viewport_unittest.cc
index 9baf4c4..f4fa630 100644
--- a/remoting/client/ui/desktop_viewport_unittest.cc
+++ b/remoting/client/ui/desktop_viewport_unittest.cc
@@ -4,7 +4,7 @@
#include "remoting/client/ui/desktop_viewport.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/strings/stringprintf.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/remoting/client/ui/fling_animation.h b/remoting/client/ui/fling_animation.h
index 2cf6ff7..de5dcc6 100644
--- a/remoting/client/ui/fling_animation.h
+++ b/remoting/client/ui/fling_animation.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_CLIENT_UI_FLING_ANIMATION_H_
#define REMOTING_CLIENT_UI_FLING_ANIMATION_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/time/tick_clock.h"
#include "base/time/time.h"
diff --git a/remoting/client/ui/fling_animation_unittest.cc b/remoting/client/ui/fling_animation_unittest.cc
index 67f7dae..19f8e107 100644
--- a/remoting/client/ui/fling_animation_unittest.cc
+++ b/remoting/client/ui/fling_animation_unittest.cc
@@ -6,7 +6,7 @@
#include <cmath>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/test/simple_test_tick_clock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/remoting/codec/audio_encoder_opus.cc b/remoting/codec/audio_encoder_opus.cc
index ba7badec..14c5b89 100644
--- a/remoting/codec/audio_encoder_opus.cc
+++ b/remoting/codec/audio_encoder_opus.cc
@@ -4,7 +4,7 @@
#include "remoting/codec/audio_encoder_opus.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/time/time.h"
#include "media/base/audio_bus.h"
diff --git a/remoting/codec/codec_test.cc b/remoting/codec/codec_test.cc
index a4f6414..c0860ce 100644
--- a/remoting/codec/codec_test.cc
+++ b/remoting/codec/codec_test.cc
@@ -11,7 +11,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "remoting/base/util.h"
diff --git a/remoting/codec/video_encoder_vpx.cc b/remoting/codec/video_encoder_vpx.cc
index ba309d7..f96dd4b 100644
--- a/remoting/codec/video_encoder_vpx.cc
+++ b/remoting/codec/video_encoder_vpx.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/system/sys_info.h"
diff --git a/remoting/codec/video_encoder_vpx.h b/remoting/codec/video_encoder_vpx.h
index 37160a8..453a10c 100644
--- a/remoting/codec/video_encoder_vpx.h
+++ b/remoting/codec/video_encoder_vpx.h
@@ -7,7 +7,7 @@
#include <stdint.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/time/default_tick_clock.h"
#include "base/time/time.h"
diff --git a/remoting/codec/webrtc_video_encoder.h b/remoting/codec/webrtc_video_encoder.h
index d73ce9c..f202b56 100644
--- a/remoting/codec/webrtc_video_encoder.h
+++ b/remoting/codec/webrtc_video_encoder.h
@@ -10,7 +10,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "third_party/webrtc/api/video/encoded_image.h"
#include "third_party/webrtc/api/video/video_codec_type.h"
diff --git a/remoting/codec/webrtc_video_encoder_av1.cc b/remoting/codec/webrtc_video_encoder_av1.cc
index a015e32..2407a002 100644
--- a/remoting/codec/webrtc_video_encoder_av1.cc
+++ b/remoting/codec/webrtc_video_encoder_av1.cc
@@ -4,7 +4,7 @@
#include "remoting/codec/webrtc_video_encoder_av1.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/notreached.h"
#include "base/system/sys_info.h"
diff --git a/remoting/codec/webrtc_video_encoder_av1.h b/remoting/codec/webrtc_video_encoder_av1.h
index f654426..0054547 100644
--- a/remoting/codec/webrtc_video_encoder_av1.h
+++ b/remoting/codec/webrtc_video_encoder_av1.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_CODEC_WEBRTC_VIDEO_ENCODER_AV1_H_
#define REMOTING_CODEC_WEBRTC_VIDEO_ENCODER_AV1_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "remoting/codec/encoder_bitrate_filter.h"
#include "remoting/codec/video_encoder_active_map.h"
#include "remoting/codec/webrtc_video_encoder.h"
diff --git a/remoting/codec/webrtc_video_encoder_gpu.cc b/remoting/codec/webrtc_video_encoder_gpu.cc
index e0a7d34..bed164a 100644
--- a/remoting/codec/webrtc_video_encoder_gpu.cc
+++ b/remoting/codec/webrtc_video_encoder_gpu.cc
@@ -8,9 +8,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/flat_map.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/shared_memory_mapping.h"
diff --git a/remoting/codec/webrtc_video_encoder_vpx.cc b/remoting/codec/webrtc_video_encoder_vpx.cc
index 361142f..14edcd0f 100644
--- a/remoting/codec/webrtc_video_encoder_vpx.cc
+++ b/remoting/codec/webrtc_video_encoder_vpx.cc
@@ -7,9 +7,9 @@
#include <algorithm>
#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/logging.h"
#include "base/memory/ptr_util.h"
#include "base/system/sys_info.h"
diff --git a/remoting/codec/webrtc_video_encoder_vpx.h b/remoting/codec/webrtc_video_encoder_vpx.h
index 9c98cc0..a929705 100644
--- a/remoting/codec/webrtc_video_encoder_vpx.h
+++ b/remoting/codec/webrtc_video_encoder_vpx.h
@@ -7,7 +7,7 @@
#include <stdint.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/time/default_tick_clock.h"
#include "base/time/time.h"
diff --git a/remoting/host/action_message_handler.cc b/remoting/host/action_message_handler.cc
index 0319a3906..801e71b6 100644
--- a/remoting/host/action_message_handler.cc
+++ b/remoting/host/action_message_handler.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "remoting/base/compound_buffer.h"
#include "remoting/host/action_executor.h"
#include "remoting/proto/action.pb.h"
diff --git a/remoting/host/audio_capturer_mac.cc b/remoting/host/audio_capturer_mac.cc
index 6e158d0..5b26f278 100644
--- a/remoting/host/audio_capturer_mac.cc
+++ b/remoting/host/audio_capturer_mac.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/containers/flat_set.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/no_destructor.h"
#include "base/strings/sys_string_conversions.h"
diff --git a/remoting/host/backoff_timer.cc b/remoting/host/backoff_timer.cc
index e4046e7..f0199ab 100644
--- a/remoting/host/backoff_timer.cc
+++ b/remoting/host/backoff_timer.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
namespace remoting {
diff --git a/remoting/host/backoff_timer.h b/remoting/host/backoff_timer.h
index 0c8bcad..1621fe9 100644
--- a/remoting/host/backoff_timer.h
+++ b/remoting/host/backoff_timer.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/timer/timer.h"
#include "net/base/backoff_entry.h"
diff --git a/remoting/host/backoff_timer_unittest.cc b/remoting/host/backoff_timer_unittest.cc
index 87457854..c74f749df 100644
--- a/remoting/host/backoff_timer_unittest.cc
+++ b/remoting/host/backoff_timer_unittest.cc
@@ -4,7 +4,7 @@
#include "remoting/host/backoff_timer.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/test/task_environment.h"
#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/remoting/host/basic_desktop_environment.cc b/remoting/host/basic_desktop_environment.cc
index 597343d9..cf08626 100644
--- a/remoting/host/basic_desktop_environment.cc
+++ b/remoting/host/basic_desktop_environment.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/task/single_thread_task_runner.h"
#include "build/build_config.h"
#include "remoting/host/action_executor.h"
diff --git a/remoting/host/chromeos/ash_proxy.h b/remoting/host/chromeos/ash_proxy.h
index 2757363..501488a 100644
--- a/remoting/host/chromeos/ash_proxy.h
+++ b/remoting/host/chromeos/ash_proxy.h
@@ -8,7 +8,7 @@
#include <cstdint>
#include <vector>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "ui/display/display.h"
diff --git a/remoting/host/chromeos/aura_desktop_capturer.cc b/remoting/host/chromeos/aura_desktop_capturer.cc
index a4f96ef..c522c60f 100644
--- a/remoting/host/chromeos/aura_desktop_capturer.cc
+++ b/remoting/host/chromeos/aura_desktop_capturer.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/logging.h"
#include "base/metrics/histogram_functions.h"
#include "remoting/host/chromeos/ash_proxy.h"
diff --git a/remoting/host/chromeos/clipboard_aura_unittest.cc b/remoting/host/chromeos/clipboard_aura_unittest.cc
index 001a53c..ef1b357 100644
--- a/remoting/host/chromeos/clipboard_aura_unittest.cc
+++ b/remoting/host/chromeos/clipboard_aura_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/remoting/host/chromeos/message_box.h b/remoting/host/chromeos/message_box.h
index 79f2516..868bd386 100644
--- a/remoting/host/chromeos/message_box.h
+++ b/remoting/host/chromeos/message_box.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/threading/thread_checker.h"
#include "ui/base/ui_base_types.h"
diff --git a/remoting/host/chromeos/mouse_cursor_monitor_aura.cc b/remoting/host/chromeos/mouse_cursor_monitor_aura.cc
index 2924181a..02c0703f 100644
--- a/remoting/host/chromeos/mouse_cursor_monitor_aura.cc
+++ b/remoting/host/chromeos/mouse_cursor_monitor_aura.cc
@@ -7,8 +7,8 @@
#include <utility>
#include "ash/shell.h"
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "remoting/host/chromeos/skia_bitmap_desktop_frame.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/remoting/host/chromeos/remote_support_host_ash.h b/remoting/host/chromeos/remote_support_host_ash.h
index c6f3edb..dde2091 100644
--- a/remoting/host/chromeos/remote_support_host_ash.h
+++ b/remoting/host/chromeos/remote_support_host_ash.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_HOST_CHROMEOS_REMOTE_SUPPORT_HOST_ASH_H_
#define REMOTING_HOST_CHROMEOS_REMOTE_SUPPORT_HOST_ASH_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/sequence_checker.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/receiver_set.h"
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc
index 1d7bffa..11b50a5 100644
--- a/remoting/host/chromoting_host.cc
+++ b/remoting/host/chromoting_host.cc
@@ -9,9 +9,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/chromoting_host_context.cc b/remoting/host/chromoting_host_context.cc
index 7fa088d..b0c6fabb 100644
--- a/remoting/host/chromoting_host_context.cc
+++ b/remoting/host/chromoting_host_context.cc
@@ -4,8 +4,8 @@
#include "remoting/host/chromoting_host_context.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_pump_type.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/chromoting_host_services_client.h b/remoting/host/chromoting_host_services_client.h
index 9b28e59..a918613 100644
--- a/remoting/host/chromoting_host_services_client.h
+++ b/remoting/host/chromoting_host_services_client.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/sequence_checker.h"
#include "base/thread_annotations.h"
#include "build/build_config.h"
diff --git a/remoting/host/chromoting_host_services_client_unittest.cc b/remoting/host/chromoting_host_services_client_unittest.cc
index 6e7e7b72..93f984b2 100644
--- a/remoting/host/chromoting_host_services_client_unittest.cc
+++ b/remoting/host/chromoting_host_services_client_unittest.cc
@@ -7,10 +7,9 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/environment.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/run_loop.h"
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc
index 9f67138d..b873166 100644
--- a/remoting/host/chromoting_host_unittest.cc
+++ b/remoting/host/chromoting_host_unittest.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/remoting/host/client_session.cc b/remoting/host/client_session.cc
index 13fe9e3a..65f9d521 100644
--- a/remoting/host/client_session.cc
+++ b/remoting/host/client_session.cc
@@ -8,11 +8,11 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/containers/contains.h"
#include "base/containers/cxx20_erase_map.h"
#include "base/cxx17_backports.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/client_session_unittest.cc b/remoting/host/client_session_unittest.cc
index c040846..e839472 100644
--- a/remoting/host/client_session_unittest.cc
+++ b/remoting/host/client_session_unittest.cc
@@ -11,8 +11,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/remoting/host/clipboard.h b/remoting/host/clipboard.h
index c1a8add..e1194ef 100644
--- a/remoting/host/clipboard.h
+++ b/remoting/host/clipboard.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
namespace remoting {
diff --git a/remoting/host/clipboard_win.cc b/remoting/host/clipboard_win.cc
index 5252244..294adb2 100644
--- a/remoting/host/clipboard_win.cc
+++ b/remoting/host/clipboard_win.cc
@@ -9,7 +9,7 @@
#include <memory>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/strings/string_util.h"
diff --git a/remoting/host/clipboard_x11.cc b/remoting/host/clipboard_x11.cc
index a7232d0a..ee56c97 100644
--- a/remoting/host/clipboard_x11.cc
+++ b/remoting/host/clipboard_x11.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "remoting/host/linux/x_server_clipboard.h"
diff --git a/remoting/host/config_file_watcher.cc b/remoting/host/config_file_watcher.cc
index 143749bd..9a325029 100644
--- a/remoting/host/config_file_watcher.cc
+++ b/remoting/host/config_file_watcher.cc
@@ -7,10 +7,10 @@
#include <memory>
#include <string>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/files/file_path_watcher.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/memory/weak_ptr.h"
diff --git a/remoting/host/continue_window_chromeos.cc b/remoting/host/continue_window_chromeos.cc
index a6b6e7a..6ab18f2 100644
--- a/remoting/host/continue_window_chromeos.cc
+++ b/remoting/host/continue_window_chromeos.cc
@@ -6,7 +6,7 @@
#include "remoting/host/continue_window.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "remoting/base/string_resources.h"
#include "remoting/host/chromeos/message_box.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/remoting/host/continue_window_win.cc b/remoting/host/continue_window_win.cc
index 1d9f7ef..2fe2e51f 100644
--- a/remoting/host/continue_window_win.cc
+++ b/remoting/host/continue_window_win.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/location.h"
#include "base/logging.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/remoting/host/curtain_mode_mac.cc b/remoting/host/curtain_mode_mac.cc
index 360303c9..7cf6e60 100644
--- a/remoting/host/curtain_mode_mac.cc
+++ b/remoting/host/curtain_mode_mac.cc
@@ -9,7 +9,7 @@
#include <Security/Security.h>
#include <unistd.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/mac/scoped_cftyperef.h"
diff --git a/remoting/host/daemon_process.cc b/remoting/host/daemon_process.cc
index af35e46..1b93ed7 100644
--- a/remoting/host/daemon_process.cc
+++ b/remoting/host/daemon_process.cc
@@ -9,11 +9,11 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/daemon_process_unittest.cc b/remoting/host/daemon_process_unittest.cc
index c607db0..4b0d030 100644
--- a/remoting/host/daemon_process_unittest.cc
+++ b/remoting/host/daemon_process_unittest.cc
@@ -8,8 +8,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
diff --git a/remoting/host/daemon_process_win.cc b/remoting/host/daemon_process_win.cc
index 76ef541..c4c9b5b 100644
--- a/remoting/host/daemon_process_win.cc
+++ b/remoting/host/daemon_process_win.cc
@@ -11,9 +11,9 @@
#include <vector>
#include "base/base_switches.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
diff --git a/remoting/host/desktop_and_cursor_composer.h b/remoting/host/desktop_and_cursor_composer.h
index b1d03abe..4f48f34 100644
--- a/remoting/host/desktop_and_cursor_composer.h
+++ b/remoting/host/desktop_and_cursor_composer.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_HOST_DESKTOP_AND_CURSOR_COMPOSER_H_
#define REMOTING_HOST_DESKTOP_AND_CURSOR_COMPOSER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h"
namespace remoting {
diff --git a/remoting/host/desktop_and_cursor_conditional_composer.cc b/remoting/host/desktop_and_cursor_conditional_composer.cc
index b83aa3bc..3b8fb30 100644
--- a/remoting/host/desktop_and_cursor_conditional_composer.cc
+++ b/remoting/host/desktop_and_cursor_conditional_composer.cc
@@ -4,7 +4,7 @@
#include "remoting/host/desktop_and_cursor_conditional_composer.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
namespace remoting {
diff --git a/remoting/host/desktop_and_cursor_conditional_composer.h b/remoting/host/desktop_and_cursor_conditional_composer.h
index 9c5b96c..bc00af2 100644
--- a/remoting/host/desktop_and_cursor_conditional_composer.h
+++ b/remoting/host/desktop_and_cursor_conditional_composer.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "remoting/protocol/desktop_capturer.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_capture_metadata.h"
diff --git a/remoting/host/desktop_capturer_checker.cc b/remoting/host/desktop_capturer_checker.cc
index 1073e67..e99daeed 100644
--- a/remoting/host/desktop_capturer_checker.cc
+++ b/remoting/host/desktop_capturer_checker.cc
@@ -8,8 +8,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/desktop_capturer_checker.h b/remoting/host/desktop_capturer_checker.h
index 80e1ba3..3b351fbd 100644
--- a/remoting/host/desktop_capturer_checker.h
+++ b/remoting/host/desktop_capturer_checker.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
namespace remoting {
diff --git a/remoting/host/desktop_capturer_proxy.cc b/remoting/host/desktop_capturer_proxy.cc
index 43b752d..b371024 100644
--- a/remoting/host/desktop_capturer_proxy.cc
+++ b/remoting/host/desktop_capturer_proxy.cc
@@ -9,7 +9,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/remoting/host/desktop_capturer_proxy.h b/remoting/host/desktop_capturer_proxy.h
index 5f3de7b..e9f3f473 100644
--- a/remoting/host/desktop_capturer_proxy.h
+++ b/remoting/host/desktop_capturer_proxy.h
@@ -13,7 +13,7 @@
#include "remoting/protocol/desktop_capturer.h"
#if defined(WEBRTC_USE_GIO)
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_capture_metadata.h"
#endif
diff --git a/remoting/host/desktop_display_info_monitor.cc b/remoting/host/desktop_display_info_monitor.cc
index 21d6943..f544a39a 100644
--- a/remoting/host/desktop_display_info_monitor.cc
+++ b/remoting/host/desktop_display_info_monitor.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "base/time/time.h"
#include "remoting/base/logging.h"
diff --git a/remoting/host/desktop_display_info_monitor.h b/remoting/host/desktop_display_info_monitor.h
index 50d4d54..7981ec5 100644
--- a/remoting/host/desktop_display_info_monitor.h
+++ b/remoting/host/desktop_display_info_monitor.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback.h"
#include "base/callback_list.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/remoting/host/desktop_environment.h b/remoting/host/desktop_environment.h
index e8cdf64a..64875ed 100644
--- a/remoting/host/desktop_environment.h
+++ b/remoting/host/desktop_environment.h
@@ -9,7 +9,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/weak_ptr.h"
#include "remoting/host/base/desktop_environment_options.h"
#include "remoting/protocol/desktop_capturer.h"
diff --git a/remoting/host/desktop_process.cc b/remoting/host/desktop_process.cc
index 813680c..900b41f2 100644
--- a/remoting/host/desktop_process.cc
+++ b/remoting/host/desktop_process.cc
@@ -9,8 +9,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/message_loop/message_pump_type.h"
diff --git a/remoting/host/desktop_process_main.cc b/remoting/host/desktop_process_main.cc
index 3cfb3be..fd46e404 100644
--- a/remoting/host/desktop_process_main.cc
+++ b/remoting/host/desktop_process_main.cc
@@ -8,9 +8,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/message_loop/message_pump_type.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_executor.h"
diff --git a/remoting/host/desktop_process_unittest.cc b/remoting/host/desktop_process_unittest.cc
index 7fa433f3..a47a831 100644
--- a/remoting/host/desktop_process_unittest.cc
+++ b/remoting/host/desktop_process_unittest.cc
@@ -9,8 +9,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/ref_counted.h"
#include "base/message_loop/message_pump_type.h"
diff --git a/remoting/host/desktop_session_agent.cc b/remoting/host/desktop_session_agent.cc
index 2be9f7ac..57e965f 100644
--- a/remoting/host/desktop_session_agent.cc
+++ b/remoting/host/desktop_session_agent.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/location.h"
#include "base/logging.h"
#include "base/memory/platform_shared_memory_region.h"
diff --git a/remoting/host/desktop_session_agent.h b/remoting/host/desktop_session_agent.h
index 0a06e67b..bf71e19 100644
--- a/remoting/host/desktop_session_agent.h
+++ b/remoting/host/desktop_session_agent.h
@@ -11,8 +11,8 @@
#include <map>
#include <memory>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/memory/read_only_shared_memory_region.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
diff --git a/remoting/host/desktop_session_agent_unittest.cc b/remoting/host/desktop_session_agent_unittest.cc
index 3dac6d5..0c4b2e3 100644
--- a/remoting/host/desktop_session_agent_unittest.cc
+++ b/remoting/host/desktop_session_agent_unittest.cc
@@ -6,9 +6,9 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
diff --git a/remoting/host/desktop_session_proxy.cc b/remoting/host/desktop_session_proxy.cc
index 5c6f000..6e9ace8 100644
--- a/remoting/host/desktop_session_proxy.cc
+++ b/remoting/host/desktop_session_proxy.cc
@@ -9,8 +9,8 @@
#include <memory>
#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/memory/ptr_util.h"
diff --git a/remoting/host/desktop_session_proxy.h b/remoting/host/desktop_session_proxy.h
index bd4a780..7e4f531 100644
--- a/remoting/host/desktop_session_proxy.h
+++ b/remoting/host/desktop_session_proxy.h
@@ -10,8 +10,8 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
#include "base/callback_list.h"
+#include "base/functional/callback.h"
#include "base/memory/read_only_shared_memory_region.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
diff --git a/remoting/host/disconnect_window_chromeos.cc b/remoting/host/disconnect_window_chromeos.cc
index b29c017..3ce65b3 100644
--- a/remoting/host/disconnect_window_chromeos.cc
+++ b/remoting/host/disconnect_window_chromeos.cc
@@ -7,7 +7,7 @@
#include "ash/shell.h"
#include "ash/system/tray/system_tray_notifier.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "remoting/host/client_session_control.h"
#include "remoting/host/host_window.h"
diff --git a/remoting/host/disconnect_window_mac.h b/remoting/host/disconnect_window_mac.h
index e76f17ae..a9e4c05 100644
--- a/remoting/host/disconnect_window_mac.h
+++ b/remoting/host/disconnect_window_mac.h
@@ -9,7 +9,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/strings/utf_string_conversions.h"
// Controller for the disconnect window which allows the host user to
diff --git a/remoting/host/disconnect_window_mac.mm b/remoting/host/disconnect_window_mac.mm
index 3480536..34a0fd8 100644
--- a/remoting/host/disconnect_window_mac.mm
+++ b/remoting/host/disconnect_window_mac.mm
@@ -8,8 +8,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/i18n/rtl.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/string_util.h"
diff --git a/remoting/host/disconnect_window_win.cc b/remoting/host/disconnect_window_win.cc
index e1f00b1..e0889c3c 100644
--- a/remoting/host/disconnect_window_win.cc
+++ b/remoting/host/disconnect_window_win.cc
@@ -8,8 +8,8 @@
#include <cstdlib>
#include <memory>
-#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/weak_ptr.h"
diff --git a/remoting/host/file_transfer/buffered_file_writer.cc b/remoting/host/file_transfer/buffered_file_writer.cc
index d7ec614..755e544 100644
--- a/remoting/host/file_transfer/buffered_file_writer.cc
+++ b/remoting/host/file_transfer/buffered_file_writer.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "remoting/host/file_transfer/buffered_file_writer.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include <utility>
diff --git a/remoting/host/file_transfer/buffered_file_writer.h b/remoting/host/file_transfer/buffered_file_writer.h
index a6cbc55a..57353100 100644
--- a/remoting/host/file_transfer/buffered_file_writer.h
+++ b/remoting/host/file_transfer/buffered_file_writer.h
@@ -9,10 +9,10 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_forward.h"
#include "base/containers/queue.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_forward.h"
#include "remoting/host/file_transfer/file_operations.h"
#include "remoting/proto/file_transfer.pb.h"
diff --git a/remoting/host/file_transfer/buffered_file_writer_unittest.cc b/remoting/host/file_transfer/buffered_file_writer_unittest.cc
index 20efc24..0a269d1 100644
--- a/remoting/host/file_transfer/buffered_file_writer_unittest.cc
+++ b/remoting/host/file_transfer/buffered_file_writer_unittest.cc
@@ -4,7 +4,7 @@
#include "remoting/host/file_transfer/buffered_file_writer.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/test/task_environment.h"
#include "remoting/host/file_transfer/fake_file_operations.h"
#include "remoting/host/file_transfer/test_byte_vector_utils.h"
diff --git a/remoting/host/file_transfer/fake_file_chooser.cc b/remoting/host/file_transfer/fake_file_chooser.cc
index bc8643e..a2902368 100644
--- a/remoting/host/file_transfer/fake_file_chooser.cc
+++ b/remoting/host/file_transfer/fake_file_chooser.cc
@@ -4,7 +4,7 @@
#include "remoting/host/file_transfer/fake_file_chooser.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/no_destructor.h"
#include "base/task/sequenced_task_runner.h"
#include "remoting/protocol/file_transfer_helpers.h"
diff --git a/remoting/host/file_transfer/fake_file_operations.cc b/remoting/host/file_transfer/fake_file_operations.cc
index b17cc13c5..cbd2690 100644
--- a/remoting/host/file_transfer/fake_file_operations.cc
+++ b/remoting/host/file_transfer/fake_file_operations.cc
@@ -8,7 +8,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/remoting/host/file_transfer/file_chooser.h b/remoting/host/file_transfer/file_chooser.h
index 69872f055..86a7109e 100644
--- a/remoting/host/file_transfer/file_chooser.h
+++ b/remoting/host/file_transfer/file_chooser.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/functional/callback.h"
#include "base/task/sequenced_task_runner.h"
#include "remoting/protocol/file_transfer_helpers.h"
diff --git a/remoting/host/file_transfer/file_chooser_linux.cc b/remoting/host/file_transfer/file_chooser_linux.cc
index 6e80e15..881cd5dd 100644
--- a/remoting/host/file_transfer/file_chooser_linux.cc
+++ b/remoting/host/file_transfer/file_chooser_linux.cc
@@ -8,7 +8,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner.h"
#include "base/threading/sequence_bound.h"
diff --git a/remoting/host/file_transfer/file_chooser_mac.mm b/remoting/host/file_transfer/file_chooser_mac.mm
index c1d1174..8f2f603e 100644
--- a/remoting/host/file_transfer/file_chooser_mac.mm
+++ b/remoting/host/file_transfer/file_chooser_mac.mm
@@ -8,7 +8,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/mac/foundation_util.h"
#include "base/mac/scoped_nsobject.h"
#include "base/memory/weak_ptr.h"
diff --git a/remoting/host/file_transfer/file_chooser_main_win.cc b/remoting/host/file_transfer/file_chooser_main_win.cc
index 5a8b0bc..e3cef0b2 100644
--- a/remoting/host/file_transfer/file_chooser_main_win.cc
+++ b/remoting/host/file_transfer/file_chooser_main_win.cc
@@ -9,8 +9,8 @@
#include <cstdio>
#include <cstdlib>
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/scoped_refptr.h"
#include "base/run_loop.h"
diff --git a/remoting/host/file_transfer/file_chooser_win.cc b/remoting/host/file_transfer/file_chooser_win.cc
index 6d96097..25c39857 100644
--- a/remoting/host/file_transfer/file_chooser_win.cc
+++ b/remoting/host/file_transfer/file_chooser_win.cc
@@ -11,8 +11,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/path_service.h"
#include "base/process/launch.h"
diff --git a/remoting/host/file_transfer/file_operations.h b/remoting/host/file_transfer/file_operations.h
index e1dc755..8eab95b 100644
--- a/remoting/host/file_transfer/file_operations.h
+++ b/remoting/host/file_transfer/file_operations.h
@@ -10,7 +10,7 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "remoting/protocol/file_transfer_helpers.h"
namespace base {
diff --git a/remoting/host/file_transfer/file_transfer_message_handler.cc b/remoting/host/file_transfer/file_transfer_message_handler.cc
index fef09ed..f2f8114 100644
--- a/remoting/host/file_transfer/file_transfer_message_handler.cc
+++ b/remoting/host/file_transfer/file_transfer_message_handler.cc
@@ -7,8 +7,8 @@
#include <cstddef>
#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/path_service.h"
#include "net/base/filename_util.h"
diff --git a/remoting/host/file_transfer/file_transfer_message_handler_unittest.cc b/remoting/host/file_transfer/file_transfer_message_handler_unittest.cc
index be50720f..67582d5 100644
--- a/remoting/host/file_transfer/file_transfer_message_handler_unittest.cc
+++ b/remoting/host/file_transfer/file_transfer_message_handler_unittest.cc
@@ -9,8 +9,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/containers/queue.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/test/task_environment.h"
#include "net/base/io_buffer.h"
diff --git a/remoting/host/file_transfer/ipc_file_operations.cc b/remoting/host/file_transfer/ipc_file_operations.cc
index ff25fa8c..78f36ad 100644
--- a/remoting/host/file_transfer/ipc_file_operations.cc
+++ b/remoting/host/file_transfer/ipc_file_operations.cc
@@ -8,8 +8,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
diff --git a/remoting/host/file_transfer/ipc_file_operations.h b/remoting/host/file_transfer/ipc_file_operations.h
index 5f4f70b..60afb46 100644
--- a/remoting/host/file_transfer/ipc_file_operations.h
+++ b/remoting/host/file_transfer/ipc_file_operations.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "remoting/host/file_transfer/file_operations.h"
#include "remoting/host/mojom/desktop_session.mojom.h"
diff --git a/remoting/host/file_transfer/ipc_file_operations_unittest.cc b/remoting/host/file_transfer/ipc_file_operations_unittest.cc
index 15d0ced..9bbe2d5 100644
--- a/remoting/host/file_transfer/ipc_file_operations_unittest.cc
+++ b/remoting/host/file_transfer/ipc_file_operations_unittest.cc
@@ -10,10 +10,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/callback_list.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/path_service.h"
#include "base/task/sequenced_task_runner.h"
#include "base/test/bind.h"
diff --git a/remoting/host/file_transfer/local_file_operations.cc b/remoting/host/file_transfer/local_file_operations.cc
index f54167f3..699674d 100644
--- a/remoting/host/file_transfer/local_file_operations.cc
+++ b/remoting/host/file_transfer/local_file_operations.cc
@@ -6,9 +6,9 @@
#include <cstdint>
-#include "base/bind.h"
#include "base/files/file_proxy.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/path_service.h"
diff --git a/remoting/host/file_transfer/local_file_operations_unittest.cc b/remoting/host/file_transfer/local_file_operations_unittest.cc
index 69b0d25..466ff0d 100644
--- a/remoting/host/file_transfer/local_file_operations_unittest.cc
+++ b/remoting/host/file_transfer/local_file_operations_unittest.cc
@@ -4,10 +4,10 @@
#include "remoting/host/file_transfer/local_file_operations.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/containers/queue.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/path_service.h"
#include "base/test/scoped_path_override.h"
#include "base/test/task_environment.h"
diff --git a/remoting/host/file_transfer/rtc_log_file_operations.cc b/remoting/host/file_transfer/rtc_log_file_operations.cc
index d517424de..ad8c47c 100644
--- a/remoting/host/file_transfer/rtc_log_file_operations.cc
+++ b/remoting/host/file_transfer/rtc_log_file_operations.cc
@@ -6,8 +6,8 @@
#include <algorithm>
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/notreached.h"
diff --git a/remoting/host/file_transfer/session_file_operations_handler.cc b/remoting/host/file_transfer/session_file_operations_handler.cc
index d587846..1bc7b8a 100644
--- a/remoting/host/file_transfer/session_file_operations_handler.cc
+++ b/remoting/host/file_transfer/session_file_operations_handler.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/memory/weak_ptr.h"
#include "remoting/host/mojom/desktop_session.mojom.h"
#include "remoting/protocol/file_transfer_helpers.h"
diff --git a/remoting/host/ftl_echo_message_listener_unittest.cc b/remoting/host/ftl_echo_message_listener_unittest.cc
index 20b39b8..56c9c79 100644
--- a/remoting/host/ftl_echo_message_listener_unittest.cc
+++ b/remoting/host/ftl_echo_message_listener_unittest.cc
@@ -4,7 +4,7 @@
#include "remoting/host/ftl_echo_message_listener.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "remoting/proto/ftl/v1/chromoting_message.pb.h"
diff --git a/remoting/host/ftl_host_change_notification_listener.cc b/remoting/host/ftl_host_change_notification_listener.cc
index f1c700c..d4b88bf1 100644
--- a/remoting/host/ftl_host_change_notification_listener.cc
+++ b/remoting/host/ftl_host_change_notification_listener.cc
@@ -4,7 +4,7 @@
#include "remoting/host/ftl_host_change_notification_listener.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/remoting/host/ftl_host_change_notification_listener_unittest.cc b/remoting/host/ftl_host_change_notification_listener_unittest.cc
index 9540626..ddf76963 100644
--- a/remoting/host/ftl_host_change_notification_listener_unittest.cc
+++ b/remoting/host/ftl_host_change_notification_listener_unittest.cc
@@ -6,7 +6,7 @@
#include <set>
-#include "base/bind.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/remoting/host/ftl_signaling_connector.cc b/remoting/host/ftl_signaling_connector.cc
index 91fb25b..1a9e74f 100644
--- a/remoting/host/ftl_signaling_connector.cc
+++ b/remoting/host/ftl_signaling_connector.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/strings/string_util.h"
#include "google_apis/google_api_keys.h"
#include "net/url_request/url_request_context_getter.h"
diff --git a/remoting/host/heartbeat_sender.cc b/remoting/host/heartbeat_sender.cc
index 20e61cc..16a30e0 100644
--- a/remoting/host/heartbeat_sender.cc
+++ b/remoting/host/heartbeat_sender.cc
@@ -9,7 +9,7 @@
#include <cstdint>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/rand_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringize_macros.h"
diff --git a/remoting/host/heartbeat_sender.h b/remoting/host/heartbeat_sender.h
index 2a55428..3755179 100644
--- a/remoting/host/heartbeat_sender.h
+++ b/remoting/host/heartbeat_sender.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/sequence_checker.h"
diff --git a/remoting/host/host_experiment_session_plugin_unittest.cc b/remoting/host/host_experiment_session_plugin_unittest.cc
index 715995d..9286f95 100644
--- a/remoting/host/host_experiment_session_plugin_unittest.cc
+++ b/remoting/host/host_experiment_session_plugin_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "remoting/base/constants.h"
#include "remoting/host/host_attributes.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/remoting/host/host_status_logger.cc b/remoting/host/host_status_logger.cc
index 06bddd1..5181cf2 100644
--- a/remoting/host/host_status_logger.cc
+++ b/remoting/host/host_status_logger.cc
@@ -4,7 +4,7 @@
#include "remoting/host/host_status_logger.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "remoting/base/constants.h"
#include "remoting/host/host_status_monitor.h"
#include "remoting/host/server_log_entry_host.h"
diff --git a/remoting/host/host_window_proxy.cc b/remoting/host/host_window_proxy.cc
index 645ebf5b..4d40251 100644
--- a/remoting/host/host_window_proxy.cc
+++ b/remoting/host/host_window_proxy.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/notreached.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/input_injector_chromeos.cc b/remoting/host/input_injector_chromeos.cc
index fafbce4..5b1bfee 100644
--- a/remoting/host/input_injector_chromeos.cc
+++ b/remoting/host/input_injector_chromeos.cc
@@ -11,8 +11,8 @@
#include "ash/display/window_tree_host_manager.h"
#include "ash/shell.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/i18n/icu_string_conversions.h"
#include "base/location.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/remoting/host/input_injector_mac.cc b/remoting/host/input_injector_mac.cc
index 83de2f99..c47b6e8 100644
--- a/remoting/host/input_injector_mac.cc
+++ b/remoting/host/input_injector_mac.cc
@@ -12,8 +12,8 @@
#include <algorithm>
#include <utility>
-#include "base/bind.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/i18n/break_iterator.h"
#include "base/location.h"
#include "base/logging.h"
diff --git a/remoting/host/input_injector_win.cc b/remoting/host/input_injector_win.cc
index fc8e9dab..871ad85 100644
--- a/remoting/host/input_injector_win.cc
+++ b/remoting/host/input_injector_win.cc
@@ -11,9 +11,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/cxx17_backports.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/remoting/host/input_injector_x11.cc b/remoting/host/input_injector_x11.cc
index 88938e9..8b82052 100644
--- a/remoting/host/input_injector_x11.cc
+++ b/remoting/host/input_injector_x11.cc
@@ -8,8 +8,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/strings/utf_string_conversion_utils.h"
diff --git a/remoting/host/input_injector_x11.h b/remoting/host/input_injector_x11.h
index 6985bd7..4d90e3b 100644
--- a/remoting/host/input_injector_x11.h
+++ b/remoting/host/input_injector_x11.h
@@ -11,8 +11,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/task/single_thread_task_runner.h"
diff --git a/remoting/host/input_monitor/local_hotkey_input_monitor.h b/remoting/host/input_monitor/local_hotkey_input_monitor.h
index 76a49465..432561e0 100644
--- a/remoting/host/input_monitor/local_hotkey_input_monitor.h
+++ b/remoting/host/input_monitor/local_hotkey_input_monitor.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/remoting/host/input_monitor/local_hotkey_input_monitor_chromeos.cc b/remoting/host/input_monitor/local_hotkey_input_monitor_chromeos.cc
index 24af6256d..2284c02 100644
--- a/remoting/host/input_monitor/local_hotkey_input_monitor_chromeos.cc
+++ b/remoting/host/input_monitor/local_hotkey_input_monitor_chromeos.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/location.h"
#include "base/task/single_thread_task_runner.h"
#include "ui/events/event.h"
diff --git a/remoting/host/input_monitor/local_hotkey_input_monitor_mac.mm b/remoting/host/input_monitor/local_hotkey_input_monitor_mac.mm
index d0aefaff..48317f9 100644
--- a/remoting/host/input_monitor/local_hotkey_input_monitor_mac.mm
+++ b/remoting/host/input_monitor/local_hotkey_input_monitor_mac.mm
@@ -12,9 +12,9 @@
#include <cstdint>
#include <utility>
-#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/location.h"
#include "base/logging.h"
#include "base/mac/scoped_cftyperef.h"
diff --git a/remoting/host/input_monitor/local_hotkey_input_monitor_win.cc b/remoting/host/input_monitor/local_hotkey_input_monitor_win.cc
index dc449e8..82662c4 100644
--- a/remoting/host/input_monitor/local_hotkey_input_monitor_win.cc
+++ b/remoting/host/input_monitor/local_hotkey_input_monitor_win.cc
@@ -4,7 +4,7 @@
#include "remoting/host/input_monitor/local_hotkey_input_monitor.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/task/single_thread_task_runner.h"
namespace remoting {
diff --git a/remoting/host/input_monitor/local_hotkey_input_monitor_x11.cc b/remoting/host/input_monitor/local_hotkey_input_monitor_x11.cc
index 49fffda..74ec6fc 100644
--- a/remoting/host/input_monitor/local_hotkey_input_monitor_x11.cc
+++ b/remoting/host/input_monitor/local_hotkey_input_monitor_x11.cc
@@ -9,9 +9,9 @@
#include <utility>
-#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/location.h"
#include "base/logging.h"
#include "remoting/host/input_monitor/local_input_monitor_x11_common.h"
diff --git a/remoting/host/input_monitor/local_input_monitor.cc b/remoting/host/input_monitor/local_input_monitor.cc
index 6b5cb53..ff2f696a 100644
--- a/remoting/host/input_monitor/local_input_monitor.cc
+++ b/remoting/host/input_monitor/local_input_monitor.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "base/task/single_thread_task_runner.h"
#include "remoting/host/client_session_control.h"
diff --git a/remoting/host/input_monitor/local_input_monitor.h b/remoting/host/input_monitor/local_input_monitor.h
index c1eda1b..ad1b955 100644
--- a/remoting/host/input_monitor/local_input_monitor.h
+++ b/remoting/host/input_monitor/local_input_monitor.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "ui/events/event.h"
diff --git a/remoting/host/input_monitor/local_input_monitor_unittest.cc b/remoting/host/input_monitor/local_input_monitor_unittest.cc
index 3d00c89..1ed9ace 100644
--- a/remoting/host/input_monitor/local_input_monitor_unittest.cc
+++ b/remoting/host/input_monitor/local_input_monitor_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/task_environment.h"
diff --git a/remoting/host/input_monitor/local_input_monitor_win.cc b/remoting/host/input_monitor/local_input_monitor_win.cc
index b90cae7..8ac169c 100644
--- a/remoting/host/input_monitor/local_input_monitor_win.cc
+++ b/remoting/host/input_monitor/local_input_monitor_win.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/location.h"
#include "base/logging.h"
#include "base/sequence_checker.h"
diff --git a/remoting/host/input_monitor/local_input_monitor_win.h b/remoting/host/input_monitor/local_input_monitor_win.h
index 7dcb88cc4..3cccab2b 100644
--- a/remoting/host/input_monitor/local_input_monitor_win.h
+++ b/remoting/host/input_monitor/local_input_monitor_win.h
@@ -9,7 +9,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/remoting/host/input_monitor/local_keyboard_input_monitor.h b/remoting/host/input_monitor/local_keyboard_input_monitor.h
index fffcf5db..6bb27c1 100644
--- a/remoting/host/input_monitor/local_keyboard_input_monitor.h
+++ b/remoting/host/input_monitor/local_keyboard_input_monitor.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "remoting/host/input_monitor/local_input_monitor.h"
diff --git a/remoting/host/input_monitor/local_keyboard_input_monitor_chromeos.cc b/remoting/host/input_monitor/local_keyboard_input_monitor_chromeos.cc
index 69ad08669..96b6106 100644
--- a/remoting/host/input_monitor/local_keyboard_input_monitor_chromeos.cc
+++ b/remoting/host/input_monitor/local_keyboard_input_monitor_chromeos.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/location.h"
#include "base/task/single_thread_task_runner.h"
#include "remoting/host/chromeos/point_transformer.h"
diff --git a/remoting/host/input_monitor/local_keyboard_input_monitor_mac.mm b/remoting/host/input_monitor/local_keyboard_input_monitor_mac.mm
index 38ad971..be37d37 100644
--- a/remoting/host/input_monitor/local_keyboard_input_monitor_mac.mm
+++ b/remoting/host/input_monitor/local_keyboard_input_monitor_mac.mm
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#import "base/task/single_thread_task_runner.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/input_monitor/local_keyboard_input_monitor_win.cc b/remoting/host/input_monitor/local_keyboard_input_monitor_win.cc
index 5b1b3ed..23c3d4b 100644
--- a/remoting/host/input_monitor/local_keyboard_input_monitor_win.cc
+++ b/remoting/host/input_monitor/local_keyboard_input_monitor_win.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/location.h"
#include "base/logging.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/input_monitor/local_keyboard_input_monitor_x11.cc b/remoting/host/input_monitor/local_keyboard_input_monitor_x11.cc
index 0beed499..0955acda 100644
--- a/remoting/host/input_monitor/local_keyboard_input_monitor_x11.cc
+++ b/remoting/host/input_monitor/local_keyboard_input_monitor_x11.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/task/single_thread_task_runner.h"
namespace remoting {
diff --git a/remoting/host/input_monitor/local_mouse_input_monitor_mac.mm b/remoting/host/input_monitor/local_mouse_input_monitor_mac.mm
index 91d8255..fa88acc 100644
--- a/remoting/host/input_monitor/local_mouse_input_monitor_mac.mm
+++ b/remoting/host/input_monitor/local_mouse_input_monitor_mac.mm
@@ -9,8 +9,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/mac/scoped_cftyperef.h"
diff --git a/remoting/host/input_monitor/local_mouse_input_monitor_win.cc b/remoting/host/input_monitor/local_mouse_input_monitor_win.cc
index 82f71f65..62e47a5 100644
--- a/remoting/host/input_monitor/local_mouse_input_monitor_win.cc
+++ b/remoting/host/input_monitor/local_mouse_input_monitor_win.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/location.h"
#include "base/logging.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/input_monitor/local_mouse_input_monitor_x11.cc b/remoting/host/input_monitor/local_mouse_input_monitor_x11.cc
index 408171d3..d9c7899 100644
--- a/remoting/host/input_monitor/local_mouse_input_monitor_x11.cc
+++ b/remoting/host/input_monitor/local_mouse_input_monitor_x11.cc
@@ -9,9 +9,9 @@
#include <utility>
-#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/location.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
diff --git a/remoting/host/input_monitor/local_pointer_input_monitor.h b/remoting/host/input_monitor/local_pointer_input_monitor.h
index 1265b96..414bb5e 100644
--- a/remoting/host/input_monitor/local_pointer_input_monitor.h
+++ b/remoting/host/input_monitor/local_pointer_input_monitor.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "remoting/host/input_monitor/local_input_monitor.h"
diff --git a/remoting/host/input_monitor/local_pointer_input_monitor_chromeos.cc b/remoting/host/input_monitor/local_pointer_input_monitor_chromeos.cc
index 3fa288a..1d322045 100644
--- a/remoting/host/input_monitor/local_pointer_input_monitor_chromeos.cc
+++ b/remoting/host/input_monitor/local_pointer_input_monitor_chromeos.cc
@@ -8,8 +8,8 @@
#include <utility>
#include "ash/shell.h"
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
#include "remoting/host/chromeos/point_transformer.h"
diff --git a/remoting/host/ipc_desktop_environment.cc b/remoting/host/ipc_desktop_environment.cc
index ff572f56..897f1bf 100644
--- a/remoting/host/ipc_desktop_environment.cc
+++ b/remoting/host/ipc_desktop_environment.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/process/process_handle.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/ipc_desktop_environment.h b/remoting/host/ipc_desktop_environment.h
index 1068969..17d4b03 100644
--- a/remoting/host/ipc_desktop_environment.h
+++ b/remoting/host/ipc_desktop_environment.h
@@ -10,7 +10,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "mojo/public/cpp/bindings/associated_receiver.h"
diff --git a/remoting/host/ipc_desktop_environment_unittest.cc b/remoting/host/ipc_desktop_environment_unittest.cc
index 9eb0953..5e9020cd 100644
--- a/remoting/host/ipc_desktop_environment_unittest.cc
+++ b/remoting/host/ipc_desktop_environment_unittest.cc
@@ -9,9 +9,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/memory/weak_ptr.h"
diff --git a/remoting/host/ipc_keyboard_layout_monitor.h b/remoting/host/ipc_keyboard_layout_monitor.h
index 2103390..f4caffb 100644
--- a/remoting/host/ipc_keyboard_layout_monitor.h
+++ b/remoting/host/ipc_keyboard_layout_monitor.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_HOST_IPC_KEYBOARD_LAYOUT_MONITOR_H_
#define REMOTING_HOST_IPC_KEYBOARD_LAYOUT_MONITOR_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "remoting/host/keyboard_layout_monitor.h"
diff --git a/remoting/host/ipc_url_forwarder_configurator.h b/remoting/host/ipc_url_forwarder_configurator.h
index 1cb4b06..d6795c9 100644
--- a/remoting/host/ipc_url_forwarder_configurator.h
+++ b/remoting/host/ipc_url_forwarder_configurator.h
@@ -7,7 +7,7 @@
#include "remoting/host/remote_open_url/url_forwarder_configurator.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
namespace remoting {
diff --git a/remoting/host/it2me/it2me_confirmation_dialog.h b/remoting/host/it2me/it2me_confirmation_dialog.h
index e439d5b..c78ca27 100644
--- a/remoting/host/it2me/it2me_confirmation_dialog.h
+++ b/remoting/host/it2me/it2me_confirmation_dialog.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
namespace remoting {
diff --git a/remoting/host/it2me/it2me_confirmation_dialog_chromeos.cc b/remoting/host/it2me/it2me_confirmation_dialog_chromeos.cc
index ce397ea9..471ca27 100644
--- a/remoting/host/it2me/it2me_confirmation_dialog_chromeos.cc
+++ b/remoting/host/it2me/it2me_confirmation_dialog_chromeos.cc
@@ -8,8 +8,8 @@
#include "ash/constants/notifier_catalogs.h"
#include "ash/public/cpp/notification_utils.h"
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/i18n/message_formatter.h"
#include "base/strings/utf_string_conversions.h"
#include "chromeos/ui/vector_icons/vector_icons.h"
diff --git a/remoting/host/it2me/it2me_confirmation_dialog_linux.cc b/remoting/host/it2me/it2me_confirmation_dialog_linux.cc
index 9ee7bcdb..8a7eadc 100644
--- a/remoting/host/it2me/it2me_confirmation_dialog_linux.cc
+++ b/remoting/host/it2me/it2me_confirmation_dialog_linux.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/i18n/message_formatter.h"
#include "base/location.h"
#include "base/logging.h"
diff --git a/remoting/host/it2me/it2me_confirmation_dialog_mac.mm b/remoting/host/it2me/it2me_confirmation_dialog_mac.mm
index 00abd9f..27170d9 100644
--- a/remoting/host/it2me/it2me_confirmation_dialog_mac.mm
+++ b/remoting/host/it2me/it2me_confirmation_dialog_mac.mm
@@ -10,8 +10,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/i18n/message_formatter.h"
#include "base/location.h"
#include "base/mac/scoped_nsobject.h"
diff --git a/remoting/host/it2me/it2me_confirmation_dialog_proxy.cc b/remoting/host/it2me/it2me_confirmation_dialog_proxy.cc
index 2a6896175..35e5c0d 100644
--- a/remoting/host/it2me/it2me_confirmation_dialog_proxy.cc
+++ b/remoting/host/it2me/it2me_confirmation_dialog_proxy.cc
@@ -7,7 +7,7 @@
#include <memory>
#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/remoting/host/it2me/it2me_confirmation_dialog_proxy.h b/remoting/host/it2me/it2me_confirmation_dialog_proxy.h
index f4e9113..36c9554 100644
--- a/remoting/host/it2me/it2me_confirmation_dialog_proxy.h
+++ b/remoting/host/it2me/it2me_confirmation_dialog_proxy.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_HOST_IT2ME_IT2ME_CONFIRMATION_DIALOG_PROXY_H_
#define REMOTING_HOST_IT2ME_IT2ME_CONFIRMATION_DIALOG_PROXY_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc b/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc
index 45792b11..013a5093 100644
--- a/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc
+++ b/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
diff --git a/remoting/host/it2me/it2me_confirmation_dialog_win.cc b/remoting/host/it2me/it2me_confirmation_dialog_win.cc
index c5e052e..94b3526 100644
--- a/remoting/host/it2me/it2me_confirmation_dialog_win.cc
+++ b/remoting/host/it2me/it2me_confirmation_dialog_win.cc
@@ -9,9 +9,9 @@
#include <memory>
#include <string>
-#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/i18n/message_formatter.h"
#include "base/logging.h"
#include "base/strings/string_util.h"
diff --git a/remoting/host/it2me/it2me_host.cc b/remoting/host/it2me/it2me_host.cc
index 23fba86..5c4716f 100644
--- a/remoting/host/it2me/it2me_host.cc
+++ b/remoting/host/it2me/it2me_host.cc
@@ -9,8 +9,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/strings/string_util.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
diff --git a/remoting/host/it2me/it2me_host_unittest.cc b/remoting/host/it2me/it2me_host_unittest.cc
index c702baa..27dc6b0 100644
--- a/remoting/host/it2me/it2me_host_unittest.cc
+++ b/remoting/host/it2me/it2me_host_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/location.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
diff --git a/remoting/host/it2me/it2me_native_messaging_host.cc b/remoting/host/it2me/it2me_native_messaging_host.cc
index 031bf32..bc5788e 100644
--- a/remoting/host/it2me/it2me_native_messaging_host.cc
+++ b/remoting/host/it2me/it2me_native_messaging_host.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/json/json_writer.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
diff --git a/remoting/host/it2me/it2me_native_messaging_host_ash.cc b/remoting/host/it2me/it2me_native_messaging_host_ash.cc
index 31554a0b..b734169 100644
--- a/remoting/host/it2me/it2me_native_messaging_host_ash.cc
+++ b/remoting/host/it2me/it2me_native_messaging_host_ash.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/callback.h"
#include "base/feature_list.h"
+#include "base/functional/callback.h"
#include "base/json/json_writer.h"
#include "base/time/time.h"
#include "base/values.h"
diff --git a/remoting/host/it2me/it2me_native_messaging_host_lacros.cc b/remoting/host/it2me/it2me_native_messaging_host_lacros.cc
index 9900746..dd262fe 100644
--- a/remoting/host/it2me/it2me_native_messaging_host_lacros.cc
+++ b/remoting/host/it2me/it2me_native_messaging_host_lacros.cc
@@ -11,7 +11,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/memory/raw_ptr.h"
diff --git a/remoting/host/it2me/it2me_native_messaging_host_unittest.cc b/remoting/host/it2me/it2me_native_messaging_host_unittest.cc
index 7b741953..a5b27e3 100644
--- a/remoting/host/it2me/it2me_native_messaging_host_unittest.cc
+++ b/remoting/host/it2me/it2me_native_messaging_host_unittest.cc
@@ -9,8 +9,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/location.h"
diff --git a/remoting/host/keyboard_layout_monitor.h b/remoting/host/keyboard_layout_monitor.h
index 3c230c9..65160a5 100644
--- a/remoting/host/keyboard_layout_monitor.h
+++ b/remoting/host/keyboard_layout_monitor.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback_forward.h"
#include "base/containers/span.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "ui/events/keycodes/dom/dom_code.h"
diff --git a/remoting/host/keyboard_layout_monitor_chromeos.cc b/remoting/host/keyboard_layout_monitor_chromeos.cc
index 6f54081..c20accb6 100644
--- a/remoting/host/keyboard_layout_monitor_chromeos.cc
+++ b/remoting/host/keyboard_layout_monitor_chromeos.cc
@@ -4,8 +4,8 @@
#include "remoting/host/keyboard_layout_monitor.h"
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/utf_string_conversion_utils.h"
diff --git a/remoting/host/keyboard_layout_monitor_linux.cc b/remoting/host/keyboard_layout_monitor_linux.cc
index 81f3d05..2dea495 100644
--- a/remoting/host/keyboard_layout_monitor_linux.cc
+++ b/remoting/host/keyboard_layout_monitor_linux.cc
@@ -6,9 +6,9 @@
#include <gdk/gdk.h>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/files/file_descriptor_watcher_posix.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/remoting/host/keyboard_layout_monitor_mac.cc b/remoting/host/keyboard_layout_monitor_mac.cc
index 7027ea5c..a6b2873 100644
--- a/remoting/host/keyboard_layout_monitor_mac.cc
+++ b/remoting/host/keyboard_layout_monitor_mac.cc
@@ -11,8 +11,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/mac/scoped_cftyperef.h"
#include "base/memory/weak_ptr.h"
diff --git a/remoting/host/keyboard_layout_monitor_win.cc b/remoting/host/keyboard_layout_monitor_win.cc
index 4fb4def..636c1cee 100644
--- a/remoting/host/keyboard_layout_monitor_win.cc
+++ b/remoting/host/keyboard_layout_monitor_win.cc
@@ -11,9 +11,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/remoting/host/linux/audio_pipe_reader.cc b/remoting/host/linux/audio_pipe_reader.cc
index 15dcc7a..8f3481eb 100644
--- a/remoting/host/linux/audio_pipe_reader.cc
+++ b/remoting/host/linux/audio_pipe_reader.cc
@@ -12,7 +12,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/posix/eintr_wrapper.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/linux/certificate_watcher.cc b/remoting/host/linux/certificate_watcher.cc
index 66de0d1..36c7f492 100644
--- a/remoting/host/linux/certificate_watcher.cc
+++ b/remoting/host/linux/certificate_watcher.cc
@@ -4,9 +4,9 @@
#include "remoting/host/linux/certificate_watcher.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/hash/hash.h"
#include "base/location.h"
#include "base/logging.h"
diff --git a/remoting/host/linux/certificate_watcher_unittest.cc b/remoting/host/linux/certificate_watcher_unittest.cc
index dd4c4d4..14b1b99e 100644
--- a/remoting/host/linux/certificate_watcher_unittest.cc
+++ b/remoting/host/linux/certificate_watcher_unittest.cc
@@ -8,9 +8,9 @@
#include <memory>
#include <string>
-#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/task/single_thread_task_runner.h"
#include "base/test/task_environment.h"
diff --git a/remoting/host/linux/clipboard_portal_injector.h b/remoting/host/linux/clipboard_portal_injector.h
index 7e0566b..4a6e166 100644
--- a/remoting/host/linux/clipboard_portal_injector.h
+++ b/remoting/host/linux/clipboard_portal_injector.h
@@ -9,7 +9,7 @@
#include <unordered_set>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/sequence_checker.h"
#include "third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h"
diff --git a/remoting/host/linux/curtain_mode_wayland.cc b/remoting/host/linux/curtain_mode_wayland.cc
index 4f22525..d2332e8 100644
--- a/remoting/host/linux/curtain_mode_wayland.cc
+++ b/remoting/host/linux/curtain_mode_wayland.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/notreached.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/linux/input_injector_wayland.cc b/remoting/host/linux/input_injector_wayland.cc
index e72f76b3..b3ddbae7 100644
--- a/remoting/host/linux/input_injector_wayland.cc
+++ b/remoting/host/linux/input_injector_wayland.cc
@@ -11,10 +11,10 @@
#include <set>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_forward.h"
#include "base/containers/queue.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_forward.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversion_utils.h"
diff --git a/remoting/host/linux/input_injector_wayland.h b/remoting/host/linux/input_injector_wayland.h
index a78ae3f..abdb52e 100644
--- a/remoting/host/linux/input_injector_wayland.h
+++ b/remoting/host/linux/input_injector_wayland.h
@@ -13,10 +13,10 @@
#include <set>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_forward.h"
#include "base/containers/queue.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_forward.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversion_utils.h"
diff --git a/remoting/host/linux/keyboard_layout_monitor_wayland.cc b/remoting/host/linux/keyboard_layout_monitor_wayland.cc
index 5fd2daf..0bed907 100644
--- a/remoting/host/linux/keyboard_layout_monitor_wayland.cc
+++ b/remoting/host/linux/keyboard_layout_monitor_wayland.cc
@@ -8,7 +8,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/notreached.h"
diff --git a/remoting/host/linux/keyboard_layout_monitor_wayland.h b/remoting/host/linux/keyboard_layout_monitor_wayland.h
index 2c8cc9a..0143681 100644
--- a/remoting/host/linux/keyboard_layout_monitor_wayland.h
+++ b/remoting/host/linux/keyboard_layout_monitor_wayland.h
@@ -7,7 +7,7 @@
#include <xkbcommon/xkbcommon.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/notreached.h"
diff --git a/remoting/host/linux/wayland_connection.h b/remoting/host/linux/wayland_connection.h
index a00aee1..bfbe509 100644
--- a/remoting/host/linux/wayland_connection.h
+++ b/remoting/host/linux/wayland_connection.h
@@ -9,7 +9,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/sequence_checker.h"
#include "base/timer/timer.h"
diff --git a/remoting/host/linux/wayland_manager.h b/remoting/host/linux/wayland_manager.h
index e926e57e..6cef3c9 100644
--- a/remoting/host/linux/wayland_manager.h
+++ b/remoting/host/linux/wayland_manager.h
@@ -9,8 +9,8 @@
#include <xkbcommon/xkbcommon.h>
-#include "base/callback.h"
#include "base/callback_list.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/task/single_thread_task_runner.h"
#include "remoting/host/base/screen_resolution.h"
diff --git a/remoting/host/linux/wayland_seat.h b/remoting/host/linux/wayland_seat.h
index 39f7abe..2938f84 100644
--- a/remoting/host/linux/wayland_seat.h
+++ b/remoting/host/linux/wayland_seat.h
@@ -7,7 +7,7 @@
#include <wayland-client.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/sequence_checker.h"
#include "remoting/host/linux/wayland_keyboard.h"
diff --git a/remoting/host/linux/x11_character_injector.cc b/remoting/host/linux/x11_character_injector.cc
index f718888..b3561edb 100644
--- a/remoting/host/linux/x11_character_injector.cc
+++ b/remoting/host/linux/x11_character_injector.cc
@@ -4,7 +4,7 @@
#include "remoting/host/linux/x11_character_injector.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/ranges/algorithm.h"
#include "base/time/time.h"
#include "remoting/host/linux/x11_keyboard.h"
diff --git a/remoting/host/linux/x11_util.cc b/remoting/host/linux/x11_util.cc
index 391fe7c..93ff17e 100644
--- a/remoting/host/linux/x11_util.cc
+++ b/remoting/host/linux/x11_util.cc
@@ -4,7 +4,7 @@
#include "remoting/host/linux/x11_util.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/strings/string_util.h"
#include "base/types/cxx23_to_underlying.h"
#include "remoting/base/logging.h"
diff --git a/remoting/host/linux/x_server_clipboard.cc b/remoting/host/linux/x_server_clipboard.cc
index 9101ae4..c65f3af 100644
--- a/remoting/host/linux/x_server_clipboard.cc
+++ b/remoting/host/linux/x_server_clipboard.cc
@@ -6,7 +6,7 @@
#include <limits>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted_memory.h"
#include "base/memory/scoped_refptr.h"
#include "base/strings/string_util.h"
diff --git a/remoting/host/linux/x_server_clipboard.h b/remoting/host/linux/x_server_clipboard.h
index 6255343..f584114 100644
--- a/remoting/host/linux/x_server_clipboard.h
+++ b/remoting/host/linux/x_server_clipboard.h
@@ -10,7 +10,7 @@
#include <set>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/time/time.h"
#include "ui/gfx/x/event.h"
diff --git a/remoting/host/linux/x_server_clipboard_unittest.cc b/remoting/host/linux/x_server_clipboard_unittest.cc
index 1e1ee159..fa566c11 100644
--- a/remoting/host/linux/x_server_clipboard_unittest.cc
+++ b/remoting/host/linux/x_server_clipboard_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 "remoting/base/constants.h"
#include "remoting/host/linux/x_server_clipboard.h"
diff --git a/remoting/host/mac/host_service_main.cc b/remoting/host/mac/host_service_main.cc
index f65b060..4090e35d 100644
--- a/remoting/host/mac/host_service_main.cc
+++ b/remoting/host/mac/host_service_main.cc
@@ -9,10 +9,10 @@
#include <string>
#include "base/at_exit.h"
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/mac/mac_util.h"
#include "base/path_service.h"
diff --git a/remoting/host/mac/permission_checker.cc b/remoting/host/mac/permission_checker.cc
index e8d8239b..111e89d 100644
--- a/remoting/host/mac/permission_checker.cc
+++ b/remoting/host/mac/permission_checker.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/single_thread_task_runner.h"
#include "remoting/host/mac/permission_process_utils.h"
#include "remoting/host/version.h"
diff --git a/remoting/host/mac/permission_utils.h b/remoting/host/mac/permission_utils.h
index 3ec8924..7647831f 100644
--- a/remoting/host/mac/permission_utils.h
+++ b/remoting/host/mac/permission_utils.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_HOST_MAC_PERMISSION_UTILS_H_
#define REMOTING_HOST_MAC_PERMISSION_UTILS_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
namespace base {
diff --git a/remoting/host/mac/permission_utils.mm b/remoting/host/mac/permission_utils.mm
index a39235c..37bf761 100644
--- a/remoting/host/mac/permission_utils.mm
+++ b/remoting/host/mac/permission_utils.mm
@@ -7,7 +7,7 @@
#import <AVFoundation/AVFoundation.h>
#import <Cocoa/Cocoa.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/mac/foundation_util.h"
diff --git a/remoting/host/mac/permission_wizard.h b/remoting/host/mac/permission_wizard.h
index a4503ed3..26f56e9 100644
--- a/remoting/host/mac/permission_wizard.h
+++ b/remoting/host/mac/permission_wizard.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
namespace base {
diff --git a/remoting/host/mac/permission_wizard.mm b/remoting/host/mac/permission_wizard.mm
index b08b51f..d72246b8 100644
--- a/remoting/host/mac/permission_wizard.mm
+++ b/remoting/host/mac/permission_wizard.mm
@@ -9,8 +9,8 @@
#import <Cocoa/Cocoa.h>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/mac/mac_util.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/sys_string_conversions.h"
diff --git a/remoting/host/mouse_cursor_monitor_proxy.cc b/remoting/host/mouse_cursor_monitor_proxy.cc
index 0c769fe..666a65d 100644
--- a/remoting/host/mouse_cursor_monitor_proxy.cc
+++ b/remoting/host/mouse_cursor_monitor_proxy.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/mouse_cursor_monitor_proxy_unittest.cc b/remoting/host/mouse_cursor_monitor_proxy_unittest.cc
index fce6aee5..d770d4a 100644
--- a/remoting/host/mouse_cursor_monitor_proxy_unittest.cc
+++ b/remoting/host/mouse_cursor_monitor_proxy_unittest.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/mouse_shape_pump.cc b/remoting/host/mouse_shape_pump.cc
index 648a6ec..441e0e9 100644
--- a/remoting/host/mouse_shape_pump.cc
+++ b/remoting/host/mouse_shape_pump.cc
@@ -8,7 +8,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/timer/timer.h"
#include "remoting/proto/control.pb.h"
#include "remoting/protocol/cursor_shape_stub.h"
diff --git a/remoting/host/native_messaging/log_message_handler.cc b/remoting/host/native_messaging/log_message_handler.cc
index 35de5f1d..624aa78f 100644
--- a/remoting/host/native_messaging/log_message_handler.cc
+++ b/remoting/host/native_messaging/log_message_handler.cc
@@ -4,7 +4,7 @@
#include "remoting/host/native_messaging/log_message_handler.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/strings/string_util.h"
diff --git a/remoting/host/native_messaging/log_message_handler.h b/remoting/host/native_messaging/log_message_handler.h
index 2328c4d..8e77721 100644
--- a/remoting/host/native_messaging/log_message_handler.h
+++ b/remoting/host/native_messaging/log_message_handler.h
@@ -9,7 +9,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/memory/weak_ptr.h"
#include "base/values.h"
diff --git a/remoting/host/native_messaging/native_messaging_pipe.cc b/remoting/host/native_messaging/native_messaging_pipe.cc
index 1ccb7253..62681934 100644
--- a/remoting/host/native_messaging/native_messaging_pipe.cc
+++ b/remoting/host/native_messaging/native_messaging_pipe.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/values.h"
diff --git a/remoting/host/native_messaging/native_messaging_reader.cc b/remoting/host/native_messaging/native_messaging_reader.cc
index c77c90a..8edac5e 100644
--- a/remoting/host/native_messaging/native_messaging_reader.cc
+++ b/remoting/host/native_messaging/native_messaging_reader.cc
@@ -9,8 +9,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/files/file.h"
+#include "base/functional/bind.h"
#include "base/json/json_reader.h"
#include "base/location.h"
#include "base/logging.h"
diff --git a/remoting/host/native_messaging/native_messaging_reader.h b/remoting/host/native_messaging/native_messaging_reader.h
index 3896127..f945af9 100644
--- a/remoting/host/native_messaging/native_messaging_reader.h
+++ b/remoting/host/native_messaging/native_messaging_reader.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback.h"
#include "base/files/file.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread.h"
diff --git a/remoting/host/native_messaging/native_messaging_reader_unittest.cc b/remoting/host/native_messaging/native_messaging_reader_unittest.cc
index 340b6f0..f7b1f68 100644
--- a/remoting/host/native_messaging/native_messaging_reader_unittest.cc
+++ b/remoting/host/native_messaging/native_messaging_reader_unittest.cc
@@ -8,7 +8,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "base/values.h"
diff --git a/remoting/host/native_messaging/pipe_messaging_channel.cc b/remoting/host/native_messaging/pipe_messaging_channel.cc
index 33a9827..789d518 100644
--- a/remoting/host/native_messaging/pipe_messaging_channel.cc
+++ b/remoting/host/native_messaging/pipe_messaging_channel.cc
@@ -6,10 +6,10 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
#include "base/files/file.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/process/process_info.h"
#include "base/values.h"
diff --git a/remoting/host/native_messaging/pipe_messaging_channel.h b/remoting/host/native_messaging/pipe_messaging_channel.h
index 59fafb8..e6da7e12 100644
--- a/remoting/host/native_messaging/pipe_messaging_channel.h
+++ b/remoting/host/native_messaging/pipe_messaging_channel.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback.h"
#include "base/files/file.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
diff --git a/remoting/host/pairing_registry_delegate_linux.cc b/remoting/host/pairing_registry_delegate_linux.cc
index a9f490b..d9f83670 100644
--- a/remoting/host/pairing_registry_delegate_linux.cc
+++ b/remoting/host/pairing_registry_delegate_linux.cc
@@ -7,10 +7,10 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/files/file_enumerator.h"
#include "base/files/file_util.h"
#include "base/files/important_file_writer.h"
+#include "base/functional/bind.h"
#include "base/json/json_file_value_serializer.h"
#include "base/json/json_string_value_serializer.h"
#include "base/location.h"
diff --git a/remoting/host/pam_authorization_factory_posix.cc b/remoting/host/pam_authorization_factory_posix.cc
index 8b8b48f..54403b9 100644
--- a/remoting/host/pam_authorization_factory_posix.cc
+++ b/remoting/host/pam_authorization_factory_posix.cc
@@ -8,9 +8,9 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/environment.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "remoting/base/logging.h"
#include "remoting/host/base/username.h"
#include "remoting/protocol/channel_authenticator.h"
diff --git a/remoting/host/policy_watcher.cc b/remoting/host/policy_watcher.cc
index 9d631bb1..0e9d4b42 100644
--- a/remoting/host/policy_watcher.cc
+++ b/remoting/host/policy_watcher.cc
@@ -10,9 +10,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/remoting/host/policy_watcher.h b/remoting/host/policy_watcher.h
index 71aa59c..4e4754e 100644
--- a/remoting/host/policy_watcher.h
+++ b/remoting/host/policy_watcher.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/sequence_checker.h"
diff --git a/remoting/host/policy_watcher_unittest.cc b/remoting/host/policy_watcher_unittest.cc
index b88a10d..59c8279 100644
--- a/remoting/host/policy_watcher_unittest.cc
+++ b/remoting/host/policy_watcher_unittest.cc
@@ -4,7 +4,7 @@
#include "remoting/host/policy_watcher.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/json/json_writer.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/remoting/host/posix/signal_handler.cc b/remoting/host/posix/signal_handler.cc
index 648a978..409b223 100644
--- a/remoting/host/posix/signal_handler.cc
+++ b/remoting/host/posix/signal_handler.cc
@@ -14,9 +14,9 @@
#include <tuple>
#include <utility>
-#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/files/file_descriptor_watcher_posix.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/posix/eintr_wrapper.h"
#include "base/threading/platform_thread.h"
diff --git a/remoting/host/posix/signal_handler.h b/remoting/host/posix/signal_handler.h
index bc21363..ce3ebbc 100644
--- a/remoting/host/posix/signal_handler.h
+++ b/remoting/host/posix/signal_handler.h
@@ -9,7 +9,7 @@
#ifndef REMOTING_HOST_POSIX_SIGNAL_HANDLER_H_
#define REMOTING_HOST_POSIX_SIGNAL_HANDLER_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
namespace remoting {
diff --git a/remoting/host/register_support_host_request.h b/remoting/host/register_support_host_request.h
index 885f5b8f..b21344f 100644
--- a/remoting/host/register_support_host_request.h
+++ b/remoting/host/register_support_host_request.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/time/time.h"
#include "remoting/base/rsa_key_pair.h"
diff --git a/remoting/host/remote_open_url/remote_open_url_client.cc b/remoting/host/remote_open_url/remote_open_url_client.cc
index f044ed95..c8b584f 100644
--- a/remoting/host/remote_open_url/remote_open_url_client.cc
+++ b/remoting/host/remote_open_url/remote_open_url_client.cc
@@ -4,8 +4,8 @@
#include "remoting/host/remote_open_url/remote_open_url_client.h"
-#include "base/bind.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/notreached.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/remoting/host/remote_open_url/remote_open_url_client.h b/remoting/host/remote_open_url/remote_open_url_client.h
index 3ec28201..3382f3f 100644
--- a/remoting/host/remote_open_url/remote_open_url_client.h
+++ b/remoting/host/remote_open_url/remote_open_url_client.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback.h"
#include "base/command_line.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
#include "mojo/public/cpp/bindings/remote.h"
diff --git a/remoting/host/remote_open_url/remote_open_url_client_unittest.cc b/remoting/host/remote_open_url/remote_open_url_client_unittest.cc
index d8e9de2..3878792 100644
--- a/remoting/host/remote_open_url/remote_open_url_client_unittest.cc
+++ b/remoting/host/remote_open_url/remote_open_url_client_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/callback_forward.h"
#include "base/command_line.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/remoting/host/remote_open_url/remote_open_url_message_handler.cc b/remoting/host/remote_open_url/remote_open_url_message_handler.cc
index 75d71c67..ef4797a 100644
--- a/remoting/host/remote_open_url/remote_open_url_message_handler.cc
+++ b/remoting/host/remote_open_url/remote_open_url_message_handler.cc
@@ -4,8 +4,8 @@
#include "remoting/host/remote_open_url/remote_open_url_message_handler.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "remoting/base/compound_buffer.h"
#include "remoting/protocol/message_serialization.h"
diff --git a/remoting/host/remote_open_url/remote_open_url_message_handler_unittest.cc b/remoting/host/remote_open_url/remote_open_url_message_handler_unittest.cc
index c066771..e21eb78 100644
--- a/remoting/host/remote_open_url/remote_open_url_message_handler_unittest.cc
+++ b/remoting/host/remote_open_url/remote_open_url_message_handler_unittest.cc
@@ -7,8 +7,8 @@
#include <cstdint>
#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/scoped_refptr.h"
#include "base/run_loop.h"
diff --git a/remoting/host/remote_open_url/url_forwarder_configurator.h b/remoting/host/remote_open_url/url_forwarder_configurator.h
index 6bcfe99..38fe226 100644
--- a/remoting/host/remote_open_url/url_forwarder_configurator.h
+++ b/remoting/host/remote_open_url/url_forwarder_configurator.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "remoting/proto/url_forwarder_control.pb.h"
namespace remoting {
diff --git a/remoting/host/remote_open_url/url_forwarder_configurator_linux.cc b/remoting/host/remote_open_url/url_forwarder_configurator_linux.cc
index 2251d27..5e12642 100644
--- a/remoting/host/remote_open_url/url_forwarder_configurator_linux.cc
+++ b/remoting/host/remote_open_url/url_forwarder_configurator_linux.cc
@@ -7,8 +7,8 @@
#include <memory>
#include "base/base_paths.h"
-#include "base/bind.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/path_service.h"
#include "base/process/launch.h"
diff --git a/remoting/host/remote_open_url/url_forwarder_configurator_main_win.cc b/remoting/host/remote_open_url/url_forwarder_configurator_main_win.cc
index b28ce8c..fcc0376 100644
--- a/remoting/host/remote_open_url/url_forwarder_configurator_main_win.cc
+++ b/remoting/host/remote_open_url/url_forwarder_configurator_main_win.cc
@@ -11,9 +11,9 @@
#include <memory>
#include <string>
-#include "base/bind.h"
-#include "base/callback_forward.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_forward.h"
#include "base/logging.h"
#include "base/message_loop/message_pump_type.h"
#include "base/notreached.h"
diff --git a/remoting/host/remote_open_url/url_forwarder_configurator_win.cc b/remoting/host/remote_open_url/url_forwarder_configurator_win.cc
index 148e0aa..905c0e27 100644
--- a/remoting/host/remote_open_url/url_forwarder_configurator_win.cc
+++ b/remoting/host/remote_open_url/url_forwarder_configurator_win.cc
@@ -10,9 +10,9 @@
#include <string>
#include "base/base_paths.h"
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/notreached.h"
diff --git a/remoting/host/remote_open_url/url_forwarder_control_message_handler.cc b/remoting/host/remote_open_url/url_forwarder_control_message_handler.cc
index dca6b132..472e717 100644
--- a/remoting/host/remote_open_url/url_forwarder_control_message_handler.cc
+++ b/remoting/host/remote_open_url/url_forwarder_control_message_handler.cc
@@ -4,8 +4,8 @@
#include "remoting/host/remote_open_url/url_forwarder_control_message_handler.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "remoting/base/logging.h"
#include "remoting/host/remote_open_url/url_forwarder_configurator.h"
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index 53a2882..4bef2bd 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -12,11 +12,11 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/message_loop/message_pump_type.h"
#include "base/notreached.h"
diff --git a/remoting/host/remoting_register_support_host_request.h b/remoting/host/remoting_register_support_host_request.h
index 2e8767b..02972f3 100644
--- a/remoting/host/remoting_register_support_host_request.h
+++ b/remoting/host/remoting_register_support_host_request.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_HOST_REMOTING_REGISTER_SUPPORT_HOST_REQUEST_H_
#define REMOTING_HOST_REMOTING_REGISTER_SUPPORT_HOST_REQUEST_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "remoting/host/register_support_host_request.h"
diff --git a/remoting/host/resizing_host_observer.cc b/remoting/host/resizing_host_observer.cc
index 8ae3e89..63d3b4aa 100644
--- a/remoting/host/resizing_host_observer.cc
+++ b/remoting/host/resizing_host_observer.cc
@@ -10,9 +10,9 @@
#include <list>
#include <utility>
-#include "base/bind.h"
#include "base/check.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
#include "base/time/default_tick_clock.h"
#include "base/time/tick_clock.h"
#include "remoting/base/logging.h"
diff --git a/remoting/host/security_key/fake_security_key_ipc_client.cc b/remoting/host/security_key/fake_security_key_ipc_client.cc
index ace6e10..ed88cc91 100644
--- a/remoting/host/security_key/fake_security_key_ipc_client.cc
+++ b/remoting/host/security_key/fake_security_key_ipc_client.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/memory/weak_ptr.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/security_key/fake_security_key_ipc_client.h b/remoting/host/security_key/fake_security_key_ipc_client.h
index 8df58cc..615588c 100644
--- a/remoting/host/security_key/fake_security_key_ipc_client.h
+++ b/remoting/host/security_key/fake_security_key_ipc_client.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/weak_ptr.h"
#include "mojo/public/cpp/bindings/associated_remote.h"
#include "mojo/public/cpp/platform/named_platform_channel.h"
diff --git a/remoting/host/security_key/fake_security_key_ipc_server.cc b/remoting/host/security_key/fake_security_key_ipc_server.cc
index 43d625a7..bdda332 100644
--- a/remoting/host/security_key/fake_security_key_ipc_server.cc
+++ b/remoting/host/security_key/fake_security_key_ipc_server.cc
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/task/single_thread_task_runner.h"
#include "build/build_config.h"
#include "ipc/ipc_channel.h"
diff --git a/remoting/host/security_key/fake_security_key_ipc_server.h b/remoting/host/security_key/fake_security_key_ipc_server.h
index eb99ea1..e7f5c58 100644
--- a/remoting/host/security_key/fake_security_key_ipc_server.h
+++ b/remoting/host/security_key/fake_security_key_ipc_server.h
@@ -12,7 +12,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/weak_ptr.h"
#include "ipc/ipc_listener.h"
#include "mojo/public/cpp/bindings/associated_receiver.h"
diff --git a/remoting/host/security_key/fake_security_key_message_reader.cc b/remoting/host/security_key/fake_security_key_message_reader.cc
index 172b35d9..ac2abce4 100644
--- a/remoting/host/security_key/fake_security_key_message_reader.cc
+++ b/remoting/host/security_key/fake_security_key_message_reader.cc
@@ -4,7 +4,7 @@
#include "remoting/host/security_key/fake_security_key_message_reader.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "remoting/host/security_key/security_key_message.h"
diff --git a/remoting/host/security_key/fake_security_key_message_reader.h b/remoting/host/security_key/fake_security_key_message_reader.h
index 81d58a5..b78dba2 100644
--- a/remoting/host/security_key/fake_security_key_message_reader.h
+++ b/remoting/host/security_key/fake_security_key_message_reader.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_HOST_SECURITY_KEY_FAKE_SECURITY_KEY_MESSAGE_READER_H_
#define REMOTING_HOST_SECURITY_KEY_FAKE_SECURITY_KEY_MESSAGE_READER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "remoting/host/security_key/security_key_message.h"
#include "remoting/host/security_key/security_key_message_reader.h"
diff --git a/remoting/host/security_key/fake_security_key_message_writer.cc b/remoting/host/security_key/fake_security_key_message_writer.cc
index 5fd2afa..3bedd0f 100644
--- a/remoting/host/security_key/fake_security_key_message_writer.cc
+++ b/remoting/host/security_key/fake_security_key_message_writer.cc
@@ -7,7 +7,7 @@
#include <string>
#include <utility>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/memory/weak_ptr.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/security_key/fake_security_key_message_writer.h b/remoting/host/security_key/fake_security_key_message_writer.h
index ec1bbe7e..22e668c 100644
--- a/remoting/host/security_key/fake_security_key_message_writer.h
+++ b/remoting/host/security_key/fake_security_key_message_writer.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "remoting/host/security_key/security_key_message.h"
#include "remoting/host/security_key/security_key_message_writer.h"
diff --git a/remoting/host/security_key/security_key_auth_handler.h b/remoting/host/security_key/security_key_auth_handler.h
index 5d86691..0ca2ee09 100644
--- a/remoting/host/security_key/security_key_auth_handler.h
+++ b/remoting/host/security_key/security_key_auth_handler.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/time/time.h"
#include "build/build_config.h"
diff --git a/remoting/host/security_key/security_key_auth_handler_posix.cc b/remoting/host/security_key/security_key_auth_handler_posix.cc
index d7c22e9..6d6c13e 100644
--- a/remoting/host/security_key/security_key_auth_handler_posix.cc
+++ b/remoting/host/security_key/security_key_auth_handler_posix.cc
@@ -12,10 +12,10 @@
#include <string>
#include <utility>
-#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/lazy_instance.h"
#include "base/location.h"
#include "base/logging.h"
diff --git a/remoting/host/security_key/security_key_auth_handler_posix_unittest.cc b/remoting/host/security_key/security_key_auth_handler_posix_unittest.cc
index 02f5828..e34c319 100644
--- a/remoting/host/security_key/security_key_auth_handler_posix_unittest.cc
+++ b/remoting/host/security_key/security_key_auth_handler_posix_unittest.cc
@@ -9,9 +9,9 @@
#include <memory>
#include <string>
-#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 "base/threading/thread.h"
diff --git a/remoting/host/security_key/security_key_auth_handler_win.cc b/remoting/host/security_key/security_key_auth_handler_win.cc
index 9322dba..1b86c89 100644
--- a/remoting/host/security_key/security_key_auth_handler_win.cc
+++ b/remoting/host/security_key/security_key_auth_handler_win.cc
@@ -9,7 +9,7 @@
#include <memory>
#include <string>
-#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/remoting/host/security_key/security_key_auth_handler_win_unittest.cc b/remoting/host/security_key/security_key_auth_handler_win_unittest.cc
index 47d976f..8aae0b13 100644
--- a/remoting/host/security_key/security_key_auth_handler_win_unittest.cc
+++ b/remoting/host/security_key/security_key_auth_handler_win_unittest.cc
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#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/remoting/host/security_key/security_key_extension_session.cc b/remoting/host/security_key/security_key_extension_session.cc
index 70b37aa..54af09b 100644
--- a/remoting/host/security_key/security_key_extension_session.cc
+++ b/remoting/host/security_key/security_key_extension_session.cc
@@ -7,7 +7,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/logging.h"
diff --git a/remoting/host/security_key/security_key_extension_session.h b/remoting/host/security_key/security_key_extension_session.h
index a2aa40c..a09c787 100644
--- a/remoting/host/security_key/security_key_extension_session.h
+++ b/remoting/host/security_key/security_key_extension_session.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/threading/thread_checker.h"
diff --git a/remoting/host/security_key/security_key_ipc_client.cc b/remoting/host/security_key/security_key_ipc_client.cc
index 5364225..5eeef0d 100644
--- a/remoting/host/security_key/security_key_ipc_client.cc
+++ b/remoting/host/security_key/security_key_ipc_client.cc
@@ -7,8 +7,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "base/task/single_thread_task_runner.h"
#include "build/build_config.h"
diff --git a/remoting/host/security_key/security_key_ipc_client.h b/remoting/host/security_key/security_key_ipc_client.h
index 06a61ed..959b994 100644
--- a/remoting/host/security_key/security_key_ipc_client.h
+++ b/remoting/host/security_key/security_key_ipc_client.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "ipc/ipc_listener.h"
diff --git a/remoting/host/security_key/security_key_ipc_client_unittest.cc b/remoting/host/security_key/security_key_ipc_client_unittest.cc
index 4654bcc..87f4f75 100644
--- a/remoting/host/security_key/security_key_ipc_client_unittest.cc
+++ b/remoting/host/security_key/security_key_ipc_client_unittest.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "build/build_config.h"
diff --git a/remoting/host/security_key/security_key_ipc_server.cc b/remoting/host/security_key/security_key_ipc_server.cc
index 4ab0e3ce..79ca17cb 100644
--- a/remoting/host/security_key/security_key_ipc_server.cc
+++ b/remoting/host/security_key/security_key_ipc_server.cc
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
#include "base/threading/thread_checker.h"
#include "base/timer/timer.h"
diff --git a/remoting/host/security_key/security_key_ipc_server.h b/remoting/host/security_key/security_key_ipc_server.h
index 119637cc..fce7be98 100644
--- a/remoting/host/security_key/security_key_ipc_server.h
+++ b/remoting/host/security_key/security_key_ipc_server.h
@@ -9,7 +9,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/time/time.h"
#include "mojo/public/cpp/platform/named_platform_channel.h"
#include "remoting/host/security_key/security_key_auth_handler.h"
diff --git a/remoting/host/security_key/security_key_ipc_server_impl.cc b/remoting/host/security_key/security_key_ipc_server_impl.cc
index de8cf65..568a9e9a 100644
--- a/remoting/host/security_key/security_key_ipc_server_impl.cc
+++ b/remoting/host/security_key/security_key_ipc_server_impl.cc
@@ -9,8 +9,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/security_key/security_key_ipc_server_impl.h b/remoting/host/security_key/security_key_ipc_server_impl.h
index 1a0a45a..ffd5ee7b 100644
--- a/remoting/host/security_key/security_key_ipc_server_impl.h
+++ b/remoting/host/security_key/security_key_ipc_server_impl.h
@@ -12,7 +12,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "base/time/time.h"
diff --git a/remoting/host/security_key/security_key_ipc_server_unittest.cc b/remoting/host/security_key/security_key_ipc_server_unittest.cc
index 2079a73..50d49f9 100644
--- a/remoting/host/security_key/security_key_ipc_server_unittest.cc
+++ b/remoting/host/security_key/security_key_ipc_server_unittest.cc
@@ -7,10 +7,10 @@
#include <memory>
#include <string>
-#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/run_loop.h"
#include "base/test/task_environment.h"
#include "build/build_config.h"
diff --git a/remoting/host/security_key/security_key_message.cc b/remoting/host/security_key/security_key_message.cc
index 6ce9205..31d0259 100644
--- a/remoting/host/security_key/security_key_message.cc
+++ b/remoting/host/security_key/security_key_message.cc
@@ -9,7 +9,7 @@
#include <string>
#include <utility>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
namespace {
diff --git a/remoting/host/security_key/security_key_message.h b/remoting/host/security_key/security_key_message.h
index 5eb58c3..29bb204 100644
--- a/remoting/host/security_key/security_key_message.h
+++ b/remoting/host/security_key/security_key_message.h
@@ -9,7 +9,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
namespace remoting {
diff --git a/remoting/host/security_key/security_key_message_handler.cc b/remoting/host/security_key/security_key_message_handler.cc
index d6fb4e4..bf5d830 100644
--- a/remoting/host/security_key/security_key_message_handler.cc
+++ b/remoting/host/security_key/security_key_message_handler.cc
@@ -9,8 +9,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "remoting/host/security_key/security_key_ipc_client.h"
#include "remoting/host/security_key/security_key_ipc_constants.h"
diff --git a/remoting/host/security_key/security_key_message_handler.h b/remoting/host/security_key/security_key_message_handler.h
index 91ceb2d..fccf9a05 100644
--- a/remoting/host/security_key/security_key_message_handler.h
+++ b/remoting/host/security_key/security_key_message_handler.h
@@ -8,8 +8,8 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/files/file.h"
+#include "base/functional/callback.h"
#include "base/threading/thread_checker.h"
#include "remoting/host/security_key/security_key_message.h"
diff --git a/remoting/host/security_key/security_key_message_handler_unittest.cc b/remoting/host/security_key/security_key_message_handler_unittest.cc
index 21483e0..acb061e 100644
--- a/remoting/host/security_key/security_key_message_handler_unittest.cc
+++ b/remoting/host/security_key/security_key_message_handler_unittest.cc
@@ -8,7 +8,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/test/task_environment.h"
diff --git a/remoting/host/security_key/security_key_message_reader.h b/remoting/host/security_key/security_key_message_reader.h
index 3ed6373..4b2349b 100644
--- a/remoting/host/security_key/security_key_message_reader.h
+++ b/remoting/host/security_key/security_key_message_reader.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_HOST_SECURITY_KEY_SECURITY_KEY_MESSAGE_READER_H_
#define REMOTING_HOST_SECURITY_KEY_SECURITY_KEY_MESSAGE_READER_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "remoting/host/security_key/security_key_message.h"
namespace remoting {
diff --git a/remoting/host/security_key/security_key_message_reader_impl.cc b/remoting/host/security_key/security_key_message_reader_impl.cc
index 2975771c..cc545376 100644
--- a/remoting/host/security_key/security_key_message_reader_impl.cc
+++ b/remoting/host/security_key/security_key_message_reader_impl.cc
@@ -8,8 +8,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/files/file.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/message_loop/message_pump_type.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/security_key/security_key_message_reader_impl.h b/remoting/host/security_key/security_key_message_reader_impl.h
index 407e56a4..094a62c 100644
--- a/remoting/host/security_key/security_key_message_reader_impl.h
+++ b/remoting/host/security_key/security_key_message_reader_impl.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback.h"
#include "base/files/file.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread.h"
#include "remoting/host/security_key/security_key_message.h"
diff --git a/remoting/host/security_key/security_key_message_reader_impl_unittest.cc b/remoting/host/security_key/security_key_message_reader_impl_unittest.cc
index 4f1b596..461a4221 100644
--- a/remoting/host/security_key/security_key_message_reader_impl_unittest.cc
+++ b/remoting/host/security_key/security_key_message_reader_impl_unittest.cc
@@ -9,7 +9,7 @@
#include <string>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "remoting/host/security_key/security_key_message.h"
diff --git a/remoting/host/security_key/security_key_message_writer_impl_unittest.cc b/remoting/host/security_key/security_key_message_writer_impl_unittest.cc
index 2ccd7f7..e1ed4bd 100644
--- a/remoting/host/security_key/security_key_message_writer_impl_unittest.cc
+++ b/remoting/host/security_key/security_key_message_writer_impl_unittest.cc
@@ -8,7 +8,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "base/threading/thread.h"
diff --git a/remoting/host/security_key/security_key_socket.cc b/remoting/host/security_key/security_key_socket.cc
index c1512e41..a8d9f3df 100644
--- a/remoting/host/security_key/security_key_socket.cc
+++ b/remoting/host/security_key/security_key_socket.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/timer/timer.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
diff --git a/remoting/host/security_key/security_key_socket.h b/remoting/host/security_key/security_key_socket.h
index 0d4287da..7b9e60d 100644
--- a/remoting/host/security_key/security_key_socket.h
+++ b/remoting/host/security_key/security_key_socket.h
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/threading/thread_checker.h"
diff --git a/remoting/host/setup/daemon_controller.cc b/remoting/host/setup/daemon_controller.cc
index 618641b..109f686 100644
--- a/remoting/host/setup/daemon_controller.cc
+++ b/remoting/host/setup/daemon_controller.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/message_loop/message_pump_type.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/setup/daemon_controller.h b/remoting/host/setup/daemon_controller.h
index 6891fc6..727d6d7 100644
--- a/remoting/host/setup/daemon_controller.h
+++ b/remoting/host/setup/daemon_controller.h
@@ -8,8 +8,8 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/containers/queue.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "base/values.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/remoting/host/setup/daemon_controller_delegate_linux.cc b/remoting/host/setup/daemon_controller_delegate_linux.cc
index a36311c..e1a5d0b2 100644
--- a/remoting/host/setup/daemon_controller_delegate_linux.cc
+++ b/remoting/host/setup/daemon_controller_delegate_linux.cc
@@ -7,12 +7,12 @@
#include <unistd.h>
#include <utility>
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/environment.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/remoting/host/setup/daemon_controller_delegate_mac.mm b/remoting/host/setup/daemon_controller_delegate_mac.mm
index c64fc08..a280fc2 100644
--- a/remoting/host/setup/daemon_controller_delegate_mac.mm
+++ b/remoting/host/setup/daemon_controller_delegate_mac.mm
@@ -8,10 +8,10 @@
#include <sys/types.h>
#include <utility>
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_util.h"
#include "base/files/scoped_file.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/mac/authorization_util.h"
#include "base/mac/foundation_util.h"
diff --git a/remoting/host/setup/host_starter.cc b/remoting/host/setup/host_starter.cc
index fc992d31..c236711 100644
--- a/remoting/host/setup/host_starter.cc
+++ b/remoting/host/setup/host_starter.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/guid.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
diff --git a/remoting/host/setup/host_starter.h b/remoting/host/setup/host_starter.h
index 4dc1f08..4819fcf 100644
--- a/remoting/host/setup/host_starter.h
+++ b/remoting/host/setup/host_starter.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/setup/host_stopper.h b/remoting/host/setup/host_stopper.h
index f5d6363..dc54107 100644
--- a/remoting/host/setup/host_stopper.h
+++ b/remoting/host/setup/host_stopper.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_HOST_SETUP_HOST_STOPPER_H_
#define REMOTING_HOST_SETUP_HOST_STOPPER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/values.h"
#include "remoting/host/setup/daemon_controller.h"
diff --git a/remoting/host/setup/me2me_native_messaging_host.cc b/remoting/host/setup/me2me_native_messaging_host.cc
index acba0d2..f4eb6d1 100644
--- a/remoting/host/setup/me2me_native_messaging_host.cc
+++ b/remoting/host/setup/me2me_native_messaging_host.cc
@@ -9,9 +9,9 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/logging.h"
diff --git a/remoting/host/setup/me2me_native_messaging_host_unittest.cc b/remoting/host/setup/me2me_native_messaging_host_unittest.cc
index 579c8bd..15e5c289 100644
--- a/remoting/host/setup/me2me_native_messaging_host_unittest.cc
+++ b/remoting/host/setup/me2me_native_messaging_host_unittest.cc
@@ -11,8 +11,8 @@
#include <string>
#include <utility>
-#include "base/bind.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/memory/ptr_util.h"
diff --git a/remoting/host/setup/service_client.cc b/remoting/host/setup/service_client.cc
index 29351a15..946f5bc2 100644
--- a/remoting/host/setup/service_client.cc
+++ b/remoting/host/setup/service_client.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "remoting/base/directory_service_client.h"
#include "remoting/base/passthrough_oauth_token_getter.h"
diff --git a/remoting/host/setup/start_host_main.cc b/remoting/host/setup/start_host_main.cc
index c5583b6..f8e9278a 100644
--- a/remoting/host/setup/start_host_main.cc
+++ b/remoting/host/setup/start_host_main.cc
@@ -8,8 +8,8 @@
#include <stdio.h>
#include "base/at_exit.h"
-#include "base/bind.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
#include "base/message_loop/message_pump_type.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_executor.h"
diff --git a/remoting/host/token_validator_base.cc b/remoting/host/token_validator_base.cc
index 7181923f..33078f0a 100644
--- a/remoting/host/token_validator_base.cc
+++ b/remoting/host/token_validator_base.cc
@@ -7,8 +7,8 @@
#include <stddef.h>
#include "base/base64.h"
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/json/json_reader.h"
#include "base/logging.h"
#include "base/memory/weak_ptr.h"
diff --git a/remoting/host/token_validator_base.h b/remoting/host/token_validator_base.h
index b5058c5c..0bf2696 100644
--- a/remoting/host/token_validator_base.h
+++ b/remoting/host/token_validator_base.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "net/ssl/client_cert_identity.h"
#include "net/url_request/url_request.h"
diff --git a/remoting/host/token_validator_factory_impl.cc b/remoting/host/token_validator_factory_impl.cc
index c31bb1b..d6b372a 100644
--- a/remoting/host/token_validator_factory_impl.cc
+++ b/remoting/host/token_validator_factory_impl.cc
@@ -10,9 +10,9 @@
#include <utility>
#include "base/base64.h"
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/json/json_reader.h"
#include "base/strings/escape.h"
#include "base/strings/string_util.h"
diff --git a/remoting/host/token_validator_factory_impl_unittest.cc b/remoting/host/token_validator_factory_impl_unittest.cc
index 6736d4f9..c35de62 100644
--- a/remoting/host/token_validator_factory_impl_unittest.cc
+++ b/remoting/host/token_validator_factory_impl_unittest.cc
@@ -9,7 +9,7 @@
#include <memory>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/json/json_writer.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
diff --git a/remoting/host/webauthn/remote_webauthn_delegated_state_change_notifier.h b/remoting/host/webauthn/remote_webauthn_delegated_state_change_notifier.h
index fdc1058a..3ed3ad577 100644
--- a/remoting/host/webauthn/remote_webauthn_delegated_state_change_notifier.h
+++ b/remoting/host/webauthn/remote_webauthn_delegated_state_change_notifier.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_HOST_WEBAUTHN_REMOTE_WEBAUTHN_DELEGATED_STATE_CHANGE_NOTIFIER_H_
#define REMOTING_HOST_WEBAUTHN_REMOTE_WEBAUTHN_DELEGATED_STATE_CHANGE_NOTIFIER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "remoting/host/webauthn/remote_webauthn_state_change_notifier.h"
namespace remoting {
diff --git a/remoting/host/webauthn/remote_webauthn_extension_notifier.cc b/remoting/host/webauthn/remote_webauthn_extension_notifier.cc
index 294bf18c..01ac443 100644
--- a/remoting/host/webauthn/remote_webauthn_extension_notifier.cc
+++ b/remoting/host/webauthn/remote_webauthn_extension_notifier.cc
@@ -7,10 +7,10 @@
#include <vector>
#include "base/base_paths.h"
-#include "base/bind.h"
#include "base/files/file.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/scoped_refptr.h"
diff --git a/remoting/host/webauthn/remote_webauthn_extension_notifier_unittest.cc b/remoting/host/webauthn/remote_webauthn_extension_notifier_unittest.cc
index 62134ef1..2e318c0 100644
--- a/remoting/host/webauthn/remote_webauthn_extension_notifier_unittest.cc
+++ b/remoting/host/webauthn/remote_webauthn_extension_notifier_unittest.cc
@@ -6,10 +6,10 @@
#include <memory>
-#include "base/callback_helpers.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/ptr_util.h"
#include "base/memory/scoped_refptr.h"
#include "base/run_loop.h"
diff --git a/remoting/host/webauthn/remote_webauthn_message_handler.cc b/remoting/host/webauthn/remote_webauthn_message_handler.cc
index 8de369de..abfbf50 100644
--- a/remoting/host/webauthn/remote_webauthn_message_handler.cc
+++ b/remoting/host/webauthn/remote_webauthn_message_handler.cc
@@ -8,9 +8,9 @@
#include <limits>
-#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/notreached.h"
#include "remoting/host/mojom/webauthn_proxy.mojom.h"
diff --git a/remoting/host/webauthn/remote_webauthn_native_messaging_host.cc b/remoting/host/webauthn/remote_webauthn_native_messaging_host.cc
index 1f2e453..838735f 100644
--- a/remoting/host/webauthn/remote_webauthn_native_messaging_host.cc
+++ b/remoting/host/webauthn/remote_webauthn_native_messaging_host.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/json/json_writer.h"
#include "base/logging.h"
#include "base/ranges/algorithm.h"
diff --git a/remoting/host/webauthn/remote_webauthn_native_messaging_host.h b/remoting/host/webauthn/remote_webauthn_native_messaging_host.h
index 9dd86126..a0a3ca406 100644
--- a/remoting/host/webauthn/remote_webauthn_native_messaging_host.h
+++ b/remoting/host/webauthn/remote_webauthn_native_messaging_host.h
@@ -7,9 +7,9 @@
#include <memory>
-#include "base/callback_forward.h"
#include "base/containers/flat_map.h"
#include "base/containers/queue.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/task/single_thread_task_runner.h"
#include "base/values.h"
diff --git a/remoting/host/webauthn/remote_webauthn_native_messaging_host_unittest.cc b/remoting/host/webauthn/remote_webauthn_native_messaging_host_unittest.cc
index 9007fd8a..4544d38 100644
--- a/remoting/host/webauthn/remote_webauthn_native_messaging_host_unittest.cc
+++ b/remoting/host/webauthn/remote_webauthn_native_messaging_host_unittest.cc
@@ -4,7 +4,7 @@
#include <memory>
-#include "base/callback.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/remoting/host/win/elevated_native_messaging_host.cc b/remoting/host/win/elevated_native_messaging_host.cc
index 29325210..27fe95c 100644
--- a/remoting/host/win/elevated_native_messaging_host.cc
+++ b/remoting/host/win/elevated_native_messaging_host.cc
@@ -8,9 +8,9 @@
#include <string>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/json/json_writer.h"
#include "base/values.h"
#include "base/win/scoped_handle.h"
diff --git a/remoting/host/win/host_service.cc b/remoting/host/win/host_service.cc
index cd5492d3..4226848 100644
--- a/remoting/host/win/host_service.cc
+++ b/remoting/host/win/host_service.cc
@@ -13,9 +13,9 @@
#include "base/base_paths.h"
#include "base/base_switches.h"
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/message_loop/message_pump_type.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/remoting/host/win/rdp_client.cc b/remoting/host/win/rdp_client.cc
index 491b464..5c332974 100644
--- a/remoting/host/win/rdp_client.cc
+++ b/remoting/host/win/rdp_client.cc
@@ -9,9 +9,9 @@
#include <cstdint>
#include <memory>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/numerics/safe_conversions.h"
#include "base/task/current_thread.h"
diff --git a/remoting/host/win/rdp_client_unittest.cc b/remoting/host/win/rdp_client_unittest.cc
index db93a59..3c5eb805d 100644
--- a/remoting/host/win/rdp_client_unittest.cc
+++ b/remoting/host/win/rdp_client_unittest.cc
@@ -8,8 +8,8 @@
#include <memory>
#include <string>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/guid.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/win/rdp_client_window.cc b/remoting/host/win/rdp_client_window.cc
index cf4857d..4f12d90 100644
--- a/remoting/host/win/rdp_client_window.cc
+++ b/remoting/host/win/rdp_client_window.cc
@@ -9,7 +9,7 @@
#include <list>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/lazy_instance.h"
#include "base/location.h"
#include "base/logging.h"
diff --git a/remoting/host/win/session_action_executor.cc b/remoting/host/win/session_action_executor.cc
index a676321..c3bb0c14 100644
--- a/remoting/host/win/session_action_executor.cc
+++ b/remoting/host/win/session_action_executor.cc
@@ -4,8 +4,8 @@
#include "remoting/host/win/session_action_executor.h"
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
#include "remoting/proto/action.pb.h"
diff --git a/remoting/host/win/session_action_executor.h b/remoting/host/win/session_action_executor.h
index de2ec706..050d801 100644
--- a/remoting/host/win/session_action_executor.h
+++ b/remoting/host/win/session_action_executor.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_HOST_WIN_SESSION_ACTION_EXECUTOR_H_
#define REMOTING_HOST_WIN_SESSION_ACTION_EXECUTOR_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "remoting/host/action_executor.h"
diff --git a/remoting/host/win/session_desktop_environment.h b/remoting/host/win/session_desktop_environment.h
index 490e8de..febbc46 100644
--- a/remoting/host/win/session_desktop_environment.h
+++ b/remoting/host/win/session_desktop_environment.h
@@ -5,8 +5,8 @@
#ifndef REMOTING_HOST_WIN_SESSION_DESKTOP_ENVIRONMENT_H_
#define REMOTING_HOST_WIN_SESSION_DESKTOP_ENVIRONMENT_H_
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/task/single_thread_task_runner.h"
#include "remoting/host/me2me_desktop_environment.h"
diff --git a/remoting/host/win/session_input_injector.cc b/remoting/host/win/session_input_injector.cc
index e392605..a06b19b 100644
--- a/remoting/host/win/session_input_injector.cc
+++ b/remoting/host/win/session_input_injector.cc
@@ -10,9 +10,9 @@
#include <string>
#include <utility>
-#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/location.h"
#include "base/logging.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/win/session_input_injector.h b/remoting/host/win/session_input_injector.h
index 857ef52..6020158 100644
--- a/remoting/host/win/session_input_injector.h
+++ b/remoting/host/win/session_input_injector.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "remoting/host/input_injector.h"
diff --git a/remoting/host/win/worker_process_launcher.h b/remoting/host/win/worker_process_launcher.h
index 2475431..904be1a 100644
--- a/remoting/host/win/worker_process_launcher.h
+++ b/remoting/host/win/worker_process_launcher.h
@@ -9,8 +9,8 @@
#include <memory>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/sequence_checker.h"
#include "base/timer/timer.h"
diff --git a/remoting/host/win/worker_process_launcher_unittest.cc b/remoting/host/win/worker_process_launcher_unittest.cc
index 1f4b296..de78c34 100644
--- a/remoting/host/win/worker_process_launcher_unittest.cc
+++ b/remoting/host/win/worker_process_launcher_unittest.cc
@@ -9,7 +9,7 @@
#include <memory>
#include <utility>
-#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/remoting/host/win/wts_session_change_observer.cc b/remoting/host/win/wts_session_change_observer.cc
index e0ada78a..39c4bc2 100644
--- a/remoting/host/win/wts_session_change_observer.cc
+++ b/remoting/host/win/wts_session_change_observer.cc
@@ -8,7 +8,7 @@
#include <winuser.h>
#include <wtsapi32.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/sequence_checker.h"
diff --git a/remoting/host/win/wts_session_change_observer.h b/remoting/host/win/wts_session_change_observer.h
index 3f80e90..5941fbf5 100644
--- a/remoting/host/win/wts_session_change_observer.h
+++ b/remoting/host/win/wts_session_change_observer.h
@@ -7,7 +7,7 @@
#include <stdint.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/sequence_checker.h"
#include "base/thread_annotations.h"
#include "base/win/message_window.h"
diff --git a/remoting/host/win/wts_session_process_delegate.cc b/remoting/host/win/wts_session_process_delegate.cc
index 5c89616..8a19a850 100644
--- a/remoting/host/win/wts_session_process_delegate.cc
+++ b/remoting/host/win/wts_session_process_delegate.cc
@@ -10,9 +10,9 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/notreached.h"
diff --git a/remoting/host/xmpp_register_support_host_request.cc b/remoting/host/xmpp_register_support_host_request.cc
index 6809deb1..574f8ac5 100644
--- a/remoting/host/xmpp_register_support_host_request.cc
+++ b/remoting/host/xmpp_register_support_host_request.cc
@@ -9,7 +9,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringize_macros.h"
diff --git a/remoting/host/xmpp_register_support_host_request.h b/remoting/host/xmpp_register_support_host_request.h
index 1be2a901..8b8076d 100644
--- a/remoting/host/xmpp_register_support_host_request.h
+++ b/remoting/host/xmpp_register_support_host_request.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "remoting/base/rsa_key_pair.h"
diff --git a/remoting/host/xmpp_register_support_host_request_unittest.cc b/remoting/host/xmpp_register_support_host_request_unittest.cc
index 55e83e9..28c8da6 100644
--- a/remoting/host/xmpp_register_support_host_request_unittest.cc
+++ b/remoting/host/xmpp_register_support_host_request_unittest.cc
@@ -6,7 +6,7 @@
#include <stdint.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted.h"
#include "base/observer_list.h"
#include "base/strings/string_number_conversions.h"
diff --git a/remoting/host/xsession_chooser_linux.cc b/remoting/host/xsession_chooser_linux.cc
index cd2cde8c..9a24ffd 100644
--- a/remoting/host/xsession_chooser_linux.cc
+++ b/remoting/host/xsession_chooser_linux.cc
@@ -20,12 +20,12 @@
#include <string>
#include <vector>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/environment.h"
#include "base/files/file_enumerator.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/i18n/icu_util.h"
#include "base/logging.h"
#include "base/message_loop/message_pump_type.h"
diff --git a/remoting/host/zombie_host_detector.h b/remoting/host/zombie_host_detector.h
index 3d28896..ccaccb4 100644
--- a/remoting/host/zombie_host_detector.h
+++ b/remoting/host/zombie_host_detector.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_HOST_ZOMBIE_HOST_DETECTOR_H_
#define REMOTING_HOST_ZOMBIE_HOST_DETECTOR_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
#include "remoting/host/heartbeat_sender.h"
diff --git a/remoting/host/zombie_host_detector_unittest.cc b/remoting/host/zombie_host_detector_unittest.cc
index 80ca913..5c03b78a 100644
--- a/remoting/host/zombie_host_detector_unittest.cc
+++ b/remoting/host/zombie_host_detector_unittest.cc
@@ -4,7 +4,7 @@
#include "remoting/host/zombie_host_detector.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/test/bind.h"
#include "base/test/mock_callback.h"
#include "base/test/task_environment.h"
diff --git a/remoting/ios/app/notification_presenter.mm b/remoting/ios/app/notification_presenter.mm
index b57e9b30..62fc8b2 100644
--- a/remoting/ios/app/notification_presenter.mm
+++ b/remoting/ios/app/notification_presenter.mm
@@ -6,8 +6,8 @@
#import <MaterialComponents/MaterialDialogs.h>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/no_destructor.h"
#include "base/strings/sys_string_conversions.h"
#include "remoting/base/string_resources.h"
diff --git a/remoting/ios/app/remoting_view_controller.mm b/remoting/ios/app/remoting_view_controller.mm
index 202fceb..98979f80 100644
--- a/remoting/ios/app/remoting_view_controller.mm
+++ b/remoting/ios/app/remoting_view_controller.mm
@@ -14,7 +14,7 @@
#import <MaterialComponents/MaterialShadowLayer.h>
#import <MaterialComponents/MaterialSnackbar.h>
-#import "base/bind.h"
+#import "base/functional/bind.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/strings/sys_string_conversions.h"
#include "remoting/base/oauth_token_getter.h"
diff --git a/remoting/ios/audio/audio_playback_sink_ios.cc b/remoting/ios/audio/audio_playback_sink_ios.cc
index 8398788..8235db0c 100644
--- a/remoting/ios/audio/audio_playback_sink_ios.cc
+++ b/remoting/ios/audio/audio_playback_sink_ios.cc
@@ -4,7 +4,7 @@
#include "remoting/ios/audio/audio_playback_sink_ios.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
diff --git a/remoting/ios/audio/audio_playback_sink_ios_unittest.cc b/remoting/ios/audio/audio_playback_sink_ios_unittest.cc
index dfb928b43..4497b8e0 100644
--- a/remoting/ios/audio/audio_playback_sink_ios_unittest.cc
+++ b/remoting/ios/audio/audio_playback_sink_ios_unittest.cc
@@ -4,7 +4,7 @@
#include "remoting/ios/audio/audio_playback_sink_ios.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/test/bind.h"
#include "base/threading/platform_thread.h"
#include "base/threading/thread.h"
diff --git a/remoting/ios/display/eagl_view.mm b/remoting/ios/display/eagl_view.mm
index cad01fa..7b42e9b3 100644
--- a/remoting/ios/display/eagl_view.mm
+++ b/remoting/ios/display/eagl_view.mm
@@ -12,9 +12,9 @@
#import <OpenGLES/ES2/gl.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"
#import "base/task/single_thread_task_runner.h"
#include "base/threading/thread_checker.h"
diff --git a/remoting/ios/display/gl_display_handler.mm b/remoting/ios/display/gl_display_handler.mm
index 44afd65..ac82c6b6 100644
--- a/remoting/ios/display/gl_display_handler.mm
+++ b/remoting/ios/display/gl_display_handler.mm
@@ -11,12 +11,12 @@
#import "remoting/ios/display/gl_display_handler.h"
-#import "base/bind.h"
+#import "base/functional/bind.h"
#import "remoting/client/display/sys_opengl.h"
#import "remoting/ios/display/eagl_view.h"
#import "remoting/ios/display/gl_demo_screen.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/weak_ptr.h"
#include "remoting/client/chromoting_client_runtime.h"
diff --git a/remoting/ios/facade/host_list_service.mm b/remoting/ios/facade/host_list_service.mm
index 05b39c5..f6920d6 100644
--- a/remoting/ios/facade/host_list_service.mm
+++ b/remoting/ios/facade/host_list_service.mm
@@ -16,7 +16,7 @@
#import "remoting/ios/facade/remoting_authentication.h"
#import "remoting/ios/facade/remoting_service.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/no_destructor.h"
#include "remoting/base/directory_service_client.h"
diff --git a/remoting/ios/facade/host_list_service_unittest.mm b/remoting/ios/facade/host_list_service_unittest.mm
index dd62745..542c826c 100644
--- a/remoting/ios/facade/host_list_service_unittest.mm
+++ b/remoting/ios/facade/host_list_service_unittest.mm
@@ -14,7 +14,7 @@
#import "remoting/ios/facade/remoting_service.h"
#import "third_party/ocmock/OCMock/OCMock.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "net/http/http_status_code.h"
diff --git a/remoting/ios/facade/ios_client_runtime_delegate.mm b/remoting/ios/facade/ios_client_runtime_delegate.mm
index 58e13d76..a6a81d6 100644
--- a/remoting/ios/facade/ios_client_runtime_delegate.mm
+++ b/remoting/ios/facade/ios_client_runtime_delegate.mm
@@ -11,8 +11,8 @@
#import "remoting/ios/facade/remoting_authentication.h"
#import "remoting/ios/facade/remoting_service.h"
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/sys_string_conversions.h"
diff --git a/remoting/ios/facade/remoting_oauth_authentication.mm b/remoting/ios/facade/remoting_oauth_authentication.mm
index 2ea5247..36b40e6a 100644
--- a/remoting/ios/facade/remoting_oauth_authentication.mm
+++ b/remoting/ios/facade/remoting_oauth_authentication.mm
@@ -9,16 +9,16 @@
#import <MaterialComponents/MaterialSnackbar.h>
-#import "base/bind.h"
-#import "remoting/ios/facade/ios_client_runtime_delegate.h"
-#import "remoting/ios/facade/remoting_service.h"
-#import "remoting/ios/persistence/remoting_keychain.h"
-#import "remoting/ios/persistence/remoting_preferences.h"
+#import "base/functional/bind.h"
#include "base/logging.h"
#include "base/strings/sys_string_conversions.h"
#include "net/url_request/url_request_context_getter.h"
#include "remoting/base/oauth_token_getter.h"
#include "remoting/base/oauth_token_getter_impl.h"
+#import "remoting/ios/facade/ios_client_runtime_delegate.h"
+#import "remoting/ios/facade/remoting_service.h"
+#import "remoting/ios/persistence/remoting_keychain.h"
+#import "remoting/ios/persistence/remoting_preferences.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/remoting/ios/session/remoting_client.mm b/remoting/ios/session/remoting_client.mm
index 3d21e936d..93726f44 100644
--- a/remoting/ios/session/remoting_client.mm
+++ b/remoting/ios/session/remoting_client.mm
@@ -8,7 +8,7 @@
#import <MaterialComponents/MaterialSnackbar.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/strings/sys_string_conversions.h"
#include "remoting/client/audio/audio_playback_stream.h"
diff --git a/remoting/protocol/audio_decode_scheduler.cc b/remoting/protocol/audio_decode_scheduler.cc
index 270fa4b..ff6e979 100644
--- a/remoting/protocol/audio_decode_scheduler.cc
+++ b/remoting/protocol/audio_decode_scheduler.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 "remoting/codec/audio_decoder.h"
diff --git a/remoting/protocol/audio_decode_scheduler_unittest.cc b/remoting/protocol/audio_decode_scheduler_unittest.cc
index 49769883..d17d745 100644
--- a/remoting/protocol/audio_decode_scheduler_unittest.cc
+++ b/remoting/protocol/audio_decode_scheduler_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/run_loop.h"
#include "base/test/task_environment.h"
#include "base/threading/thread.h"
diff --git a/remoting/protocol/audio_pump.cc b/remoting/protocol/audio_pump.cc
index 1617a17..be4fa89 100644
--- a/remoting/protocol/audio_pump.cc
+++ b/remoting/protocol/audio_pump.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/notreached.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/protocol/audio_reader.cc b/remoting/protocol/audio_reader.cc
index 57ee2ed..e6df2ec 100644
--- a/remoting/protocol/audio_reader.cc
+++ b/remoting/protocol/audio_reader.cc
@@ -4,8 +4,8 @@
#include "remoting/protocol/audio_reader.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "net/socket/stream_socket.h"
#include "remoting/base/compound_buffer.h"
#include "remoting/base/constants.h"
diff --git a/remoting/protocol/audio_source.h b/remoting/protocol/audio_source.h
index d5ba9848..a0aecd40 100644
--- a/remoting/protocol/audio_source.h
+++ b/remoting/protocol/audio_source.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
namespace remoting {
diff --git a/remoting/protocol/audio_stub.h b/remoting/protocol/audio_stub.h
index a136377..a8ec566 100644
--- a/remoting/protocol/audio_stub.h
+++ b/remoting/protocol/audio_stub.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
namespace remoting {
diff --git a/remoting/protocol/audio_writer.cc b/remoting/protocol/audio_writer.cc
index 70a2df1..b882379 100644
--- a/remoting/protocol/audio_writer.cc
+++ b/remoting/protocol/audio_writer.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "net/socket/stream_socket.h"
#include "remoting/base/compound_buffer.h"
diff --git a/remoting/protocol/audio_writer.h b/remoting/protocol/audio_writer.h
index bb8d225..512e15f8 100644
--- a/remoting/protocol/audio_writer.h
+++ b/remoting/protocol/audio_writer.h
@@ -8,8 +8,8 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "remoting/protocol/audio_stub.h"
#include "remoting/protocol/channel_dispatcher_base.h"
diff --git a/remoting/protocol/authenticator.h b/remoting/protocol/authenticator.h
index beda9ed..d283424 100644
--- a/remoting/protocol/authenticator.h
+++ b/remoting/protocol/authenticator.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
namespace jingle_xmpp {
class XmlElement;
diff --git a/remoting/protocol/authenticator_test_base.cc b/remoting/protocol/authenticator_test_base.cc
index 4db252b3..1f44e7c 100644
--- a/remoting/protocol/authenticator_test_base.cc
+++ b/remoting/protocol/authenticator_test_base.cc
@@ -8,9 +8,9 @@
#include <utility>
#include "base/base64.h"
-#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/test_timeouts.h"
#include "base/timer/timer.h"
diff --git a/remoting/protocol/capture_scheduler.cc b/remoting/protocol/capture_scheduler.cc
index c1b90d73..864a2fb 100644
--- a/remoting/protocol/capture_scheduler.cc
+++ b/remoting/protocol/capture_scheduler.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/system/sys_info.h"
#include "base/time/default_tick_clock.h"
#include "base/time/time.h"
diff --git a/remoting/protocol/capture_scheduler.h b/remoting/protocol/capture_scheduler.h
index a8765f0..f0d32bb 100644
--- a/remoting/protocol/capture_scheduler.h
+++ b/remoting/protocol/capture_scheduler.h
@@ -7,7 +7,7 @@
#include <stdint.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/threading/thread_checker.h"
#include "base/time/tick_clock.h"
diff --git a/remoting/protocol/capture_scheduler_unittest.cc b/remoting/protocol/capture_scheduler_unittest.cc
index 891259c7..e095f6a 100644
--- a/remoting/protocol/capture_scheduler_unittest.cc
+++ b/remoting/protocol/capture_scheduler_unittest.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/test/simple_test_tick_clock.h"
diff --git a/remoting/protocol/channel_authenticator.h b/remoting/protocol/channel_authenticator.h
index c9fcafe..121ec16a 100644
--- a/remoting/protocol/channel_authenticator.h
+++ b/remoting/protocol/channel_authenticator.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
namespace remoting::protocol {
diff --git a/remoting/protocol/channel_dispatcher_base.cc b/remoting/protocol/channel_dispatcher_base.cc
index e3041b0..4b6ebc329 100644
--- a/remoting/protocol/channel_dispatcher_base.cc
+++ b/remoting/protocol/channel_dispatcher_base.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "remoting/base/compound_buffer.h"
#include "remoting/protocol/message_channel_factory.h"
#include "remoting/protocol/message_pipe.h"
diff --git a/remoting/protocol/channel_dispatcher_base.h b/remoting/protocol/channel_dispatcher_base.h
index 95dd6de1..1b21fd32f 100644
--- a/remoting/protocol/channel_dispatcher_base.h
+++ b/remoting/protocol/channel_dispatcher_base.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "remoting/protocol/errors.h"
#include "remoting/protocol/message_pipe.h"
diff --git a/remoting/protocol/channel_multiplexer.cc b/remoting/protocol/channel_multiplexer.cc
index 6ddcc58..a678e9b 100644
--- a/remoting/protocol/channel_multiplexer.cc
+++ b/remoting/protocol/channel_multiplexer.cc
@@ -9,9 +9,9 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/sequence_checker.h"
diff --git a/remoting/protocol/channel_multiplexer_unittest.cc b/remoting/protocol/channel_multiplexer_unittest.cc
index 56cf658..d087e791 100644
--- a/remoting/protocol/channel_multiplexer_unittest.cc
+++ b/remoting/protocol/channel_multiplexer_unittest.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "base/barrier_closure.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/protocol/channel_socket_adapter.cc b/remoting/protocol/channel_socket_adapter.cc
index f948e64..921b002d 100644
--- a/remoting/protocol/channel_socket_adapter.cc
+++ b/remoting/protocol/channel_socket_adapter.cc
@@ -6,7 +6,7 @@
#include <limits>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
diff --git a/remoting/protocol/channel_socket_adapter.h b/remoting/protocol/channel_socket_adapter.h
index 617f125..d43d5914 100644
--- a/remoting/protocol/channel_socket_adapter.h
+++ b/remoting/protocol/channel_socket_adapter.h
@@ -7,8 +7,8 @@
#include <stddef.h>
-#include "base/callback_forward.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/threading/thread_checker.h"
#include "net/base/net_errors.h"
diff --git a/remoting/protocol/channel_socket_adapter_unittest.cc b/remoting/protocol/channel_socket_adapter_unittest.cc
index 31422ec..6be3ed69 100644
--- a/remoting/protocol/channel_socket_adapter_unittest.cc
+++ b/remoting/protocol/channel_socket_adapter_unittest.cc
@@ -9,7 +9,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ref_counted.h"
#include "base/test/task_environment.h"
#include "net/base/io_buffer.h"
diff --git a/remoting/protocol/chromium_socket_factory.cc b/remoting/protocol/chromium_socket_factory.cc
index 088c006..bcdbe40 100644
--- a/remoting/protocol/chromium_socket_factory.cc
+++ b/remoting/protocol/chromium_socket_factory.cc
@@ -10,7 +10,7 @@
#include <memory>
#include <string>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/rand_util.h"
#include "base/time/time.h"
diff --git a/remoting/protocol/client_authentication_config.h b/remoting/protocol/client_authentication_config.h
index 3f316bc..190e90aa 100644
--- a/remoting/protocol/client_authentication_config.h
+++ b/remoting/protocol/client_authentication_config.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "remoting/protocol/token_validator.h"
namespace remoting::protocol {
diff --git a/remoting/protocol/client_control_dispatcher.cc b/remoting/protocol/client_control_dispatcher.cc
index aa5660b..d2387bf 100644
--- a/remoting/protocol/client_control_dispatcher.cc
+++ b/remoting/protocol/client_control_dispatcher.cc
@@ -6,8 +6,8 @@
#include <stdint.h>
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "net/socket/stream_socket.h"
#include "remoting/base/compound_buffer.h"
#include "remoting/base/constants.h"
diff --git a/remoting/protocol/client_video_dispatcher.cc b/remoting/protocol/client_video_dispatcher.cc
index e7f22c6..d81c9e9 100644
--- a/remoting/protocol/client_video_dispatcher.cc
+++ b/remoting/protocol/client_video_dispatcher.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/socket/stream_socket.h"
#include "remoting/base/compound_buffer.h"
#include "remoting/base/constants.h"
diff --git a/remoting/protocol/client_video_dispatcher_unittest.cc b/remoting/protocol/client_video_dispatcher_unittest.cc
index 9d145951..9230122 100644
--- a/remoting/protocol/client_video_dispatcher_unittest.cc
+++ b/remoting/protocol/client_video_dispatcher_unittest.cc
@@ -8,7 +8,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
diff --git a/remoting/protocol/client_video_stats_dispatcher.cc b/remoting/protocol/client_video_stats_dispatcher.cc
index 75afb8d..6bc9d39 100644
--- a/remoting/protocol/client_video_stats_dispatcher.cc
+++ b/remoting/protocol/client_video_stats_dispatcher.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/socket/stream_socket.h"
#include "remoting/base/compound_buffer.h"
#include "remoting/proto/video_stats.pb.h"
diff --git a/remoting/protocol/clipboard_thread_proxy.cc b/remoting/protocol/clipboard_thread_proxy.cc
index 8287e3e77..0845a43 100644
--- a/remoting/protocol/clipboard_thread_proxy.cc
+++ b/remoting/protocol/clipboard_thread_proxy.cc
@@ -4,7 +4,7 @@
#include "remoting/protocol/clipboard_thread_proxy.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "remoting/proto/event.pb.h"
namespace remoting::protocol {
diff --git a/remoting/protocol/connection_tester.cc b/remoting/protocol/connection_tester.cc
index 406ef4a..222b6ab 100644
--- a/remoting/protocol/connection_tester.cc
+++ b/remoting/protocol/connection_tester.cc
@@ -5,7 +5,7 @@
#include "remoting/protocol/connection_tester.h"
#include "base/memory/raw_ptr.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
diff --git a/remoting/protocol/connection_tester.h b/remoting/protocol/connection_tester.h
index 14c962ed..bb1e49a 100644
--- a/remoting/protocol/connection_tester.h
+++ b/remoting/protocol/connection_tester.h
@@ -8,7 +8,7 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/run_loop.h"
diff --git a/remoting/protocol/connection_unittest.cc b/remoting/protocol/connection_unittest.cc
index 6ecfc5f8..51ba44d 100644
--- a/remoting/protocol/connection_unittest.cc
+++ b/remoting/protocol/connection_unittest.cc
@@ -5,7 +5,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/numerics/math_constants.h"
diff --git a/remoting/protocol/data_channel_manager.h b/remoting/protocol/data_channel_manager.h
index 9f92b23d..5ed6248 100644
--- a/remoting/protocol/data_channel_manager.h
+++ b/remoting/protocol/data_channel_manager.h
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
namespace remoting::protocol {
diff --git a/remoting/protocol/data_channel_manager_unittest.cc b/remoting/protocol/data_channel_manager_unittest.cc
index c189580..a6e0c5d 100644
--- a/remoting/protocol/data_channel_manager_unittest.cc
+++ b/remoting/protocol/data_channel_manager_unittest.cc
@@ -7,7 +7,7 @@
#include <map>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "remoting/base/compound_buffer.h"
diff --git a/remoting/protocol/datagram_channel_factory.h b/remoting/protocol/datagram_channel_factory.h
index 4c5bb17b..cc2f3ac 100644
--- a/remoting/protocol/datagram_channel_factory.h
+++ b/remoting/protocol/datagram_channel_factory.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
namespace remoting::protocol {
diff --git a/remoting/protocol/desktop_capturer.h b/remoting/protocol/desktop_capturer.h
index c55a6967..328d25b 100644
--- a/remoting/protocol/desktop_capturer.h
+++ b/remoting/protocol/desktop_capturer.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_PROTOCOL_DESKTOP_CAPTURER_H_
#define REMOTING_PROTOCOL_DESKTOP_CAPTURER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_capture_metadata.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
#include "third_party/webrtc/modules/desktop_capture/mouse_cursor.h"
diff --git a/remoting/protocol/fake_audio_source.h b/remoting/protocol/fake_audio_source.h
index ed5c5424..32f04591 100644
--- a/remoting/protocol/fake_audio_source.h
+++ b/remoting/protocol/fake_audio_source.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_PROTOCOL_FAKE_AUDIO_SOURCE_H_
#define REMOTING_PROTOCOL_FAKE_AUDIO_SOURCE_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "remoting/protocol/audio_source.h"
namespace remoting::protocol {
diff --git a/remoting/protocol/fake_authenticator.cc b/remoting/protocol/fake_authenticator.cc
index 721f4bf2..bdae83e 100644
--- a/remoting/protocol/fake_authenticator.cc
+++ b/remoting/protocol/fake_authenticator.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "base/base64.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/rand_util.h"
#include "base/strings/string_number_conversions.h"
#include "net/base/io_buffer.h"
diff --git a/remoting/protocol/fake_authenticator.h b/remoting/protocol/fake_authenticator.h
index ee15d967..66ef3ec4 100644
--- a/remoting/protocol/fake_authenticator.h
+++ b/remoting/protocol/fake_authenticator.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_PROTOCOL_FAKE_AUTHENTICATOR_H_
#define REMOTING_PROTOCOL_FAKE_AUTHENTICATOR_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "remoting/protocol/authenticator.h"
#include "remoting/protocol/channel_authenticator.h"
diff --git a/remoting/protocol/fake_connection_to_client.h b/remoting/protocol/fake_connection_to_client.h
index 6056d6b..f903b91 100644
--- a/remoting/protocol/fake_connection_to_client.h
+++ b/remoting/protocol/fake_connection_to_client.h
@@ -7,7 +7,7 @@
#include <stdint.h>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/remoting/protocol/fake_datagram_socket.cc b/remoting/protocol/fake_datagram_socket.cc
index ef88bb96..50da799 100644
--- a/remoting/protocol/fake_datagram_socket.cc
+++ b/remoting/protocol/fake_datagram_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/base/address_list.h"
diff --git a/remoting/protocol/fake_desktop_capturer.cc b/remoting/protocol/fake_desktop_capturer.cc
index d6cff23..60c96268 100644
--- a/remoting/protocol/fake_desktop_capturer.cc
+++ b/remoting/protocol/fake_desktop_capturer.cc
@@ -8,8 +8,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/notreached.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
diff --git a/remoting/protocol/fake_desktop_capturer.h b/remoting/protocol/fake_desktop_capturer.h
index dea6394..1ecb0fa 100644
--- a/remoting/protocol/fake_desktop_capturer.h
+++ b/remoting/protocol/fake_desktop_capturer.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "remoting/protocol/desktop_capturer.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
diff --git a/remoting/protocol/fake_message_pipe.cc b/remoting/protocol/fake_message_pipe.cc
index 01828f17..e6658f8d 100644
--- a/remoting/protocol/fake_message_pipe.cc
+++ b/remoting/protocol/fake_message_pipe.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
#include "remoting/base/compound_buffer.h"
diff --git a/remoting/protocol/fake_message_pipe_wrapper.cc b/remoting/protocol/fake_message_pipe_wrapper.cc
index aa879d6..645957d 100644
--- a/remoting/protocol/fake_message_pipe_wrapper.cc
+++ b/remoting/protocol/fake_message_pipe_wrapper.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/callback.h"
#include "base/check.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "remoting/base/compound_buffer.h"
#include "remoting/protocol/fake_message_pipe.h"
diff --git a/remoting/protocol/fake_session.cc b/remoting/protocol/fake_session.cc
index 14c8e26..1cc3c9f 100644
--- a/remoting/protocol/fake_session.cc
+++ b/remoting/protocol/fake_session.cc
@@ -6,8 +6,8 @@
#include <memory>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
#include "remoting/protocol/fake_authenticator.h"
diff --git a/remoting/protocol/fake_stream_socket.cc b/remoting/protocol/fake_stream_socket.cc
index 5a4ec6b9..23a91a1 100644
--- a/remoting/protocol/fake_stream_socket.cc
+++ b/remoting/protocol/fake_stream_socket.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
#include "net/base/address_list.h"
diff --git a/remoting/protocol/fake_video_renderer.cc b/remoting/protocol/fake_video_renderer.cc
index 13c3ded..dff8612 100644
--- a/remoting/protocol/fake_video_renderer.cc
+++ b/remoting/protocol/fake_video_renderer.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/callback.h"
#include "base/check.h"
+#include "base/functional/callback.h"
#include "remoting/proto/video.pb.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
diff --git a/remoting/protocol/fake_video_renderer.h b/remoting/protocol/fake_video_renderer.h
index 04ad3e07..14a4a05 100644
--- a/remoting/protocol/fake_video_renderer.h
+++ b/remoting/protocol/fake_video_renderer.h
@@ -8,7 +8,7 @@
#include <list>
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/threading/thread_checker.h"
#include "remoting/protocol/frame_consumer.h"
#include "remoting/protocol/frame_stats.h"
diff --git a/remoting/protocol/frame_consumer.h b/remoting/protocol/frame_consumer.h
index b807232..8248044 100644
--- a/remoting/protocol/frame_consumer.h
+++ b/remoting/protocol/frame_consumer.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
namespace webrtc {
class DesktopFrame;
diff --git a/remoting/protocol/host_control_dispatcher.cc b/remoting/protocol/host_control_dispatcher.cc
index 159e359..c0b2d4b 100644
--- a/remoting/protocol/host_control_dispatcher.cc
+++ b/remoting/protocol/host_control_dispatcher.cc
@@ -4,7 +4,7 @@
#include "remoting/protocol/host_control_dispatcher.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "net/socket/stream_socket.h"
#include "remoting/base/compound_buffer.h"
#include "remoting/base/constants.h"
diff --git a/remoting/protocol/host_video_dispatcher.cc b/remoting/protocol/host_video_dispatcher.cc
index 6296dc2..92673ba 100644
--- a/remoting/protocol/host_video_dispatcher.cc
+++ b/remoting/protocol/host_video_dispatcher.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "net/socket/stream_socket.h"
#include "remoting/base/compound_buffer.h"
#include "remoting/base/constants.h"
diff --git a/remoting/protocol/host_video_stats_dispatcher.cc b/remoting/protocol/host_video_stats_dispatcher.cc
index e08a871..55bffa5 100644
--- a/remoting/protocol/host_video_stats_dispatcher.cc
+++ b/remoting/protocol/host_video_stats_dispatcher.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "net/socket/stream_socket.h"
#include "remoting/base/compound_buffer.h"
#include "remoting/base/constants.h"
diff --git a/remoting/protocol/ice_config_request.h b/remoting/protocol/ice_config_request.h
index 1cc046e..66e4663 100644
--- a/remoting/protocol/ice_config_request.h
+++ b/remoting/protocol/ice_config_request.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_PROTOCOL_ICE_CONFIG_REQUEST_H_
#define REMOTING_PROTOCOL_ICE_CONFIG_REQUEST_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
namespace remoting::protocol {
diff --git a/remoting/protocol/ice_connection_to_client.cc b/remoting/protocol/ice_connection_to_client.cc
index a481377..8861a215 100644
--- a/remoting/protocol/ice_connection_to_client.cc
+++ b/remoting/protocol/ice_connection_to_client.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/task/single_thread_task_runner.h"
diff --git a/remoting/protocol/ice_connection_to_host.cc b/remoting/protocol/ice_connection_to_host.cc
index 18b2b3c5..fc335d6 100644
--- a/remoting/protocol/ice_connection_to_host.cc
+++ b/remoting/protocol/ice_connection_to_host.cc
@@ -7,8 +7,8 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
#include "remoting/base/constants.h"
diff --git a/remoting/protocol/ice_connection_to_host.h b/remoting/protocol/ice_connection_to_host.h
index 14741ed..f4e2fc88 100644
--- a/remoting/protocol/ice_connection_to_host.h
+++ b/remoting/protocol/ice_connection_to_host.h
@@ -9,7 +9,7 @@
#include <set>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/sequence_checker.h"
diff --git a/remoting/protocol/ice_transport.cc b/remoting/protocol/ice_transport.cc
index 7dd85e5..da03ff7a 100644
--- a/remoting/protocol/ice_transport.cc
+++ b/remoting/protocol/ice_transport.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "remoting/protocol/channel_authenticator.h"
#include "remoting/protocol/channel_multiplexer.h"
#include "remoting/protocol/pseudotcp_channel_factory.h"
diff --git a/remoting/protocol/ice_transport_channel.cc b/remoting/protocol/ice_transport_channel.cc
index f162406..cb91858ff 100644
--- a/remoting/protocol/ice_transport_channel.cc
+++ b/remoting/protocol/ice_transport_channel.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/task/single_thread_task_runner.h"
#include "components/webrtc/net_address_utils.h"
#include "net/base/net_errors.h"
diff --git a/remoting/protocol/ice_transport_channel.h b/remoting/protocol/ice_transport_channel.h
index 8f62d61..eba6f7f 100644
--- a/remoting/protocol/ice_transport_channel.h
+++ b/remoting/protocol/ice_transport_channel.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/threading/thread_checker.h"
#include "base/timer/timer.h"
diff --git a/remoting/protocol/ice_transport_unittest.cc b/remoting/protocol/ice_transport_unittest.cc
index 78dada5..d722ec32 100644
--- a/remoting/protocol/ice_transport_unittest.cc
+++ b/remoting/protocol/ice_transport_unittest.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/run_loop.h"
diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc
index 2312461b..dc3e26f 100644
--- a/remoting/protocol/jingle_session.cc
+++ b/remoting/protocol/jingle_session.cc
@@ -10,8 +10,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/ranges/algorithm.h"
#include "base/strings/string_split.h"
diff --git a/remoting/protocol/jingle_session_manager.cc b/remoting/protocol/jingle_session_manager.cc
index a80df8d..66fafdb 100644
--- a/remoting/protocol/jingle_session_manager.cc
+++ b/remoting/protocol/jingle_session_manager.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "remoting/protocol/authenticator.h"
#include "remoting/protocol/content_description.h"
#include "remoting/protocol/jingle_messages.h"
diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc
index 89336f2..3c38ffa 100644
--- a/remoting/protocol/jingle_session_unittest.cc
+++ b/remoting/protocol/jingle_session_unittest.cc
@@ -8,7 +8,7 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
diff --git a/remoting/protocol/message_channel_factory.h b/remoting/protocol/message_channel_factory.h
index 282a015..7f7e1d3a 100644
--- a/remoting/protocol/message_channel_factory.h
+++ b/remoting/protocol/message_channel_factory.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
namespace remoting::protocol {
diff --git a/remoting/protocol/message_pipe.h b/remoting/protocol/message_pipe.h
index fb980600..65e8ecde 100644
--- a/remoting/protocol/message_pipe.h
+++ b/remoting/protocol/message_pipe.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
namespace google {
namespace protobuf {
diff --git a/remoting/protocol/message_reader.cc b/remoting/protocol/message_reader.cc
index 0706c45..c1ce0a8 100644
--- a/remoting/protocol/message_reader.cc
+++ b/remoting/protocol/message_reader.cc
@@ -6,9 +6,9 @@
#include <utility>
-#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/location.h"
#include "base/memory/ptr_util.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/protocol/message_reader.h b/remoting/protocol/message_reader.h
index 094105c5..a080515 100644
--- a/remoting/protocol/message_reader.h
+++ b/remoting/protocol/message_reader.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/sequence_checker.h"
diff --git a/remoting/protocol/message_reader_unittest.cc b/remoting/protocol/message_reader_unittest.cc
index a854d2c..1118179c 100644
--- a/remoting/protocol/message_reader_unittest.cc
+++ b/remoting/protocol/message_reader_unittest.cc
@@ -5,9 +5,9 @@
#include <memory>
#include <string>
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/run_loop.h"
#include "base/synchronization/waitable_event.h"
#include "base/test/task_environment.h"
diff --git a/remoting/protocol/monitored_video_stub.cc b/remoting/protocol/monitored_video_stub.cc
index 19aecd6..2c9aac48 100644
--- a/remoting/protocol/monitored_video_stub.cc
+++ b/remoting/protocol/monitored_video_stub.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "remoting/proto/video.pb.h"
namespace remoting::protocol {
diff --git a/remoting/protocol/monitored_video_stub.h b/remoting/protocol/monitored_video_stub.h
index a325895..46e09dd0 100644
--- a/remoting/protocol/monitored_video_stub.h
+++ b/remoting/protocol/monitored_video_stub.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_PROTOCOL_MONITORED_VIDEO_STUB_H_
#define REMOTING_PROTOCOL_MONITORED_VIDEO_STUB_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/threading/thread_checker.h"
#include "base/timer/timer.h"
diff --git a/remoting/protocol/monitored_video_stub_unittest.cc b/remoting/protocol/monitored_video_stub_unittest.cc
index 3722cd1a..ce4f8f57 100644
--- a/remoting/protocol/monitored_video_stub_unittest.cc
+++ b/remoting/protocol/monitored_video_stub_unittest.cc
@@ -9,7 +9,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/task_environment.h"
diff --git a/remoting/protocol/named_message_pipe_handler.h b/remoting/protocol/named_message_pipe_handler.h
index 071ceab..02a2883 100644
--- a/remoting/protocol/named_message_pipe_handler.h
+++ b/remoting/protocol/named_message_pipe_handler.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/task/sequenced_task_runner_helpers.h"
#include "base/threading/thread_checker.h"
#include "remoting/protocol/message_pipe.h"
diff --git a/remoting/protocol/negotiating_authenticator_base.cc b/remoting/protocol/negotiating_authenticator_base.cc
index ec59a69..74626427 100644
--- a/remoting/protocol/negotiating_authenticator_base.cc
+++ b/remoting/protocol/negotiating_authenticator_base.cc
@@ -8,9 +8,9 @@
#include <sstream>
#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/strings/string_split.h"
#include "remoting/base/constants.h"
#include "remoting/base/name_value_map.h"
diff --git a/remoting/protocol/negotiating_authenticator_unittest.cc b/remoting/protocol/negotiating_authenticator_unittest.cc
index 0b84b0c0..7d9c2ab 100644
--- a/remoting/protocol/negotiating_authenticator_unittest.cc
+++ b/remoting/protocol/negotiating_authenticator_unittest.cc
@@ -4,7 +4,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/raw_ptr.h"
#include "base/ranges/algorithm.h"
#include "base/run_loop.h"
diff --git a/remoting/protocol/negotiating_client_authenticator.cc b/remoting/protocol/negotiating_client_authenticator.cc
index 15ec6f81..a96780a 100644
--- a/remoting/protocol/negotiating_client_authenticator.cc
+++ b/remoting/protocol/negotiating_client_authenticator.cc
@@ -8,10 +8,10 @@
#include <sstream>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check_op.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/memory/ptr_util.h"
#include "base/notreached.h"
#include "base/strings/string_split.h"
diff --git a/remoting/protocol/negotiating_host_authenticator.cc b/remoting/protocol/negotiating_host_authenticator.cc
index bd84eaa..3b6c5410 100644
--- a/remoting/protocol/negotiating_host_authenticator.cc
+++ b/remoting/protocol/negotiating_host_authenticator.cc
@@ -8,10 +8,10 @@
#include <sstream>
#include <utility>
-#include "base/bind.h"
-#include "base/callback.h"
#include "base/check_op.h"
#include "base/containers/contains.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/notreached.h"
#include "base/strings/string_split.h"
#include "remoting/base/rsa_key_pair.h"
diff --git a/remoting/protocol/observing_input_filter.h b/remoting/protocol/observing_input_filter.h
index dc58e99..e74f9492 100644
--- a/remoting/protocol/observing_input_filter.h
+++ b/remoting/protocol/observing_input_filter.h
@@ -7,7 +7,7 @@
#include <functional>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "remoting/proto/event.pb.h"
#include "remoting/protocol/input_filter.h"
#include "third_party/abseil-cpp/absl/types/variant.h"
diff --git a/remoting/protocol/pairing_authenticator_base.cc b/remoting/protocol/pairing_authenticator_base.cc
index 6022ede..9f7fd75 100644
--- a/remoting/protocol/pairing_authenticator_base.cc
+++ b/remoting/protocol/pairing_authenticator_base.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/logging.h"
#include "remoting/base/constants.h"
#include "remoting/protocol/channel_authenticator.h"
diff --git a/remoting/protocol/pairing_client_authenticator.cc b/remoting/protocol/pairing_client_authenticator.cc
index 39612cb..d07160f 100644
--- a/remoting/protocol/pairing_client_authenticator.cc
+++ b/remoting/protocol/pairing_client_authenticator.cc
@@ -4,8 +4,8 @@
#include "remoting/protocol/pairing_client_authenticator.h"
-#include "base/bind.h"
#include "base/check.h"
+#include "base/functional/bind.h"
#include "remoting/base/constants.h"
#include "remoting/protocol/auth_util.h"
#include "remoting/protocol/channel_authenticator.h"
diff --git a/remoting/protocol/pairing_host_authenticator.cc b/remoting/protocol/pairing_host_authenticator.cc
index 71a41d8..0b6682a 100644
--- a/remoting/protocol/pairing_host_authenticator.cc
+++ b/remoting/protocol/pairing_host_authenticator.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "remoting/base/constants.h"
#include "remoting/protocol/channel_authenticator.h"
diff --git a/remoting/protocol/pairing_registry.cc b/remoting/protocol/pairing_registry.cc
index 4d9ff094..40b65f9 100644
--- a/remoting/protocol/pairing_registry.cc
+++ b/remoting/protocol/pairing_registry.cc
@@ -9,7 +9,7 @@
#include <utility>
#include "base/base64.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/guid.h"
#include "base/json/json_string_value_serializer.h"
#include "base/location.h"
diff --git a/remoting/protocol/pairing_registry.h b/remoting/protocol/pairing_registry.h
index e367f1a1..ae67252 100644
--- a/remoting/protocol/pairing_registry.h
+++ b/remoting/protocol/pairing_registry.h
@@ -10,8 +10,8 @@
#include <string>
#include <vector>
-#include "base/callback.h"
#include "base/containers/queue.h"
+#include "base/functional/callback.h"
#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
#include "base/time/time.h"
diff --git a/remoting/protocol/pairing_registry_unittest.cc b/remoting/protocol/pairing_registry_unittest.cc
index 3b36302a..94a63f1f 100644
--- a/remoting/protocol/pairing_registry_unittest.cc
+++ b/remoting/protocol/pairing_registry_unittest.cc
@@ -9,8 +9,8 @@
#include <algorithm>
#include <utility>
-#include "base/bind.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/task/single_thread_task_runner.h"
#include "base/test/task_environment.h"
diff --git a/remoting/protocol/performance_tracker.cc b/remoting/protocol/performance_tracker.cc
index 3a97f3d..4b2eb59 100644
--- a/remoting/protocol/performance_tracker.cc
+++ b/remoting/protocol/performance_tracker.cc
@@ -4,7 +4,7 @@
#include "remoting/protocol/performance_tracker.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/time/time.h"
#include "remoting/protocol/frame_stats.h"
diff --git a/remoting/protocol/port_allocator.cc b/remoting/protocol/port_allocator.cc
index 834bb4c..1e737692 100644
--- a/remoting/protocol/port_allocator.cc
+++ b/remoting/protocol/port_allocator.cc
@@ -7,8 +7,8 @@
#include <algorithm>
#include <map>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "remoting/protocol/network_settings.h"
#include "remoting/protocol/transport_context.h"
#include "third_party/abseil-cpp/absl/strings/string_view.h"
diff --git a/remoting/protocol/pseudotcp_adapter.cc b/remoting/protocol/pseudotcp_adapter.cc
index 090764be..2439a1a8 100644
--- a/remoting/protocol/pseudotcp_adapter.cc
+++ b/remoting/protocol/pseudotcp_adapter.cc
@@ -8,8 +8,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/compiler_specific.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
diff --git a/remoting/protocol/pseudotcp_adapter_unittest.cc b/remoting/protocol/pseudotcp_adapter_unittest.cc
index 6e40921..5b5bc1cb 100644
--- a/remoting/protocol/pseudotcp_adapter_unittest.cc
+++ b/remoting/protocol/pseudotcp_adapter_unittest.cc
@@ -8,10 +8,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/compiler_specific.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/ptr_util.h"
#include "base/memory/raw_ptr.h"
diff --git a/remoting/protocol/pseudotcp_channel_factory.cc b/remoting/protocol/pseudotcp_channel_factory.cc
index fa4807b..10c9428 100644
--- a/remoting/protocol/pseudotcp_channel_factory.cc
+++ b/remoting/protocol/pseudotcp_channel_factory.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "net/base/net_errors.h"
#include "remoting/base/constants.h"
#include "remoting/protocol/datagram_channel_factory.h"
diff --git a/remoting/protocol/rejecting_authenticator.cc b/remoting/protocol/rejecting_authenticator.cc
index a450e52..c39123c7a 100644
--- a/remoting/protocol/rejecting_authenticator.cc
+++ b/remoting/protocol/rejecting_authenticator.cc
@@ -4,8 +4,8 @@
#include "remoting/protocol/rejecting_authenticator.h"
-#include "base/callback.h"
#include "base/check_op.h"
+#include "base/functional/callback.h"
#include "base/notreached.h"
#include "remoting/protocol/channel_authenticator.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
diff --git a/remoting/protocol/remoting_ice_config_request.cc b/remoting/protocol/remoting_ice_config_request.cc
index aea2773..9ed5e18b 100644
--- a/remoting/protocol/remoting_ice_config_request.cc
+++ b/remoting/protocol/remoting_ice_config_request.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
#include "google_apis/google_api_keys.h"
diff --git a/remoting/protocol/remoting_ice_config_request.h b/remoting/protocol/remoting_ice_config_request.h
index 1de6b873..b86e4de 100644
--- a/remoting/protocol/remoting_ice_config_request.h
+++ b/remoting/protocol/remoting_ice_config_request.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "remoting/base/protobuf_http_client.h"
#include "remoting/protocol/ice_config_request.h"
diff --git a/remoting/protocol/remoting_ice_config_request_unittest.cc b/remoting/protocol/remoting_ice_config_request_unittest.cc
index ae2b1b4..0ad1418 100644
--- a/remoting/protocol/remoting_ice_config_request_unittest.cc
+++ b/remoting/protocol/remoting_ice_config_request_unittest.cc
@@ -4,7 +4,7 @@
#include "remoting/protocol/remoting_ice_config_request.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/test/mock_callback.h"
#include "base/test/task_environment.h"
#include "remoting/base/protobuf_http_status.h"
diff --git a/remoting/protocol/secure_channel_factory.cc b/remoting/protocol/secure_channel_factory.cc
index 43aa774..d53de73 100644
--- a/remoting/protocol/secure_channel_factory.cc
+++ b/remoting/protocol/secure_channel_factory.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "remoting/protocol/authenticator.h"
#include "remoting/protocol/channel_authenticator.h"
#include "remoting/protocol/p2p_stream_socket.h"
diff --git a/remoting/protocol/session_manager.h b/remoting/protocol/session_manager.h
index 2be5f00..753535d 100644
--- a/remoting/protocol/session_manager.h
+++ b/remoting/protocol/session_manager.h
@@ -55,7 +55,7 @@
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "remoting/protocol/session.h"
namespace remoting {
diff --git a/remoting/protocol/spake2_authenticator_unittest.cc b/remoting/protocol/spake2_authenticator_unittest.cc
index 082c82ac..ec87d84 100644
--- a/remoting/protocol/spake2_authenticator_unittest.cc
+++ b/remoting/protocol/spake2_authenticator_unittest.cc
@@ -4,8 +4,8 @@
#include "remoting/protocol/spake2_authenticator.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 "remoting/base/rsa_key_pair.h"
#include "remoting/protocol/authenticator_test_base.h"
diff --git a/remoting/protocol/ssl_hmac_channel_authenticator.cc b/remoting/protocol/ssl_hmac_channel_authenticator.cc
index fe7713b6..43ea4b7 100644
--- a/remoting/protocol/ssl_hmac_channel_authenticator.cc
+++ b/remoting/protocol/ssl_hmac_channel_authenticator.cc
@@ -8,8 +8,8 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "build/build_config.h"
#include "crypto/secure_util.h"
diff --git a/remoting/protocol/ssl_hmac_channel_authenticator.h b/remoting/protocol/ssl_hmac_channel_authenticator.h
index fd3322f9..bf393b0 100644
--- a/remoting/protocol/ssl_hmac_channel_authenticator.h
+++ b/remoting/protocol/ssl_hmac_channel_authenticator.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/sequence_checker.h"
#include "remoting/protocol/channel_authenticator.h"
diff --git a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
index 2d9cc12..97e490a 100644
--- a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
+++ b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
@@ -8,9 +8,9 @@
#include <utility>
#include "base/base64.h"
-#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "base/test/test_timeouts.h"
diff --git a/remoting/protocol/stream_channel_factory.h b/remoting/protocol/stream_channel_factory.h
index c09fecd2..3c832e6 100644
--- a/remoting/protocol/stream_channel_factory.h
+++ b/remoting/protocol/stream_channel_factory.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/sequence_checker.h"
namespace remoting::protocol {
diff --git a/remoting/protocol/stream_message_pipe_adapter.cc b/remoting/protocol/stream_message_pipe_adapter.cc
index 22c2ee9..1c2c01f 100644
--- a/remoting/protocol/stream_message_pipe_adapter.cc
+++ b/remoting/protocol/stream_message_pipe_adapter.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/traffic_annotation/network_traffic_annotation.h"
#include "remoting/base/buffered_socket_writer.h"
diff --git a/remoting/protocol/stream_message_pipe_adapter.h b/remoting/protocol/stream_message_pipe_adapter.h
index 675c8423..3d03627 100644
--- a/remoting/protocol/stream_message_pipe_adapter.h
+++ b/remoting/protocol/stream_message_pipe_adapter.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_PROTOCOL_STREAM_MESSAGE_PIPE_ADAPTER_H_
#define REMOTING_PROTOCOL_STREAM_MESSAGE_PIPE_ADAPTER_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "remoting/protocol/message_channel_factory.h"
#include "remoting/protocol/message_pipe.h"
diff --git a/remoting/protocol/stream_packet_socket.cc b/remoting/protocol/stream_packet_socket.cc
index f653fe0..d8641baa 100644
--- a/remoting/protocol/stream_packet_socket.cc
+++ b/remoting/protocol/stream_packet_socket.cc
@@ -4,7 +4,7 @@
#include "remoting/protocol/stream_packet_socket.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "components/webrtc/net_address_utils.h"
#include "net/base/address_list.h"
#include "net/base/io_buffer.h"
diff --git a/remoting/protocol/third_party_authenticator_base.cc b/remoting/protocol/third_party_authenticator_base.cc
index 76b42594..afdb461 100644
--- a/remoting/protocol/third_party_authenticator_base.cc
+++ b/remoting/protocol/third_party_authenticator_base.cc
@@ -5,9 +5,9 @@
#include "remoting/protocol/third_party_authenticator_base.h"
#include "base/base64.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 "remoting/base/constants.h"
#include "remoting/base/rsa_key_pair.h"
#include "remoting/protocol/channel_authenticator.h"
diff --git a/remoting/protocol/third_party_authenticator_base.h b/remoting/protocol/third_party_authenticator_base.h
index 47092314..ca1c5914 100644
--- a/remoting/protocol/third_party_authenticator_base.h
+++ b/remoting/protocol/third_party_authenticator_base.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "remoting/protocol/authenticator.h"
#include "third_party/libjingle_xmpp/xmllite/qname.h"
diff --git a/remoting/protocol/third_party_authenticator_unittest.cc b/remoting/protocol/third_party_authenticator_unittest.cc
index 21bca70..3fd6cc7b 100644
--- a/remoting/protocol/third_party_authenticator_unittest.cc
+++ b/remoting/protocol/third_party_authenticator_unittest.cc
@@ -5,7 +5,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/remoting/protocol/third_party_client_authenticator.cc b/remoting/protocol/third_party_client_authenticator.cc
index cead0f4c..ea46b00c 100644
--- a/remoting/protocol/third_party_client_authenticator.cc
+++ b/remoting/protocol/third_party_client_authenticator.cc
@@ -7,8 +7,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/logging.h"
#include "remoting/base/constants.h"
#include "remoting/base/rsa_key_pair.h"
diff --git a/remoting/protocol/third_party_client_authenticator.h b/remoting/protocol/third_party_client_authenticator.h
index 88c59764..34737ad 100644
--- a/remoting/protocol/third_party_client_authenticator.h
+++ b/remoting/protocol/third_party_client_authenticator.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "remoting/protocol/client_authentication_config.h"
#include "remoting/protocol/third_party_authenticator_base.h"
diff --git a/remoting/protocol/third_party_host_authenticator.cc b/remoting/protocol/third_party_host_authenticator.cc
index fb0bd4c..46d0252 100644
--- a/remoting/protocol/third_party_host_authenticator.cc
+++ b/remoting/protocol/third_party_host_authenticator.cc
@@ -7,8 +7,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/logging.h"
#include "remoting/base/constants.h"
#include "remoting/protocol/token_validator.h"
diff --git a/remoting/protocol/third_party_host_authenticator.h b/remoting/protocol/third_party_host_authenticator.h
index 51048ca..64b3e80b 100644
--- a/remoting/protocol/third_party_host_authenticator.h
+++ b/remoting/protocol/third_party_host_authenticator.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "remoting/protocol/third_party_authenticator_base.h"
#include "remoting/protocol/token_validator.h"
diff --git a/remoting/protocol/token_validator.h b/remoting/protocol/token_validator.h
index 1c74ded..56cd5a5 100644
--- a/remoting/protocol/token_validator.h
+++ b/remoting/protocol/token_validator.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/ref_counted.h"
#include "remoting/base/result.h"
#include "remoting/protocol/authenticator.h"
diff --git a/remoting/protocol/transport.h b/remoting/protocol/transport.h
index 017dd21..f77bc18 100644
--- a/remoting/protocol/transport.h
+++ b/remoting/protocol/transport.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "net/base/ip_endpoint.h"
#include "remoting/protocol/errors.h"
diff --git a/remoting/protocol/transport_context.cc b/remoting/protocol/transport_context.cc
index b5ebdc158..1cb5006 100644
--- a/remoting/protocol/transport_context.cc
+++ b/remoting/protocol/transport_context.cc
@@ -7,7 +7,7 @@
#include <sstream>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
#include "build/build_config.h"
diff --git a/remoting/protocol/v2_authenticator_unittest.cc b/remoting/protocol/v2_authenticator_unittest.cc
index 8256e73..1c2ac55 100644
--- a/remoting/protocol/v2_authenticator_unittest.cc
+++ b/remoting/protocol/v2_authenticator_unittest.cc
@@ -4,8 +4,8 @@
#include "remoting/protocol/v2_authenticator.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/net_errors.h"
#include "remoting/base/rsa_key_pair.h"
diff --git a/remoting/protocol/validating_authenticator.cc b/remoting/protocol/validating_authenticator.cc
index d3b4723..e188bed 100644
--- a/remoting/protocol/validating_authenticator.cc
+++ b/remoting/protocol/validating_authenticator.cc
@@ -8,9 +8,9 @@
#include <string>
#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/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "remoting/protocol/authenticator.h"
diff --git a/remoting/protocol/validating_authenticator.h b/remoting/protocol/validating_authenticator.h
index 1b82cff..2e8290f 100644
--- a/remoting/protocol/validating_authenticator.h
+++ b/remoting/protocol/validating_authenticator.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "remoting/protocol/authenticator.h"
diff --git a/remoting/protocol/validating_authenticator_unittest.cc b/remoting/protocol/validating_authenticator_unittest.cc
index 1198642..28f5bb59 100644
--- a/remoting/protocol/validating_authenticator_unittest.cc
+++ b/remoting/protocol/validating_authenticator_unittest.cc
@@ -7,8 +7,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/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/remoting/protocol/video_frame_pump.cc b/remoting/protocol/video_frame_pump.cc
index b981bf1..8537990 100644
--- a/remoting/protocol/video_frame_pump.cc
+++ b/remoting/protocol/video_frame_pump.cc
@@ -8,9 +8,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/task/single_thread_task_runner.h"
#include "base/time/time.h"
#include "remoting/base/constants.h"
diff --git a/remoting/protocol/video_frame_pump_unittest.cc b/remoting/protocol/video_frame_pump_unittest.cc
index f23ae9da..2936b76 100644
--- a/remoting/protocol/video_frame_pump_unittest.cc
+++ b/remoting/protocol/video_frame_pump_unittest.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/run_loop.h"
diff --git a/remoting/protocol/video_stub.h b/remoting/protocol/video_stub.h
index 0d01caf5..d501be0 100644
--- a/remoting/protocol/video_stub.h
+++ b/remoting/protocol/video_stub.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
namespace remoting {
diff --git a/remoting/protocol/webrtc_audio_module.cc b/remoting/protocol/webrtc_audio_module.cc
index 1420e5ea..56a5155 100644
--- a/remoting/protocol/webrtc_audio_module.cc
+++ b/remoting/protocol/webrtc_audio_module.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/single_thread_task_runner.h"
#include "base/timer/timer.h"
diff --git a/remoting/protocol/webrtc_audio_sink_adapter.cc b/remoting/protocol/webrtc_audio_sink_adapter.cc
index 0325d26..67b378e 100644
--- a/remoting/protocol/webrtc_audio_sink_adapter.cc
+++ b/remoting/protocol/webrtc_audio_sink_adapter.cc
@@ -4,9 +4,9 @@
#include "remoting/protocol/webrtc_audio_sink_adapter.h"
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/task/single_thread_task_runner.h"
#include "remoting/proto/audio.pb.h"
diff --git a/remoting/protocol/webrtc_audio_source_adapter.cc b/remoting/protocol/webrtc_audio_source_adapter.cc
index 9f29f115..0a3c12c 100644
--- a/remoting/protocol/webrtc_audio_source_adapter.cc
+++ b/remoting/protocol/webrtc_audio_source_adapter.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/bind.h"
#include "base/check_op.h"
+#include "base/functional/bind.h"
#include "base/observer_list.h"
#include "base/synchronization/lock.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/protocol/webrtc_connection_to_client.cc b/remoting/protocol/webrtc_connection_to_client.cc
index 76e90f699..32cd84e8 100644
--- a/remoting/protocol/webrtc_connection_to_client.cc
+++ b/remoting/protocol/webrtc_connection_to_client.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/remoting/protocol/webrtc_data_stream_adapter.cc b/remoting/protocol/webrtc_data_stream_adapter.cc
index 7b2f6ce..dfd45af 100644
--- a/remoting/protocol/webrtc_data_stream_adapter.cc
+++ b/remoting/protocol/webrtc_data_stream_adapter.cc
@@ -7,9 +7,9 @@
#include <stdint.h>
#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/location.h"
#include "base/memory/ptr_util.h"
#include "base/task/sequenced_task_runner.h"
diff --git a/remoting/protocol/webrtc_data_stream_adapter.h b/remoting/protocol/webrtc_data_stream_adapter.h
index b25948e..8450393 100644
--- a/remoting/protocol/webrtc_data_stream_adapter.h
+++ b/remoting/protocol/webrtc_data_stream_adapter.h
@@ -8,8 +8,8 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/containers/queue.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "remoting/protocol/message_pipe.h"
diff --git a/remoting/protocol/webrtc_frame_scheduler.h b/remoting/protocol/webrtc_frame_scheduler.h
index 39a4ace..c4cf92e4 100644
--- a/remoting/protocol/webrtc_frame_scheduler.h
+++ b/remoting/protocol/webrtc_frame_scheduler.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_PROTOCOL_WEBRTC_FRAME_SCHEDULER_H_
#define REMOTING_PROTOCOL_WEBRTC_FRAME_SCHEDULER_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
namespace webrtc {
class DesktopFrame;
diff --git a/remoting/protocol/webrtc_frame_scheduler_unittest.cc b/remoting/protocol/webrtc_frame_scheduler_unittest.cc
index 87640f41..452be5b 100644
--- a/remoting/protocol/webrtc_frame_scheduler_unittest.cc
+++ b/remoting/protocol/webrtc_frame_scheduler_unittest.cc
@@ -6,7 +6,7 @@
#include "remoting/protocol/webrtc_frame_scheduler.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/test/task_environment.h"
#include "remoting/base/session_options.h"
#include "remoting/protocol/frame_stats.h"
diff --git a/remoting/protocol/webrtc_transport.cc b/remoting/protocol/webrtc_transport.cc
index 942b8c5..9f4d84e 100644
--- a/remoting/protocol/webrtc_transport.cc
+++ b/remoting/protocol/webrtc_transport.cc
@@ -11,8 +11,8 @@
#include <vector>
#include "base/base64.h"
-#include "base/bind.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/raw_ref.h"
diff --git a/remoting/protocol/webrtc_transport.h b/remoting/protocol/webrtc_transport.h
index 79c02df..94ff50d 100644
--- a/remoting/protocol/webrtc_transport.h
+++ b/remoting/protocol/webrtc_transport.h
@@ -10,7 +10,7 @@
#include <tuple>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
diff --git a/remoting/protocol/webrtc_transport_unittest.cc b/remoting/protocol/webrtc_transport_unittest.cc
index 7f08548..a5ef766 100644
--- a/remoting/protocol/webrtc_transport_unittest.cc
+++ b/remoting/protocol/webrtc_transport_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_util.h"
diff --git a/remoting/protocol/webrtc_video_encoder_wrapper.cc b/remoting/protocol/webrtc_video_encoder_wrapper.cc
index a7079c9..c602ac94 100644
--- a/remoting/protocol/webrtc_video_encoder_wrapper.cc
+++ b/remoting/protocol/webrtc_video_encoder_wrapper.cc
@@ -10,8 +10,8 @@
#include <string>
#include <vector>
-#include "base/bind.h"
#include "base/cxx17_backports.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/strings/string_number_conversions.h"
diff --git a/remoting/protocol/webrtc_video_renderer_adapter.cc b/remoting/protocol/webrtc_video_renderer_adapter.cc
index d29135a..e0908780 100644
--- a/remoting/protocol/webrtc_video_renderer_adapter.cc
+++ b/remoting/protocol/webrtc_video_renderer_adapter.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/location.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/remoting/protocol/webrtc_video_renderer_adapter.h b/remoting/protocol/webrtc_video_renderer_adapter.h
index 785e8ccc..18ae121 100644
--- a/remoting/protocol/webrtc_video_renderer_adapter.h
+++ b/remoting/protocol/webrtc_video_renderer_adapter.h
@@ -8,7 +8,7 @@
#include <list>
#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/remoting/protocol/webrtc_video_stream.cc b/remoting/protocol/webrtc_video_stream.cc
index 08f3196..e1e0f8e 100644
--- a/remoting/protocol/webrtc_video_stream.cc
+++ b/remoting/protocol/webrtc_video_stream.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/remoting/protocol/webrtc_video_track_source.cc b/remoting/protocol/webrtc_video_track_source.cc
index c86cbea4..16eceadc 100644
--- a/remoting/protocol/webrtc_video_track_source.cc
+++ b/remoting/protocol/webrtc_video_track_source.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/task/sequenced_task_runner.h"
#include "remoting/protocol/webrtc_video_frame_adapter.h"
diff --git a/remoting/protocol/webrtc_video_track_source.h b/remoting/protocol/webrtc_video_track_source.h
index d496c43..f71416e 100644
--- a/remoting/protocol/webrtc_video_track_source.h
+++ b/remoting/protocol/webrtc_video_track_source.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_PROTOCOL_WEBRTC_VIDEO_TRACK_SOURCE_H_
#define REMOTING_PROTOCOL_WEBRTC_VIDEO_TRACK_SOURCE_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/task/sequenced_task_runner.h"
#include "remoting/codec/webrtc_video_encoder.h"
diff --git a/remoting/protocol/webrtc_video_track_source_unittest.cc b/remoting/protocol/webrtc_video_track_source_unittest.cc
index 8a8736e..649f62a3e 100644
--- a/remoting/protocol/webrtc_video_track_source_unittest.cc
+++ b/remoting/protocol/webrtc_video_track_source_unittest.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/callback_helpers.h"
+#include "base/functional/callback_helpers.h"
#include "base/test/mock_callback.h"
#include "base/test/task_environment.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/remoting/signaling/delegating_signal_strategy.cc b/remoting/signaling/delegating_signal_strategy.cc
index ba55dbe4..c942d39a2 100644
--- a/remoting/signaling/delegating_signal_strategy.cc
+++ b/remoting/signaling/delegating_signal_strategy.cc
@@ -4,7 +4,7 @@
#include "remoting/signaling/delegating_signal_strategy.h"
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/rand_util.h"
#include "base/strings/string_number_conversions.h"
diff --git a/remoting/signaling/delegating_signal_strategy.h b/remoting/signaling/delegating_signal_strategy.h
index 361e7d2..de712649 100644
--- a/remoting/signaling/delegating_signal_strategy.h
+++ b/remoting/signaling/delegating_signal_strategy.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_SIGNALING_DELEGATING_SIGNAL_STRATEGY_H_
#define REMOTING_SIGNALING_DELEGATING_SIGNAL_STRATEGY_H_
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "remoting/signaling/signal_strategy.h"
diff --git a/remoting/signaling/fake_signal_strategy.cc b/remoting/signaling/fake_signal_strategy.cc
index 8584ce70..45682937 100644
--- a/remoting/signaling/fake_signal_strategy.cc
+++ b/remoting/signaling/fake_signal_strategy.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/strings/string_number_conversions.h"
diff --git a/remoting/signaling/ftl_message_reception_channel.cc b/remoting/signaling/ftl_message_reception_channel.cc
index c27d5b3..d298d664 100644
--- a/remoting/signaling/ftl_message_reception_channel.cc
+++ b/remoting/signaling/ftl_message_reception_channel.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "remoting/base/protobuf_http_status.h"
#include "remoting/base/scoped_protobuf_http_request.h"
diff --git a/remoting/signaling/ftl_message_reception_channel.h b/remoting/signaling/ftl_message_reception_channel.h
index 4571683..3cf965e5 100644
--- a/remoting/signaling/ftl_message_reception_channel.h
+++ b/remoting/signaling/ftl_message_reception_channel.h
@@ -8,7 +8,7 @@
#include <list>
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
diff --git a/remoting/signaling/ftl_message_reception_channel_unittest.cc b/remoting/signaling/ftl_message_reception_channel_unittest.cc
index ce515e53..893b0ab7 100644
--- a/remoting/signaling/ftl_message_reception_channel_unittest.cc
+++ b/remoting/signaling/ftl_message_reception_channel_unittest.cc
@@ -10,8 +10,8 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/weak_ptr.h"
#include "base/notreached.h"
#include "base/run_loop.h"
diff --git a/remoting/signaling/ftl_messaging_client.cc b/remoting/signaling/ftl_messaging_client.cc
index 0fb8828..56cbbde 100644
--- a/remoting/signaling/ftl_messaging_client.cc
+++ b/remoting/signaling/ftl_messaging_client.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/guid.h"
#include "base/logging.h"
#include "base/time/time.h"
diff --git a/remoting/signaling/ftl_messaging_client_unittest.cc b/remoting/signaling/ftl_messaging_client_unittest.cc
index 3356dab8..dd6dd475 100644
--- a/remoting/signaling/ftl_messaging_client_unittest.cc
+++ b/remoting/signaling/ftl_messaging_client_unittest.cc
@@ -10,9 +10,9 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/check.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/memory/raw_ptr.h"
#include "base/notreached.h"
#include "base/run_loop.h"
diff --git a/remoting/signaling/ftl_registration_manager.cc b/remoting/signaling/ftl_registration_manager.cc
index e14086a7..daaf0c26 100644
--- a/remoting/signaling/ftl_registration_manager.cc
+++ b/remoting/signaling/ftl_registration_manager.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "base/callback.h"
-#include "base/callback_helpers.h"
+#include "base/functional/callback.h"
+#include "base/functional/callback_helpers.h"
#include "base/logging.h"
#include "base/time/time.h"
#include "net/traffic_annotation/network_traffic_annotation.h"
diff --git a/remoting/signaling/ftl_registration_manager.h b/remoting/signaling/ftl_registration_manager.h
index 66158f4..49262682 100644
--- a/remoting/signaling/ftl_registration_manager.h
+++ b/remoting/signaling/ftl_registration_manager.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "base/timer/timer.h"
#include "net/base/backoff_entry.h"
diff --git a/remoting/signaling/ftl_signal_strategy.cc b/remoting/signaling/ftl_signal_strategy.cc
index db3cfdc..97cb020 100644
--- a/remoting/signaling/ftl_signal_strategy.cc
+++ b/remoting/signaling/ftl_signal_strategy.cc
@@ -6,7 +6,7 @@
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/weak_ptr.h"
diff --git a/remoting/signaling/ftl_signal_strategy_unittest.cc b/remoting/signaling/ftl_signal_strategy_unittest.cc
index 2eea051..bb5550e 100644
--- a/remoting/signaling/ftl_signal_strategy_unittest.cc
+++ b/remoting/signaling/ftl_signal_strategy_unittest.cc
@@ -8,8 +8,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/ptr_util.h"
#include "base/memory/raw_ptr.h"
#include "base/test/task_environment.h"
diff --git a/remoting/signaling/iq_sender.cc b/remoting/signaling/iq_sender.cc
index 8c4e067..64969bb 100644
--- a/remoting/signaling/iq_sender.cc
+++ b/remoting/signaling/iq_sender.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/strings/string_number_conversions.h"
diff --git a/remoting/signaling/iq_sender.h b/remoting/signaling/iq_sender.h
index ca7362c..7e457bf 100644
--- a/remoting/signaling/iq_sender.h
+++ b/remoting/signaling/iq_sender.h
@@ -9,8 +9,8 @@
#include <memory>
#include <string>
-#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "remoting/signaling/signal_strategy.h"
diff --git a/remoting/signaling/iq_sender_unittest.cc b/remoting/signaling/iq_sender_unittest.cc
index a5c25b4..00a4202 100644
--- a/remoting/signaling/iq_sender_unittest.cc
+++ b/remoting/signaling/iq_sender_unittest.cc
@@ -7,7 +7,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/stringprintf.h"
diff --git a/remoting/signaling/message_reception_channel.h b/remoting/signaling/message_reception_channel.h
index b3063617..44d7e2b6 100644
--- a/remoting/signaling/message_reception_channel.h
+++ b/remoting/signaling/message_reception_channel.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "remoting/proto/ftl/v1/ftl_messages.pb.h"
namespace remoting {
diff --git a/remoting/signaling/messaging_client.h b/remoting/signaling/messaging_client.h
index c2c1e9f..1468ddf 100644
--- a/remoting/signaling/messaging_client.h
+++ b/remoting/signaling/messaging_client.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "base/callback_forward.h"
#include "base/callback_list.h"
+#include "base/functional/callback_forward.h"
#include "remoting/proto/ftl/v1/chromoting_message.pb.h"
#include "remoting/proto/ftl/v1/ftl_messages.pb.h"
diff --git a/remoting/signaling/registration_manager.h b/remoting/signaling/registration_manager.h
index 7c832eb9..a353e63 100644
--- a/remoting/signaling/registration_manager.h
+++ b/remoting/signaling/registration_manager.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
namespace remoting {
diff --git a/remoting/signaling/remoting_log_to_server.cc b/remoting/signaling/remoting_log_to_server.cc
index abf6384..b7943ba 100644
--- a/remoting/signaling/remoting_log_to_server.cc
+++ b/remoting/signaling/remoting_log_to_server.cc
@@ -6,7 +6,7 @@
#include <sstream>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "net/traffic_annotation/network_traffic_annotation.h"
#include "remoting/base/protobuf_http_client.h"
diff --git a/remoting/signaling/remoting_log_to_server.h b/remoting/signaling/remoting_log_to_server.h
index ea44402..e9f94a15 100644
--- a/remoting/signaling/remoting_log_to_server.h
+++ b/remoting/signaling/remoting_log_to_server.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/scoped_refptr.h"
#include "base/sequence_checker.h"
#include "base/timer/timer.h"
diff --git a/remoting/signaling/xmpp_log_to_server.cc b/remoting/signaling/xmpp_log_to_server.cc
index 1f94c1c..fbb60e76 100644
--- a/remoting/signaling/xmpp_log_to_server.cc
+++ b/remoting/signaling/xmpp_log_to_server.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/task/sequenced_task_runner.h"
#include "remoting/base/constants.h"
#include "remoting/signaling/iq_sender.h"
diff --git a/remoting/test/cli_util.h b/remoting/test/cli_util.h
index d5d4d51f..c852245 100644
--- a/remoting/test/cli_util.h
+++ b/remoting/test/cli_util.h
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
namespace remoting {
namespace test {
diff --git a/remoting/test/cyclic_frame_generator.h b/remoting/test/cyclic_frame_generator.h
index b56cefa..4ea80c1 100644
--- a/remoting/test/cyclic_frame_generator.h
+++ b/remoting/test/cyclic_frame_generator.h
@@ -9,7 +9,7 @@
#include <memory>
#include <vector>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/time/default_tick_clock.h"
diff --git a/remoting/test/fake_connection_event_logger.cc b/remoting/test/fake_connection_event_logger.cc
index 7198d13..0bc836e 100644
--- a/remoting/test/fake_connection_event_logger.cc
+++ b/remoting/test/fake_connection_event_logger.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "base/atomicops.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/memory/raw_ptr.h"
#include "base/time/time.h"
#include "remoting/proto/audio.pb.h"
diff --git a/remoting/test/fake_network_dispatcher.cc b/remoting/test/fake_network_dispatcher.cc
index 3527b9a6..4e38408 100644
--- a/remoting/test/fake_network_dispatcher.cc
+++ b/remoting/test/fake_network_dispatcher.cc
@@ -6,7 +6,7 @@
#include <stddef.h>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/test/fake_network_manager.cc b/remoting/test/fake_network_manager.cc
index a59c959..e3425f8 100644
--- a/remoting/test/fake_network_manager.cc
+++ b/remoting/test/fake_network_manager.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/task/single_thread_task_runner.h"
#include "components/webrtc/net_address_utils.h"
diff --git a/remoting/test/fake_socket_factory.cc b/remoting/test/fake_socket_factory.cc
index c4a8e67..228d704 100644
--- a/remoting/test/fake_socket_factory.cc
+++ b/remoting/test/fake_socket_factory.cc
@@ -10,8 +10,8 @@
#include <memory>
#include <string>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/location.h"
#include "base/memory/raw_ptr.h"
#include "base/numerics/math_constants.h"
diff --git a/remoting/test/fake_socket_factory.h b/remoting/test/fake_socket_factory.h
index b7db8156..b6c6c16 100644
--- a/remoting/test/fake_socket_factory.h
+++ b/remoting/test/fake_socket_factory.h
@@ -10,8 +10,8 @@
#include <list>
#include <memory>
-#include "base/callback_forward.h"
#include "base/compiler_specific.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/weak_ptr.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
diff --git a/remoting/test/fake_webrtc_connection.h b/remoting/test/fake_webrtc_connection.h
index a8ecba7..5649a2f4 100644
--- a/remoting/test/fake_webrtc_connection.h
+++ b/remoting/test/fake_webrtc_connection.h
@@ -5,7 +5,7 @@
#ifndef REMOTING_TEST_FAKE_WEBRTC_CONNECTION_H_
#define REMOTING_TEST_FAKE_WEBRTC_CONNECTION_H_
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/scoped_refptr.h"
#include "remoting/protocol/webrtc_transport.h"
diff --git a/remoting/test/ftl_services_playground.cc b/remoting/test/ftl_services_playground.cc
index 95505b0..efd1425 100644
--- a/remoting/test/ftl_services_playground.cc
+++ b/remoting/test/ftl_services_playground.cc
@@ -10,10 +10,10 @@
#include <vector>
#include "base/base64.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/guid.h"
#include "base/logging.h"
#include "base/path_service.h"
diff --git a/remoting/test/ftl_services_playground.h b/remoting/test/ftl_services_playground.h
index 2fa8c72f..32b5330 100644
--- a/remoting/test/ftl_services_playground.h
+++ b/remoting/test/ftl_services_playground.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/weak_ptr.h"
#include "remoting/base/oauth_token_getter.h"
#include "remoting/signaling/ftl_messaging_client.h"
diff --git a/remoting/test/ftl_signaling_playground.cc b/remoting/test/ftl_signaling_playground.cc
index e6c176a..f332d90 100644
--- a/remoting/test/ftl_signaling_playground.cc
+++ b/remoting/test/ftl_signaling_playground.cc
@@ -10,10 +10,10 @@
#include <utility>
#include <vector>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/guid.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/remoting/test/ftl_signaling_playground.h b/remoting/test/ftl_signaling_playground.h
index c6c9324..b5db372 100644
--- a/remoting/test/ftl_signaling_playground.h
+++ b/remoting/test/ftl_signaling_playground.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
#include "base/timer/timer.h"
#include "remoting/base/oauth_token_getter.h"
#include "remoting/protocol/client_authentication_config.h"
diff --git a/remoting/test/it2me_cli_host.cc b/remoting/test/it2me_cli_host.cc
index 32d2448..af6dae4 100644
--- a/remoting/test/it2me_cli_host.cc
+++ b/remoting/test/it2me_cli_host.cc
@@ -4,8 +4,8 @@
#include "remoting/test/it2me_cli_host.h"
-#include "base/bind.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/run_loop.h"
diff --git a/remoting/test/it2me_standalone_host.cc b/remoting/test/it2me_standalone_host.cc
index 3d67f8b8a..cb7e99e 100644
--- a/remoting/test/it2me_standalone_host.cc
+++ b/remoting/test/it2me_standalone_host.cc
@@ -9,7 +9,7 @@
#include <memory>
#include <vector>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
diff --git a/remoting/test/protocol_perftest.cc b/remoting/test/protocol_perftest.cc
index f1e22952..2e6c08b 100644
--- a/remoting/test/protocol_perftest.cc
+++ b/remoting/test/protocol_perftest.cc
@@ -7,8 +7,8 @@
#include <utility>
#include "base/base64.h"
-#include "base/bind.h"
#include "base/files/file_util.h"
+#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/memory/raw_ptr.h"
#include "base/message_loop/message_pump_type.h"
diff --git a/remoting/test/test_oauth_token_getter.cc b/remoting/test/test_oauth_token_getter.cc
index 1b80596e..6318558 100644
--- a/remoting/test/test_oauth_token_getter.cc
+++ b/remoting/test/test_oauth_token_getter.cc
@@ -6,9 +6,9 @@
#include <utility>
-#include "base/bind.h"
-#include "base/callback_helpers.h"
#include "base/command_line.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback_helpers.h"
#include "base/strings/escape.h"
#include "base/strings/stringprintf.h"
#include "base/task/single_thread_task_runner.h"
diff --git a/remoting/test/test_oauth_token_getter.h b/remoting/test/test_oauth_token_getter.h
index acce46ed..6e2b74fa 100644
--- a/remoting/test/test_oauth_token_getter.h
+++ b/remoting/test/test_oauth_token_getter.h
@@ -8,8 +8,8 @@
#include <memory>
#include <string>
-#include "base/callback_forward.h"
#include "base/containers/queue.h"
+#include "base/functional/callback_forward.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/weak_ptr.h"
#include "remoting/base/oauth_token_getter.h"
diff --git a/rlz/chromeos/lib/rlz_value_store_chromeos.cc b/rlz/chromeos/lib/rlz_value_store_chromeos.cc
index 8693c17..46f4fd6 100644
--- a/rlz/chromeos/lib/rlz_value_store_chromeos.cc
+++ b/rlz/chromeos/lib/rlz_value_store_chromeos.cc
@@ -7,12 +7,12 @@
#include <tuple>
#include "base/base_paths.h"
-#include "base/bind.h"
#include "base/containers/contains.h"
#include "base/containers/cxx20_erase.h"
#include "base/cxx17_backports.h"
#include "base/files/file_util.h"
#include "base/files/important_file_writer.h"
+#include "base/functional/bind.h"
#include "base/json/json_file_value_serializer.h"
#include "base/json/json_string_value_serializer.h"
#include "base/lazy_instance.h"
diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc
index 0f2d3b87..7ca76fa 100644
--- a/rlz/lib/financial_ping.cc
+++ b/rlz/lib/financial_ping.cc
@@ -61,7 +61,7 @@
#else
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/run_loop.h"
#include "base/time/time.h"
#include "net/base/load_flags.h"
diff --git a/rlz/lib/rlz_lib_test.cc b/rlz/lib/rlz_lib_test.cc
index a5a65a8..36340fb 100644
--- a/rlz/lib/rlz_lib_test.cc
+++ b/rlz/lib/rlz_lib_test.cc
@@ -17,7 +17,7 @@
#include <memory>
-#include "base/bind.h"
+#include "base/functional/bind.h"
#include "base/message_loop/message_pump_type.h"
#include "base/posix/eintr_wrapper.h"
#include "base/strings/stringprintf.h"
