Use SequenceChecker from public API
Bug: webrtc:12419
Change-Id: I00cca16a0ec70246156ba00b97aa7ae5ccbf5364
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/205323
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Reviewed-by: Tommi <tommi@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33220}
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 5b508db..473bc85 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -90,6 +90,7 @@
"../api:rtp_parameters",
"../api:rtp_transceiver_direction",
"../api:scoped_refptr",
+ "../api:sequence_checker",
"../api/crypto:options",
"../api/rtc_event_log",
"../api/task_queue",
@@ -124,7 +125,6 @@
"../rtc_base:threading",
"../rtc_base/network:sent_packet",
"../rtc_base/synchronization:mutex",
- "../rtc_base/synchronization:sequence_checker",
"../rtc_base/system:file_wrapper",
"../rtc_base/system:rtc_export",
"../rtc_base/task_utils:pending_task_safety_flag",
@@ -255,6 +255,7 @@
"../api:rtp_parameters",
"../api:rtp_transceiver_direction",
"../api:scoped_refptr",
+ "../api:sequence_checker",
"../api/adaptation:resource_adaptation_api",
"../api/audio_codecs:audio_codecs_api",
"../api/crypto:frame_decryptor_interface",
@@ -300,7 +301,6 @@
"../rtc_base/experiments:field_trial_parser",
"../rtc_base/network:sent_packet",
"../rtc_base/synchronization:mutex",
- "../rtc_base/synchronization:sequence_checker",
"../rtc_base/system:file_wrapper",
"../rtc_base/system:no_unique_address",
"../rtc_base/system:rtc_export",
@@ -331,6 +331,7 @@
"../api:libjingle_peerconnection_api",
"../api:media_stream_interface",
"../api:scoped_refptr",
+ "../api:sequence_checker",
"../api/neteq:neteq_api",
"../api/transport:field_trial_based_config",
"../api/transport:sctp_transport_factory_interface",
@@ -355,10 +356,10 @@
"../api:media_stream_interface",
"../api:rtc_error",
"../api:scoped_refptr",
+ "../api:sequence_checker",
"../rtc_base",
"../rtc_base:checks",
"../rtc_base:threading",
- "../rtc_base/synchronization:sequence_checker",
]
}
@@ -390,6 +391,7 @@
"../api:rtp_parameters",
"../api:rtp_transceiver_direction",
"../api:scoped_refptr",
+ "../api:sequence_checker",
"../api/task_queue",
"../media:rtc_media_base",
"../rtc_base:checks",
@@ -397,7 +399,6 @@
"../rtc_base:macromagic",
"../rtc_base:refcount",
"../rtc_base:threading",
- "../rtc_base/synchronization:sequence_checker",
"../rtc_base/third_party/sigslot",
]
absl_deps = [
@@ -428,6 +429,7 @@
"../api:rtp_parameters",
"../api:rtp_transceiver_direction",
"../api:scoped_refptr",
+ "../api:sequence_checker",
"../media:rtc_media_base",
"../rtc_base",
"../rtc_base:checks",
@@ -504,6 +506,7 @@
"../api:media_stream_interface",
"../api:rtp_parameters",
"../api:scoped_refptr",
+ "../api:sequence_checker",
"../api/crypto:frame_decryptor_interface",
"../api/transport/rtp:rtp_source",
"../media:rtc_media_base",
@@ -537,6 +540,7 @@
"../api:media_stream_interface",
"../api:rtp_parameters",
"../api:scoped_refptr",
+ "../api:sequence_checker",
"../api/crypto:frame_decryptor_interface",
"../api/transport/rtp:rtp_source",
"../api/video:recordable_encoded_frame",
@@ -561,6 +565,7 @@
]
deps = [
":video_track_source",
+ "../api:sequence_checker",
"../api/video:recordable_encoded_frame",
"../api/video:video_frame",
"../media:rtc_media_base",
@@ -579,9 +584,9 @@
deps = [
"../api:media_stream_interface",
"../api:scoped_refptr",
+ "../api:sequence_checker",
"../rtc_base:checks",
"../rtc_base:refcount",
- "../rtc_base/synchronization:sequence_checker",
]
}
@@ -593,6 +598,7 @@
deps = [
"../api:media_stream_interface",
"../api:scoped_refptr",
+ "../api:sequence_checker",
"../api/video:video_frame",
"../media:rtc_media_base",
"../rtc_base",
@@ -640,6 +646,7 @@
]
deps = [
":jitter_buffer_delay_interface",
+ "../api:sequence_checker",
"../media:rtc_media_base",
"../rtc_base",
"../rtc_base:checks",
@@ -664,6 +671,7 @@
"../api:call_api",
"../api:media_stream_interface",
"../api:scoped_refptr",
+ "../api:sequence_checker",
"../media:rtc_media_base",
"../rtc_base",
"../rtc_base:checks",
@@ -781,6 +789,7 @@
]
deps = [
"../api:media_stream_interface",
+ "../api:sequence_checker",
"../api/video:recordable_encoded_frame",
"../api/video:video_frame",
"../media:rtc_media_base",
@@ -994,6 +1003,7 @@
"../api:rtc_error",
"../api:rtc_stats_api",
"../api:scoped_refptr",
+ "../api:sequence_checker",
"../api/audio:audio_mixer_api",
"../api/audio_codecs:audio_codecs_api",
"../api/task_queue",
@@ -1023,7 +1033,6 @@
"../rtc_base:task_queue_for_test",
"../rtc_base:threading",
"../rtc_base/synchronization:mutex",
- "../rtc_base/synchronization:sequence_checker",
"../rtc_base/task_utils:repeating_task",
"../rtc_base/third_party/sigslot",
"../test:test_support",
diff --git a/pc/audio_rtp_receiver.cc b/pc/audio_rtp_receiver.cc
index 37a6fc6..e8fad28 100644
--- a/pc/audio_rtp_receiver.cc
+++ b/pc/audio_rtp_receiver.cc
@@ -16,13 +16,13 @@
#include <vector>
#include "api/media_stream_track_proxy.h"
+#include "api/sequence_checker.h"
#include "pc/audio_track.h"
#include "pc/jitter_buffer_delay.h"
#include "pc/jitter_buffer_delay_proxy.h"
#include "rtc_base/checks.h"
#include "rtc_base/location.h"
#include "rtc_base/logging.h"
-#include "rtc_base/synchronization/sequence_checker.h"
namespace webrtc {
diff --git a/pc/audio_track.h b/pc/audio_track.h
index 26b4769..07511a5 100644
--- a/pc/audio_track.h
+++ b/pc/audio_track.h
@@ -16,7 +16,7 @@
#include "api/media_stream_interface.h"
#include "api/media_stream_track.h"
#include "api/scoped_refptr.h"
-#include "rtc_base/synchronization/sequence_checker.h"
+#include "api/sequence_checker.h"
namespace webrtc {
diff --git a/pc/channel.cc b/pc/channel.cc
index 7a3c2bb..1408c4c 100644
--- a/pc/channel.cc
+++ b/pc/channel.cc
@@ -19,6 +19,7 @@
#include "absl/algorithm/container.h"
#include "absl/strings/string_view.h"
#include "api/rtp_parameters.h"
+#include "api/sequence_checker.h"
#include "api/task_queue/queued_task.h"
#include "media/base/codec.h"
#include "media/base/rid_description.h"
@@ -31,7 +32,6 @@
#include "rtc_base/network_route.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/task_utils/pending_task_safety_flag.h"
#include "rtc_base/task_utils/to_queued_task.h"
#include "rtc_base/trace_event.h"
diff --git a/pc/channel.h b/pc/channel.h
index 30fa639..b418188 100644
--- a/pc/channel.h
+++ b/pc/channel.h
@@ -30,6 +30,7 @@
#include "api/rtp_receiver_interface.h"
#include "api/rtp_transceiver_direction.h"
#include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
#include "api/video/video_sink_interface.h"
#include "api/video/video_source_interface.h"
#include "call/rtp_demuxer.h"
@@ -59,7 +60,6 @@
#include "rtc_base/network_route.h"
#include "rtc_base/socket.h"
#include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/task_utils/pending_task_safety_flag.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
diff --git a/pc/channel_manager.cc b/pc/channel_manager.cc
index 256932b..2671c10 100644
--- a/pc/channel_manager.cc
+++ b/pc/channel_manager.cc
@@ -16,11 +16,11 @@
#include "absl/algorithm/container.h"
#include "absl/memory/memory.h"
#include "absl/strings/match.h"
+#include "api/sequence_checker.h"
#include "media/base/media_constants.h"
#include "rtc_base/checks.h"
#include "rtc_base/location.h"
#include "rtc_base/logging.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/trace_event.h"
namespace cricket {
diff --git a/pc/connection_context.h b/pc/connection_context.h
index 02d08a1..af04ae2 100644
--- a/pc/connection_context.h
+++ b/pc/connection_context.h
@@ -18,6 +18,7 @@
#include "api/media_stream_interface.h"
#include "api/peer_connection_interface.h"
#include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
#include "api/transport/sctp_transport_factory_interface.h"
#include "api/transport/webrtc_key_value_config.h"
#include "media/base/media_engine.h"
@@ -29,7 +30,6 @@
#include "rtc_base/network_monitor_factory.h"
#include "rtc_base/ref_count.h"
#include "rtc_base/rtc_certificate_generator.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/thread.h"
#include "rtc_base/thread_annotations.h"
diff --git a/pc/data_channel_controller.h b/pc/data_channel_controller.h
index ad24349..40f4e4c 100644
--- a/pc/data_channel_controller.h
+++ b/pc/data_channel_controller.h
@@ -20,6 +20,7 @@
#include "api/data_channel_interface.h"
#include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
#include "api/transport/data_channel_transport_interface.h"
#include "media/base/media_channel.h"
#include "media/base/media_engine.h"
@@ -32,7 +33,6 @@
#include "rtc_base/checks.h"
#include "rtc_base/copy_on_write_buffer.h"
#include "rtc_base/ssl_stream_adapter.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
#include "rtc_base/thread_annotations.h"
diff --git a/pc/dtls_transport.cc b/pc/dtls_transport.cc
index a0547c8..a3ab58f 100644
--- a/pc/dtls_transport.cc
+++ b/pc/dtls_transport.cc
@@ -13,12 +13,12 @@
#include <utility>
#include "absl/types/optional.h"
+#include "api/sequence_checker.h"
#include "pc/ice_transport.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/ref_counted_object.h"
#include "rtc_base/ssl_certificate.h"
-#include "rtc_base/synchronization/sequence_checker.h"
namespace webrtc {
diff --git a/pc/ice_transport.cc b/pc/ice_transport.cc
index d45534a..2058467 100644
--- a/pc/ice_transport.cc
+++ b/pc/ice_transport.cc
@@ -10,7 +10,7 @@
#include "pc/ice_transport.h"
-#include "rtc_base/synchronization/sequence_checker.h"
+#include "api/sequence_checker.h"
namespace webrtc {
diff --git a/pc/ice_transport.h b/pc/ice_transport.h
index 6121b8d..11f3de5 100644
--- a/pc/ice_transport.h
+++ b/pc/ice_transport.h
@@ -12,8 +12,8 @@
#define PC_ICE_TRANSPORT_H_
#include "api/ice_transport_interface.h"
+#include "api/sequence_checker.h"
#include "rtc_base/checks.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/thread.h"
#include "rtc_base/thread_annotations.h"
diff --git a/pc/jitter_buffer_delay.cc b/pc/jitter_buffer_delay.cc
index 8863584..3fdf823 100644
--- a/pc/jitter_buffer_delay.cc
+++ b/pc/jitter_buffer_delay.cc
@@ -10,10 +10,10 @@
#include "pc/jitter_buffer_delay.h"
+#include "api/sequence_checker.h"
#include "rtc_base/checks.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/numerics/safe_minmax.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/thread.h"
namespace {
diff --git a/pc/jsep_transport.h b/pc/jsep_transport.h
index 5a6ef8a..5e8cae0 100644
--- a/pc/jsep_transport.h
+++ b/pc/jsep_transport.h
@@ -23,6 +23,7 @@
#include "api/jsep.h"
#include "api/rtc_error.h"
#include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
#include "api/transport/data_channel_transport_interface.h"
#include "media/sctp/sctp_transport_internal.h"
#include "p2p/base/dtls_transport.h"
@@ -46,7 +47,6 @@
#include "rtc_base/rtc_certificate.h"
#include "rtc_base/ssl_fingerprint.h"
#include "rtc_base/ssl_stream_adapter.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
#include "rtc_base/thread_annotations.h"
diff --git a/pc/jsep_transport_controller.cc b/pc/jsep_transport_controller.cc
index 0ded1de..a9f95c9 100644
--- a/pc/jsep_transport_controller.cc
+++ b/pc/jsep_transport_controller.cc
@@ -18,6 +18,7 @@
#include "absl/algorithm/container.h"
#include "api/rtp_parameters.h"
+#include "api/sequence_checker.h"
#include "api/transport/enums.h"
#include "media/sctp/sctp_transport_internal.h"
#include "p2p/base/dtls_transport.h"
@@ -29,7 +30,6 @@
#include "rtc_base/logging.h"
#include "rtc_base/net_helper.h"
#include "rtc_base/socket_address.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/thread.h"
using webrtc::SdpType;
diff --git a/pc/peer_connection.h b/pc/peer_connection.h
index 92e33d2..80259d4 100644
--- a/pc/peer_connection.h
+++ b/pc/peer_connection.h
@@ -12,6 +12,7 @@
#define PC_PEER_CONNECTION_H_
#include <stdint.h>
+
#include <functional>
#include <map>
#include <memory>
@@ -43,6 +44,7 @@
#include "api/rtp_transceiver_interface.h"
#include "api/scoped_refptr.h"
#include "api/sctp_transport_interface.h"
+#include "api/sequence_checker.h"
#include "api/set_local_description_observer_interface.h"
#include "api/set_remote_description_observer_interface.h"
#include "api/stats/rtc_stats_collector_callback.h"
@@ -91,7 +93,6 @@
#include "rtc_base/rtc_certificate.h"
#include "rtc_base/ssl_certificate.h"
#include "rtc_base/ssl_stream_adapter.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/task_utils/pending_task_safety_flag.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
diff --git a/pc/peer_connection_factory.cc b/pc/peer_connection_factory.cc
index a8d64fa..ee5c74f 100644
--- a/pc/peer_connection_factory.cc
+++ b/pc/peer_connection_factory.cc
@@ -25,6 +25,7 @@
#include "api/peer_connection_factory_proxy.h"
#include "api/peer_connection_proxy.h"
#include "api/rtc_event_log/rtc_event_log.h"
+#include "api/sequence_checker.h"
#include "api/transport/bitrate_settings.h"
#include "api/units/data_rate.h"
#include "call/audio_state.h"
@@ -47,7 +48,6 @@
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/ref_counted_object.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/system/file_wrapper.h"
namespace webrtc {
diff --git a/pc/peer_connection_factory.h b/pc/peer_connection_factory.h
index 80d2592..cbc7397 100644
--- a/pc/peer_connection_factory.h
+++ b/pc/peer_connection_factory.h
@@ -14,6 +14,7 @@
#include <stdint.h>
#include <stdio.h>
+
#include <memory>
#include <string>
@@ -30,6 +31,7 @@
#include "api/rtc_event_log/rtc_event_log_factory_interface.h"
#include "api/rtp_parameters.h"
#include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
#include "api/task_queue/task_queue_factory.h"
#include "api/transport/network_control.h"
#include "api/transport/sctp_transport_factory_interface.h"
@@ -41,7 +43,6 @@
#include "pc/connection_context.h"
#include "rtc_base/checks.h"
#include "rtc_base/rtc_certificate_generator.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/thread.h"
#include "rtc_base/thread_annotations.h"
diff --git a/pc/peer_connection_message_handler.cc b/pc/peer_connection_message_handler.cc
index ea9df5a..4b7913d 100644
--- a/pc/peer_connection_message_handler.cc
+++ b/pc/peer_connection_message_handler.cc
@@ -16,11 +16,11 @@
#include "api/media_stream_interface.h"
#include "api/peer_connection_interface.h"
#include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
#include "api/stats_types.h"
#include "pc/stats_collector_interface.h"
#include "rtc_base/checks.h"
#include "rtc_base/location.h"
-#include "rtc_base/synchronization/sequence_checker.h"
namespace webrtc {
diff --git a/pc/remote_audio_source.cc b/pc/remote_audio_source.cc
index 50e9c55..3f53bb8 100644
--- a/pc/remote_audio_source.cc
+++ b/pc/remote_audio_source.cc
@@ -16,11 +16,11 @@
#include "absl/algorithm/container.h"
#include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
#include "rtc_base/checks.h"
#include "rtc_base/location.h"
#include "rtc_base/logging.h"
#include "rtc_base/strings/string_format.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/thread.h"
namespace webrtc {
diff --git a/pc/rtc_stats_collector.cc b/pc/rtc_stats_collector.cc
index 040ee4d..139b33f 100644
--- a/pc/rtc_stats_collector.cc
+++ b/pc/rtc_stats_collector.cc
@@ -11,6 +11,7 @@
#include "pc/rtc_stats_collector.h"
#include <stdio.h>
+
#include <algorithm>
#include <cstdint>
#include <map>
@@ -25,6 +26,7 @@
#include "api/rtp_parameters.h"
#include "api/rtp_receiver_interface.h"
#include "api/rtp_sender_interface.h"
+#include "api/sequence_checker.h"
#include "api/stats/rtc_stats.h"
#include "api/stats/rtcstats_objects.h"
#include "api/task_queue/queued_task.h"
@@ -55,7 +57,6 @@
#include "rtc_base/ssl_stream_adapter.h"
#include "rtc_base/string_encode.h"
#include "rtc_base/strings/string_builder.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/time_utils.h"
#include "rtc_base/trace_event.h"
diff --git a/pc/rtp_transceiver.cc b/pc/rtp_transceiver.cc
index b1f53f1..f8c5bd5 100644
--- a/pc/rtp_transceiver.cc
+++ b/pc/rtp_transceiver.cc
@@ -17,6 +17,7 @@
#include "absl/algorithm/container.h"
#include "api/rtp_parameters.h"
+#include "api/sequence_checker.h"
#include "media/base/codec.h"
#include "media/base/media_constants.h"
#include "pc/channel_manager.h"
@@ -24,7 +25,6 @@
#include "pc/session_description.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/thread.h"
namespace webrtc {
diff --git a/pc/rtp_transmission_manager.h b/pc/rtp_transmission_manager.h
index 21f5a96..fe0e3ab 100644
--- a/pc/rtp_transmission_manager.h
+++ b/pc/rtp_transmission_manager.h
@@ -12,6 +12,7 @@
#define PC_RTP_TRANSMISSION_MANAGER_H_
#include <stdint.h>
+
#include <functional>
#include <string>
#include <vector>
@@ -24,6 +25,7 @@
#include "api/rtp_receiver_interface.h"
#include "api/rtp_sender_interface.h"
#include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
#include "media/base/media_channel.h"
#include "pc/channel_manager.h"
#include "pc/rtp_receiver.h"
@@ -32,7 +34,6 @@
#include "pc/stats_collector_interface.h"
#include "pc/transceiver_list.h"
#include "pc/usage_pattern.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
#include "rtc_base/thread_annotations.h"
diff --git a/pc/sctp_transport.cc b/pc/sctp_transport.cc
index bb579af..ad8a9f2 100644
--- a/pc/sctp_transport.cc
+++ b/pc/sctp_transport.cc
@@ -14,10 +14,10 @@
#include <utility>
#include "absl/types/optional.h"
+#include "api/sequence_checker.h"
#include "rtc_base/checks.h"
#include "rtc_base/location.h"
#include "rtc_base/logging.h"
-#include "rtc_base/synchronization/sequence_checker.h"
namespace webrtc {
diff --git a/pc/sdp_offer_answer.h b/pc/sdp_offer_answer.h
index 43a3dbb..2d2a5291 100644
--- a/pc/sdp_offer_answer.h
+++ b/pc/sdp_offer_answer.h
@@ -13,6 +13,7 @@
#include <stddef.h>
#include <stdint.h>
+
#include <functional>
#include <map>
#include <memory>
@@ -33,6 +34,7 @@
#include "api/rtp_transceiver_direction.h"
#include "api/rtp_transceiver_interface.h"
#include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
#include "api/set_local_description_observer_interface.h"
#include "api/set_remote_description_observer_interface.h"
#include "api/transport/data_channel_transport_interface.h"
@@ -69,7 +71,6 @@
#include "rtc_base/race_checker.h"
#include "rtc_base/rtc_certificate.h"
#include "rtc_base/ssl_stream_adapter.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
#include "rtc_base/thread_annotations.h"
diff --git a/pc/srtp_filter.h b/pc/srtp_filter.h
index a7ae97f..f1e1649 100644
--- a/pc/srtp_filter.h
+++ b/pc/srtp_filter.h
@@ -24,11 +24,11 @@
#include "api/array_view.h"
#include "api/crypto_params.h"
#include "api/jsep.h"
+#include "api/sequence_checker.h"
#include "pc/session_description.h"
#include "rtc_base/buffer.h"
#include "rtc_base/constructor_magic.h"
#include "rtc_base/ssl_stream_adapter.h"
-#include "rtc_base/synchronization/sequence_checker.h"
// Forward declaration to avoid pulling in libsrtp headers here
struct srtp_event_data_t;
diff --git a/pc/srtp_session.h b/pc/srtp_session.h
index f2210cf..9eede09 100644
--- a/pc/srtp_session.h
+++ b/pc/srtp_session.h
@@ -14,9 +14,9 @@
#include <vector>
#include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
#include "rtc_base/constructor_magic.h"
#include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
// Forward declaration to avoid pulling in libsrtp headers here
struct srtp_event_data_t;
diff --git a/pc/stats_collector.cc b/pc/stats_collector.cc
index 99ad1b3..64ce2e0 100644
--- a/pc/stats_collector.cc
+++ b/pc/stats_collector.cc
@@ -26,6 +26,7 @@
#include "api/rtp_receiver_interface.h"
#include "api/rtp_sender_interface.h"
#include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
#include "api/video/video_content_type.h"
#include "api/video/video_timing.h"
#include "call/call.h"
@@ -47,7 +48,6 @@
#include "rtc_base/socket_address.h"
#include "rtc_base/ssl_stream_adapter.h"
#include "rtc_base/string_encode.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/thread.h"
#include "rtc_base/time_utils.h"
#include "system_wrappers/include/field_trial.h"
diff --git a/pc/test/fake_audio_capture_module.h b/pc/test/fake_audio_capture_module.h
index a125028..d2db3d6 100644
--- a/pc/test/fake_audio_capture_module.h
+++ b/pc/test/fake_audio_capture_module.h
@@ -26,11 +26,11 @@
#include <memory>
#include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
#include "modules/audio_device/include/audio_device.h"
#include "modules/audio_device/include/audio_device_defines.h"
#include "rtc_base/message_handler.h"
#include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/thread.h"
#include "rtc_base/thread_annotations.h"
#include "rtc_base/thread_message.h"
diff --git a/pc/test/peer_connection_test_wrapper.cc b/pc/test/peer_connection_test_wrapper.cc
index f401ebb..c3ffcb0 100644
--- a/pc/test/peer_connection_test_wrapper.cc
+++ b/pc/test/peer_connection_test_wrapper.cc
@@ -20,6 +20,7 @@
#include "absl/types/optional.h"
#include "api/audio/audio_mixer.h"
#include "api/create_peerconnection_factory.h"
+#include "api/sequence_checker.h"
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
#include "api/video_codecs/video_decoder_factory.h"
@@ -37,7 +38,6 @@
#include "rtc_base/ref_counted_object.h"
#include "rtc_base/rtc_certificate_generator.h"
#include "rtc_base/string_encode.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/time_utils.h"
#include "test/gtest.h"
diff --git a/pc/test/peer_connection_test_wrapper.h b/pc/test/peer_connection_test_wrapper.h
index f345f54..4abf6c9 100644
--- a/pc/test/peer_connection_test_wrapper.h
+++ b/pc/test/peer_connection_test_wrapper.h
@@ -25,9 +25,9 @@
#include "api/rtc_error.h"
#include "api/rtp_receiver_interface.h"
#include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
#include "pc/test/fake_audio_capture_module.h"
#include "pc/test/fake_video_track_renderer.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
diff --git a/pc/video_rtp_receiver.h b/pc/video_rtp_receiver.h
index 6cbd8a1..8e36af6 100644
--- a/pc/video_rtp_receiver.h
+++ b/pc/video_rtp_receiver.h
@@ -26,6 +26,7 @@
#include "api/rtp_parameters.h"
#include "api/rtp_receiver_interface.h"
#include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
#include "api/transport/rtp/rtp_source.h"
#include "api/video/video_frame.h"
#include "api/video/video_sink_interface.h"
@@ -36,7 +37,6 @@
#include "pc/video_rtp_track_source.h"
#include "pc/video_track.h"
#include "rtc_base/ref_counted_object.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/thread.h"
#include "rtc_base/thread_annotations.h"
diff --git a/pc/video_rtp_track_source.h b/pc/video_rtp_track_source.h
index 53cb046..3d734e0 100644
--- a/pc/video_rtp_track_source.h
+++ b/pc/video_rtp_track_source.h
@@ -13,6 +13,7 @@
#include <vector>
+#include "api/sequence_checker.h"
#include "api/video/recordable_encoded_frame.h"
#include "api/video/video_frame.h"
#include "api/video/video_sink_interface.h"
@@ -22,7 +23,6 @@
#include "rtc_base/callback.h"
#include "rtc_base/constructor_magic.h"
#include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/system/no_unique_address.h"
#include "rtc_base/thread_annotations.h"
diff --git a/pc/video_track.cc b/pc/video_track.cc
index 279b153..d67d4f6 100644
--- a/pc/video_track.cc
+++ b/pc/video_track.cc
@@ -14,10 +14,10 @@
#include <vector>
#include "api/notifier.h"
+#include "api/sequence_checker.h"
#include "rtc_base/checks.h"
#include "rtc_base/location.h"
#include "rtc_base/ref_counted_object.h"
-#include "rtc_base/synchronization/sequence_checker.h"
namespace webrtc {
diff --git a/pc/video_track.h b/pc/video_track.h
index a2cf46f..bff63fc 100644
--- a/pc/video_track.h
+++ b/pc/video_track.h
@@ -16,11 +16,11 @@
#include "api/media_stream_interface.h"
#include "api/media_stream_track.h"
#include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
#include "api/video/video_frame.h"
#include "api/video/video_sink_interface.h"
#include "api/video/video_source_interface.h"
#include "media/base/video_source_base.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/thread.h"
#include "rtc_base/thread_annotations.h"
diff --git a/pc/video_track_source.h b/pc/video_track_source.h
index 223c5dd..4a29381 100644
--- a/pc/video_track_source.h
+++ b/pc/video_track_source.h
@@ -14,12 +14,12 @@
#include "absl/types/optional.h"
#include "api/media_stream_interface.h"
#include "api/notifier.h"
+#include "api/sequence_checker.h"
#include "api/video/recordable_encoded_frame.h"
#include "api/video/video_frame.h"
#include "api/video/video_sink_interface.h"
#include "api/video/video_source_interface.h"
#include "media/base/media_channel.h"
-#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/system/rtc_export.h"
namespace webrtc {
