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}

audio/BUILD.gn

@@ -47,6 +47,7 @@ rtc_library("audio") {
     "../api:rtp_headers",
     "../api:rtp_parameters",
     "../api:scoped_refptr",
+    "../api:sequence_checker",
     "../api:transport_api",
     "../api/audio:aec3_factory",
     "../api/audio:audio_frame_api",
@@ -93,7 +94,6 @@ rtc_library("audio") {
     "../rtc_base:threading",
     "../rtc_base/experiments:field_trial_parser",
     "../rtc_base/synchronization:mutex",
-    "../rtc_base/synchronization:sequence_checker",
     "../rtc_base/system:no_unique_address",
     "../rtc_base/task_utils:to_queued_task",
     "../system_wrappers",

audio/audio_receive_stream.h

@@ -17,11 +17,11 @@
 #include "api/audio/audio_mixer.h"
 #include "api/neteq/neteq_factory.h"
 #include "api/rtp_headers.h"
+#include "api/sequence_checker.h"
 #include "audio/audio_state.h"
 #include "call/audio_receive_stream.h"
 #include "call/syncable.h"
 #include "modules/rtp_rtcp/source/source_tracker.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "system_wrappers/include/clock.h"
 
 namespace webrtc {

audio/audio_send_stream.h

@@ -15,6 +15,7 @@
 #include <utility>
 #include <vector>
 
+#include "api/sequence_checker.h"
 #include "audio/audio_level.h"
 #include "audio/channel_send.h"
 #include "call/audio_send_stream.h"
@@ -24,7 +25,6 @@
 #include "rtc_base/experiments/struct_parameters_parser.h"
 #include "rtc_base/race_checker.h"
 #include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/task_queue.h"
 
 namespace webrtc {

audio/audio_state.h

@@ -15,11 +15,11 @@
 #include <memory>
 #include <unordered_set>
 
+#include "api/sequence_checker.h"
 #include "audio/audio_transport_impl.h"
 #include "audio/null_audio_poller.h"
 #include "call/audio_state.h"
 #include "rtc_base/ref_count.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 
 namespace webrtc {
 

audio/channel_receive.cc

@@ -22,6 +22,7 @@
 #include "api/crypto/frame_decryptor_interface.h"
 #include "api/frame_transformer_interface.h"
 #include "api/rtc_event_log/rtc_event_log.h"
+#include "api/sequence_checker.h"
 #include "audio/audio_level.h"
 #include "audio/channel_receive_frame_transformer_delegate.h"
 #include "audio/channel_send.h"
@@ -46,7 +47,6 @@
 #include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/race_checker.h"
 #include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/time_utils.h"
 #include "system_wrappers/include/metrics.h"
 

audio/channel_receive_frame_transformer_delegate.h

@@ -14,7 +14,7 @@
 #include <memory>
 
 #include "api/frame_transformer_interface.h"
-#include "rtc_base/synchronization/sequence_checker.h"
+#include "api/sequence_checker.h"
 #include "rtc_base/system/no_unique_address.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread.h"

audio/channel_send.cc

@@ -21,6 +21,7 @@
 #include "api/call/transport.h"
 #include "api/crypto/frame_encryptor_interface.h"
 #include "api/rtc_event_log/rtc_event_log.h"
+#include "api/sequence_checker.h"
 #include "audio/channel_send_frame_transformer_delegate.h"
 #include "audio/utility/audio_frame_operations.h"
 #include "call/rtp_transport_controller_send_interface.h"
@@ -40,7 +41,6 @@
 #include "rtc_base/race_checker.h"
 #include "rtc_base/rate_limiter.h"
 #include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/time_utils.h"
 #include "system_wrappers/include/clock.h"

audio/channel_send_frame_transformer_delegate.h

@@ -14,10 +14,10 @@
 #include <memory>
 
 #include "api/frame_transformer_interface.h"
+#include "api/sequence_checker.h"
 #include "modules/audio_coding/include/audio_coding_module_typedefs.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/task_queue.h"
 
 namespace webrtc {

audio/null_audio_poller.h

@@ -13,9 +13,9 @@
 
 #include <stdint.h>
 
+#include "api/sequence_checker.h"
 #include "modules/audio_device/include/audio_device_defines.h"
 #include "rtc_base/message_handler.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 
 namespace webrtc {
 namespace internal {

audio/voip/BUILD.gn

@@ -89,6 +89,7 @@ rtc_library("audio_egress") {
   ]
   deps = [
     "..:audio",
+    "../../api:sequence_checker",
     "../../api/audio_codecs:audio_codecs_api",
     "../../api/task_queue",
     "../../call:audio_sender_interface",
@@ -99,7 +100,6 @@ rtc_library("audio_egress") {
     "../../rtc_base:rtc_task_queue",
     "../../rtc_base:timeutils",
     "../../rtc_base/synchronization:mutex",
-    "../../rtc_base/synchronization:sequence_checker",
     "../../rtc_base/system:no_unique_address",
     "../utility:audio_frame_operations",
   ]

audio/voip/audio_egress.h

@@ -15,6 +15,7 @@
 #include <string>
 
 #include "api/audio_codecs/audio_format.h"
+#include "api/sequence_checker.h"
 #include "api/task_queue/task_queue_factory.h"
 #include "audio/audio_level.h"
 #include "audio/utility/audio_frame_operations.h"
@@ -24,7 +25,6 @@
 #include "modules/rtp_rtcp/source/rtp_rtcp_interface.h"
 #include "modules/rtp_rtcp/source/rtp_sender_audio.h"
 #include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/time_utils.h"
 

call/BUILD.gn

@@ -132,6 +132,7 @@ rtc_library("rtp_receiver") {
     ":rtp_interfaces",
     "../api:array_view",
     "../api:rtp_headers",
+    "../api:sequence_checker",
     "../modules/rtp_rtcp",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../rtc_base:checks",
@@ -158,6 +159,7 @@ rtc_library("rtp_sender") {
     "../api:fec_controller_api",
     "../api:network_state_predictor_api",
     "../api:rtp_parameters",
+    "../api:sequence_checker",
     "../api:transport_api",
     "../api/rtc_event_log",
     "../api/transport:field_trial_based_config",
@@ -226,13 +228,13 @@ rtc_library("bitrate_allocator") {
   ]
   deps = [
     "../api:bitrate_allocation",
+    "../api:sequence_checker",
     "../api/transport:network_control",
     "../api/units:data_rate",
     "../api/units:time_delta",
     "../rtc_base:checks",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:safe_minmax",
-    "../rtc_base/synchronization:sequence_checker",
     "../rtc_base/system:no_unique_address",
     "../system_wrappers",
     "../system_wrappers:field_trial",
@@ -269,6 +271,7 @@ rtc_library("call") {
     "../api:fec_controller_api",
     "../api:rtp_headers",
     "../api:rtp_parameters",
+    "../api:sequence_checker",
     "../api:simulated_network_api",
     "../api:transport_api",
     "../api/rtc_event_log",
@@ -293,7 +296,6 @@ rtc_library("call") {
     "../rtc_base:safe_minmax",
     "../rtc_base/experiments:field_trial_parser",
     "../rtc_base/network:sent_packet",
-    "../rtc_base/synchronization:sequence_checker",
     "../rtc_base/system:no_unique_address",
     "../rtc_base/task_utils:pending_task_safety_flag",
     "../system_wrappers",
@@ -344,6 +346,7 @@ rtc_library("simulated_network") {
     "simulated_network.h",
   ]
   deps = [
+    "../api:sequence_checker",
     "../api:simulated_network_api",
     "../api/units:data_rate",
     "../api/units:data_size",
@@ -352,7 +355,6 @@ rtc_library("simulated_network") {
     "../rtc_base:checks",
     "../rtc_base:rtc_base_approved",
     "../rtc_base/synchronization:mutex",
-    "../rtc_base/synchronization:sequence_checker",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
 }
@@ -375,13 +377,13 @@ rtc_library("fake_network") {
     ":simulated_network",
     ":simulated_packet_receiver",
     "../api:rtp_parameters",
+    "../api:sequence_checker",
     "../api:simulated_network_api",
     "../api:transport_api",
     "../modules/utility",
     "../rtc_base:checks",
     "../rtc_base:rtc_base_approved",
     "../rtc_base/synchronization:mutex",
-    "../rtc_base/synchronization:sequence_checker",
     "../system_wrappers",
   ]
 }

call/adaptation/BUILD.gn

@@ -34,6 +34,7 @@ rtc_library("resource_adaptation") {
   deps = [
     "../../api:rtp_parameters",
     "../../api:scoped_refptr",
+    "../../api:sequence_checker",
     "../../api/adaptation:resource_adaptation_api",
     "../../api/task_queue:task_queue",
     "../../api/video:video_adaptation",
@@ -46,7 +47,6 @@ rtc_library("resource_adaptation") {
     "../../rtc_base:rtc_task_queue",
     "../../rtc_base/experiments:balanced_degradation_settings",
     "../../rtc_base/synchronization:mutex",
-    "../../rtc_base/synchronization:sequence_checker",
     "../../rtc_base/system:no_unique_address",
     "../../rtc_base/task_utils:to_queued_task",
   ]
@@ -108,11 +108,11 @@ if (rtc_include_tests) {
     deps = [
       ":resource_adaptation",
       "../../api:scoped_refptr",
+      "../../api:sequence_checker",
       "../../api/adaptation:resource_adaptation_api",
       "../../api/task_queue:task_queue",
       "../../api/video:video_stream_encoder",
       "../../rtc_base:rtc_base_approved",
-      "../../rtc_base/synchronization:sequence_checker",
       "../../rtc_base/task_utils:to_queued_task",
       "../../test:test_support",
     ]

call/adaptation/resource_adaptation_processor.cc

@@ -15,12 +15,12 @@
 #include <utility>
 
 #include "absl/algorithm/container.h"
+#include "api/sequence_checker.h"
 #include "api/video/video_adaptation_counters.h"
 #include "call/adaptation/video_stream_adapter.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/ref_counted_object.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/task_utils/to_queued_task.h"
 
 namespace webrtc {

call/adaptation/video_stream_adapter.cc

@@ -16,6 +16,7 @@
 
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
+#include "api/sequence_checker.h"
 #include "api/video/video_adaptation_counters.h"
 #include "api/video/video_adaptation_reason.h"
 #include "api/video_codecs/video_encoder.h"
@@ -25,7 +26,6 @@
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 
 namespace webrtc {
 

call/bitrate_allocator.h

@@ -20,8 +20,8 @@
 #include <vector>
 
 #include "api/call/bitrate_allocation.h"
+#include "api/sequence_checker.h"
 #include "api/transport/network_types.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/system/no_unique_address.h"
 
 namespace webrtc {

call/call.cc

@@ -21,6 +21,7 @@
 
 #include "absl/types/optional.h"
 #include "api/rtc_event_log/rtc_event_log.h"
+#include "api/sequence_checker.h"
 #include "api/transport/network_control.h"
 #include "audio/audio_receive_stream.h"
 #include "audio/audio_send_stream.h"
@@ -51,7 +52,6 @@
 #include "rtc_base/location.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/system/no_unique_address.h"
 #include "rtc_base/task_utils/pending_task_safety_flag.h"
 #include "rtc_base/thread_annotations.h"

call/call_factory.h

@@ -12,9 +12,9 @@
 #define CALL_CALL_FACTORY_H_
 
 #include "api/call/call_factory_interface.h"
+#include "api/sequence_checker.h"
 #include "call/call.h"
 #include "call/call_config.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/system/no_unique_address.h"
 
 namespace webrtc {

call/rtp_stream_receiver_controller.h

@@ -12,9 +12,9 @@
 
 #include <memory>
 
+#include "api/sequence_checker.h"
 #include "call/rtp_demuxer.h"
 #include "call/rtp_stream_receiver_controller_interface.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 
 namespace webrtc {
 

call/rtp_video_sender.h

@@ -22,6 +22,7 @@
 #include "api/fec_controller.h"
 #include "api/fec_controller_override.h"
 #include "api/rtc_event_log/rtc_event_log.h"
+#include "api/sequence_checker.h"
 #include "api/transport/field_trial_based_config.h"
 #include "api/video_codecs/video_encoder.h"
 #include "call/rtp_config.h"
@@ -38,7 +39,6 @@
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/rate_limiter.h"
 #include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {

call/simulated_network.h

@@ -17,13 +17,13 @@
 #include <vector>
 
 #include "absl/types/optional.h"
+#include "api/sequence_checker.h"
 #include "api/test/simulated_network.h"
 #include "api/units/data_size.h"
 #include "api/units/timestamp.h"
 #include "rtc_base/race_checker.h"
 #include "rtc_base/random.h"
 #include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {

common_video/BUILD.gn

@@ -42,6 +42,7 @@ rtc_library("common_video") {
 
   deps = [
     "../api:scoped_refptr",
+    "../api:sequence_checker",
     "../api/task_queue",
     "../api/units:time_delta",
     "../api/units:timestamp",

common_video/include/incoming_video_stream.h

@@ -13,12 +13,12 @@
 
 #include <stdint.h>
 
+#include "api/sequence_checker.h"
 #include "api/task_queue/task_queue_factory.h"
 #include "api/video/video_frame.h"
 #include "api/video/video_sink_interface.h"
 #include "common_video/video_render_frames.h"
 #include "rtc_base/race_checker.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread_annotations.h"
 

examples/androidnativeapi/jni/android_call_client.h

@@ -18,8 +18,8 @@
 
 #include "api/peer_connection_interface.h"
 #include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
 #include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 #include "sdk/android/native_api/video/video_source.h"
 

examples/objcnativeapi/objc/objc_call_client.h

@@ -18,8 +18,8 @@
 
 #include "api/peer_connection_interface.h"
 #include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
 #include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 
 @class RTC_OBJC_TYPE(RTCVideoCapturer);
 @protocol RTC_OBJC_TYPE

logging/BUILD.gn

@@ -261,13 +261,13 @@ if (rtc_enable_protobuf) {
       ":rtc_event_log_api",
       ":rtc_event_log_impl_encoder",
       "../api:libjingle_logging_api",
+      "../api:sequence_checker",
       "../api/rtc_event_log",
       "../api/task_queue",
       "../rtc_base:checks",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_task_queue",
       "../rtc_base:safe_minmax",
-      "../rtc_base/synchronization:sequence_checker",
       "../rtc_base/system:no_unique_address",
     ]
     absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]

logging/rtc_event_log/rtc_event_log_impl.h

@@ -21,9 +21,9 @@
 #include "api/rtc_event_log/rtc_event.h"
 #include "api/rtc_event_log/rtc_event_log.h"
 #include "api/rtc_event_log_output.h"
+#include "api/sequence_checker.h"
 #include "api/task_queue/task_queue_factory.h"
 #include "logging/rtc_event_log/encoder/rtc_event_log_encoder.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/system/no_unique_address.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread_annotations.h"

media/BUILD.gn

@@ -88,6 +88,7 @@ rtc_library("rtc_media_base") {
     "../api:rtc_error",
     "../api:rtp_parameters",
     "../api:scoped_refptr",
+    "../api:sequence_checker",
     "../api/audio:audio_frame_processor",
     "../api/audio_codecs:audio_codecs_api",
     "../api/crypto:frame_decryptor_interface",
@@ -116,7 +117,6 @@ rtc_library("rtc_media_base") {
     "../rtc_base:socket",
     "../rtc_base:stringutils",
     "../rtc_base/synchronization:mutex",
-    "../rtc_base/synchronization:sequence_checker",
     "../rtc_base/system:file_wrapper",
     "../rtc_base/system:rtc_export",
     "../rtc_base/third_party/sigslot",
@@ -183,6 +183,7 @@ rtc_library("rtc_simulcast_encoder_adapter") {
     ":rtc_media_base",
     "../api:fec_controller_api",
     "../api:scoped_refptr",
+    "../api:sequence_checker",
     "../api/video:video_codec_constants",
     "../api/video:video_frame",
     "../api/video:video_rtp_headers",
@@ -195,7 +196,6 @@ rtc_library("rtc_simulcast_encoder_adapter") {
     "../rtc_base:rtc_base_approved",
     "../rtc_base/experiments:encoder_info_settings",
     "../rtc_base/experiments:rate_control_settings",
-    "../rtc_base/synchronization:sequence_checker",
     "../rtc_base/system:no_unique_address",
     "../rtc_base/system:rtc_export",
     "../system_wrappers",
@@ -288,6 +288,7 @@ rtc_library("rtc_audio_video") {
     "../api:media_stream_interface",
     "../api:rtp_parameters",
     "../api:scoped_refptr",
+    "../api:sequence_checker",
     "../api:transport_api",
     "../api/audio:audio_frame_processor",
     "../api/audio:audio_mixer_api",
@@ -411,6 +412,7 @@ rtc_library("rtc_data") {
   deps = [
     ":rtc_media_base",
     "../api:call_api",
+    "../api:sequence_checker",
     "../api:transport_api",
     "../p2p:rtc_p2p",
     "../rtc_base",

media/base/video_broadcaster.h

@@ -12,11 +12,11 @@
 #define MEDIA_BASE_VIDEO_BROADCASTER_H_
 
 #include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
 #include "api/video/video_frame_buffer.h"
 #include "api/video/video_source_interface.h"
 #include "media/base/video_source_base.h"
 #include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace rtc {

media/base/video_source_base.h

@@ -13,10 +13,10 @@
 
 #include <vector>
 
+#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 "rtc_base/synchronization/sequence_checker.h"
 
 namespace rtc {
 

media/engine/simulcast_encoder_adapter.h

@@ -21,6 +21,7 @@
 
 #include "absl/types/optional.h"
 #include "api/fec_controller_override.h"
+#include "api/sequence_checker.h"
 #include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_encoder.h"
 #include "api/video_codecs/video_encoder_factory.h"
@@ -28,7 +29,6 @@
 #include "modules/video_coding/utility/framerate_controller.h"
 #include "rtc_base/atomic_ops.h"
 #include "rtc_base/experiments/encoder_info_settings.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/system/no_unique_address.h"
 #include "rtc_base/system/rtc_export.h"
 

media/engine/webrtc_video_engine.h

@@ -19,6 +19,7 @@
 
 #include "absl/types/optional.h"
 #include "api/call/transport.h"
+#include "api/sequence_checker.h"
 #include "api/transport/field_trial_based_config.h"
 #include "api/video/video_bitrate_allocator_factory.h"
 #include "api/video/video_frame.h"
@@ -34,7 +35,6 @@
 #include "media/engine/unhandled_packets_buffer.h"
 #include "rtc_base/network_route.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/thread_annotations.h"
 

media/engine/webrtc_voice_engine.h

@@ -18,6 +18,7 @@
 
 #include "api/audio_codecs/audio_encoder_factory.h"
 #include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
 #include "api/task_queue/task_queue_factory.h"
 #include "api/transport/rtp/rtp_source.h"
 #include "api/transport/webrtc_key_value_config.h"
@@ -28,7 +29,6 @@
 #include "modules/async_audio_processing/async_audio_processing.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/network_route.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/task_utils/pending_task_safety_flag.h"
 

media/sctp/sctp_transport.cc

@@ -34,6 +34,7 @@ constexpr int kSctpSuccessReturn = 1;
 #include "absl/algorithm/container.h"
 #include "absl/base/attributes.h"
 #include "absl/types/optional.h"
+#include "api/sequence_checker.h"
 #include "media/base/codec.h"
 #include "media/base/media_channel.h"
 #include "media/base/media_constants.h"
@@ -47,7 +48,6 @@ constexpr int kSctpSuccessReturn = 1;
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/string_utils.h"
 #include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/task_utils/to_queued_task.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/trace_event.h"

modules/async_audio_processing/BUILD.gn

@@ -18,13 +18,13 @@ rtc_library("async_audio_processing") {
 
   deps = [
     "../../api:scoped_refptr",
+    "../../api:sequence_checker",
     "../../api/audio:audio_frame_api",
     "../../api/audio:audio_frame_processor",
     "../../api/task_queue:task_queue",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_task_queue",
-    "../../rtc_base/synchronization:sequence_checker",
   ]
 }
 

modules/audio_device/BUILD.gn

@@ -68,6 +68,7 @@ rtc_library("audio_device_buffer") {
   deps = [
     ":audio_device_api",
     "../../api:array_view",
+    "../../api:sequence_checker",
     "../../api/task_queue",
     "../../common_audio:common_audio_c",
     "../../rtc_base:checks",
@@ -164,6 +165,7 @@ rtc_library("audio_device_impl") {
     "../../api:array_view",
     "../../api:refcountedbase",
     "../../api:scoped_refptr",
+    "../../api:sequence_checker",
     "../../api/task_queue",
     "../../common_audio",
     "../../common_audio:common_audio_c",
@@ -382,6 +384,7 @@ if (rtc_include_tests && !build_with_chromium) {
       ":mock_audio_device",
       "../../api:array_view",
       "../../api:scoped_refptr",
+      "../../api:sequence_checker",
       "../../api/task_queue",
       "../../api/task_queue:default_task_queue_factory",
       "../../common_audio",

modules/audio_device/android/aaudio_player.h

@@ -15,10 +15,10 @@
 
 #include <memory>
 
+#include "api/sequence_checker.h"
 #include "modules/audio_device/android/aaudio_wrapper.h"
 #include "modules/audio_device/include/audio_device_defines.h"
 #include "rtc_base/message_handler.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/thread_annotations.h"
 

modules/audio_device/android/aaudio_recorder.h

@@ -15,10 +15,10 @@
 
 #include <memory>
 
+#include "api/sequence_checker.h"
 #include "modules/audio_device/android/aaudio_wrapper.h"
 #include "modules/audio_device/include/audio_device_defines.h"
 #include "rtc_base/message_handler.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/thread.h"
 
 namespace webrtc {

modules/audio_device/android/aaudio_wrapper.h

@@ -13,8 +13,8 @@
 
 #include <aaudio/AAudio.h>
 
+#include "api/sequence_checker.h"
 #include "modules/audio_device/include/audio_device_defines.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 
 namespace webrtc {
 

modules/audio_device/android/audio_device_template.h

@@ -11,11 +11,11 @@
 #ifndef MODULES_AUDIO_DEVICE_ANDROID_AUDIO_DEVICE_TEMPLATE_H_
 #define MODULES_AUDIO_DEVICE_ANDROID_AUDIO_DEVICE_TEMPLATE_H_
 
+#include "api/sequence_checker.h"
 #include "modules/audio_device/android/audio_manager.h"
 #include "modules/audio_device/audio_device_generic.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 
 namespace webrtc {
 

modules/audio_device/android/audio_manager.h

@@ -16,6 +16,7 @@
 
 #include <memory>
 
+#include "api/sequence_checker.h"
 #include "modules/audio_device/android/audio_common.h"
 #include "modules/audio_device/android/opensles_common.h"
 #include "modules/audio_device/audio_device_config.h"
@@ -23,7 +24,6 @@
 #include "modules/audio_device/include/audio_device_defines.h"
 #include "modules/utility/include/helpers_android.h"
 #include "modules/utility/include/jvm_android.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 
 namespace webrtc {
 

modules/audio_device/android/audio_record_jni.h

@@ -15,12 +15,12 @@
 
 #include <memory>
 
+#include "api/sequence_checker.h"
 #include "modules/audio_device/android/audio_manager.h"
 #include "modules/audio_device/audio_device_generic.h"
 #include "modules/audio_device/include/audio_device_defines.h"
 #include "modules/utility/include/helpers_android.h"
 #include "modules/utility/include/jvm_android.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 
 namespace webrtc {
 

modules/audio_device/android/audio_track_jni.h

@@ -15,13 +15,13 @@
 
 #include <memory>
 
+#include "api/sequence_checker.h"
 #include "modules/audio_device/android/audio_common.h"
 #include "modules/audio_device/android/audio_manager.h"
 #include "modules/audio_device/audio_device_generic.h"
 #include "modules/audio_device/include/audio_device_defines.h"
 #include "modules/utility/include/helpers_android.h"
 #include "modules/utility/include/jvm_android.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 
 namespace webrtc {
 

modules/audio_device/android/opensles_player.h

@@ -15,13 +15,13 @@
 #include <SLES/OpenSLES_Android.h>
 #include <SLES/OpenSLES_AndroidConfiguration.h>
 
+#include "api/sequence_checker.h"
 #include "modules/audio_device/android/audio_common.h"
 #include "modules/audio_device/android/audio_manager.h"
 #include "modules/audio_device/android/opensles_common.h"
 #include "modules/audio_device/audio_device_generic.h"
 #include "modules/audio_device/include/audio_device_defines.h"
 #include "modules/utility/include/helpers_android.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 
 namespace webrtc {
 

modules/audio_device/android/opensles_recorder.h

@@ -17,13 +17,13 @@
 
 #include <memory>
 
+#include "api/sequence_checker.h"
 #include "modules/audio_device/android/audio_common.h"
 #include "modules/audio_device/android/audio_manager.h"
 #include "modules/audio_device/android/opensles_common.h"
 #include "modules/audio_device/audio_device_generic.h"
 #include "modules/audio_device/include/audio_device_defines.h"
 #include "modules/utility/include/helpers_android.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 
 namespace webrtc {
 

modules/audio_device/audio_device_buffer.h

@@ -16,11 +16,11 @@
 
 #include <atomic>
 
+#include "api/sequence_checker.h"
 #include "api/task_queue/task_queue_factory.h"
 #include "modules/audio_device/include/audio_device_defines.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread_annotations.h"
 

modules/audio_device/audio_device_unittest.cc

@@ -19,6 +19,7 @@
 #include "absl/types/optional.h"
 #include "api/array_view.h"
 #include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
 #include "api/task_queue/default_task_queue_factory.h"
 #include "api/task_queue/task_queue_factory.h"
 #include "modules/audio_device/audio_device_impl.h"
@@ -30,7 +31,6 @@
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/race_checker.h"
 #include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/time_utils.h"
 #include "test/gmock.h"

modules/audio_device/linux/audio_device_pulse_linux.h

@@ -13,6 +13,7 @@
 
 #include <memory>
 
+#include "api/sequence_checker.h"
 #include "modules/audio_device/audio_device_buffer.h"
 #include "modules/audio_device/audio_device_generic.h"
 #include "modules/audio_device/include/audio_device.h"
@@ -22,7 +23,6 @@
 #include "rtc_base/event.h"
 #include "rtc_base/platform_thread.h"
 #include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/thread_annotations.h"
 
 #if defined(WEBRTC_USE_X11)

modules/audio_device/linux/audio_mixer_manager_pulse_linux.h

@@ -14,7 +14,7 @@
 #include <pulse/pulseaudio.h>
 #include <stdint.h>
 
-#include "rtc_base/synchronization/sequence_checker.h"
+#include "api/sequence_checker.h"
 
 #ifndef UINT32_MAX
 #define UINT32_MAX ((uint32_t)-1)

modules/audio_device/win/audio_device_module_win.cc

@@ -13,13 +13,13 @@
 #include <memory>
 #include <utility>
 
+#include "api/sequence_checker.h"
 #include "modules/audio_device/audio_device_buffer.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/ref_counted_object.h"
 #include "rtc_base/string_utils.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 
 namespace webrtc {
 namespace webrtc_win {

modules/audio_device/win/core_audio_base_win.h

@@ -17,9 +17,9 @@
 #include <string>
 
 #include "absl/types/optional.h"
+#include "api/sequence_checker.h"
 #include "modules/audio_device/win/core_audio_utility_win.h"
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 
 namespace webrtc {
 

modules/congestion_controller/rtp/BUILD.gn

@@ -24,13 +24,13 @@ rtc_library("control_handler") {
   ]
 
   deps = [
+    "../../../api:sequence_checker",
     "../../../api/transport:network_control",
     "../../../api/units:data_rate",
     "../../../api/units:data_size",
     "../../../api/units:time_delta",
     "../../../rtc_base:checks",
     "../../../rtc_base:safe_minmax",
-    "../../../rtc_base/synchronization:sequence_checker",
     "../../../rtc_base/system:no_unique_address",
     "../../../system_wrappers:field_trial",
     "../../pacing",
@@ -52,6 +52,7 @@ rtc_library("transport_feedback") {
 
   deps = [
     "../..:module_api_public",
+    "../../../api:sequence_checker",
     "../../../api/transport:network_control",
     "../../../api/units:data_size",
     "../../../api/units:timestamp",

modules/congestion_controller/rtp/control_handler.h

@@ -14,12 +14,12 @@
 #include <stdint.h>
 
 #include "absl/types/optional.h"
+#include "api/sequence_checker.h"
 #include "api/transport/network_types.h"
 #include "api/units/data_size.h"
 #include "api/units/time_delta.h"
 #include "modules/pacing/paced_sender.h"
 #include "rtc_base/constructor_magic.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/system/no_unique_address.h"
 
 namespace webrtc {

modules/congestion_controller/rtp/transport_feedback_adapter.h

@@ -16,12 +16,12 @@
 #include <utility>
 #include <vector>
 
+#include "api/sequence_checker.h"
 #include "api/transport/network_types.h"
 #include "modules/include/module_common_types_public.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "rtc_base/network/sent_packet.h"
 #include "rtc_base/network_route.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {

modules/desktop_capture/BUILD.gn

@@ -454,6 +454,7 @@ rtc_library("desktop_capture_generic") {
     "../../api:function_view",
     "../../api:refcountedbase",
     "../../api:scoped_refptr",
+    "../../api:sequence_checker",
     "../../rtc_base",  # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
     "../../rtc_base:checks",
     "../../rtc_base/synchronization:mutex",

modules/desktop_capture/fallback_desktop_capturer_wrapper.cc

@@ -14,8 +14,8 @@
 
 #include <utility>
 
+#include "api/sequence_checker.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "system_wrappers/include/metrics.h"
 
 namespace webrtc {

modules/desktop_capture/mac/desktop_frame_provider.h

@@ -17,8 +17,8 @@
 #include <map>
 #include <memory>
 
+#include "api/sequence_checker.h"
 #include "modules/desktop_capture/shared_desktop_frame.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "sdk/objc/helpers/scoped_cftyperef.h"
 
 namespace webrtc {

modules/desktop_capture/mac/screen_capturer_mac.h

@@ -16,6 +16,7 @@
 #include <memory>
 #include <vector>
 
+#include "api/sequence_checker.h"
 #include "modules/desktop_capture/desktop_capture_options.h"
 #include "modules/desktop_capture/desktop_capturer.h"
 #include "modules/desktop_capture/desktop_frame.h"
@@ -27,7 +28,6 @@
 #include "modules/desktop_capture/screen_capture_frame_queue.h"
 #include "modules/desktop_capture/screen_capturer_helper.h"
 #include "modules/desktop_capture/shared_desktop_frame.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 
 namespace webrtc {
 

modules/desktop_capture/win/wgc_capture_session.h

@@ -14,11 +14,12 @@
 #include <d3d11.h>
 #include <windows.graphics.capture.h>
 #include <wrl/client.h>
+
 #include <memory>
 
+#include "api/sequence_checker.h"
 #include "modules/desktop_capture/desktop_capture_options.h"
 #include "modules/desktop_capture/win/wgc_capture_source.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 
 namespace webrtc {
 

modules/pacing/BUILD.gn

@@ -34,6 +34,7 @@ rtc_library("pacing") {
     ":interval_budget",
     "..:module_api",
     "../../api:function_view",
+    "../../api:sequence_checker",
     "../../api/rtc_event_log",
     "../../api/task_queue:task_queue",
     "../../api/transport:field_trial_based_config",
@@ -50,7 +51,6 @@ rtc_library("pacing") {
     "../../rtc_base:rtc_task_queue",
     "../../rtc_base/experiments:field_trial_parser",
     "../../rtc_base/synchronization:mutex",
-    "../../rtc_base/synchronization:sequence_checker",
     "../../rtc_base/task_utils:to_queued_task",
     "../../system_wrappers",
     "../../system_wrappers:metrics",

modules/pacing/task_queue_paced_sender.h

@@ -20,6 +20,7 @@
 #include <vector>
 
 #include "absl/types/optional.h"
+#include "api/sequence_checker.h"
 #include "api/task_queue/task_queue_factory.h"
 #include "api/units/data_size.h"
 #include "api/units/time_delta.h"
@@ -30,7 +31,6 @@
 #include "modules/pacing/rtp_packet_pacer.h"
 #include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
 #include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread_annotations.h"
 

modules/rtp_rtcp/BUILD.gn

@@ -255,6 +255,7 @@ rtc_library("rtp_rtcp") {
     "../../api:rtp_packet_info",
     "../../api:rtp_parameters",
     "../../api:scoped_refptr",
+    "../../api:sequence_checker",
     "../../api:transport_api",
     "../../api/audio_codecs:audio_codecs_api",
     "../../api/crypto:frame_encryptor_interface",
@@ -292,7 +293,6 @@ rtc_library("rtp_rtcp") {
     "../../rtc_base:safe_minmax",
     "../../rtc_base/experiments:field_trial_parser",
     "../../rtc_base/synchronization:mutex",
-    "../../rtc_base/synchronization:sequence_checker",
     "../../rtc_base/system:no_unique_address",
     "../../rtc_base/task_utils:pending_task_safety_flag",
     "../../rtc_base/task_utils:repeating_task",

modules/rtp_rtcp/include/flexfec_receiver.h

@@ -15,11 +15,11 @@
 
 #include <memory>
 
+#include "api/sequence_checker.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/include/ulpfec_receiver.h"
 #include "modules/rtp_rtcp/source/forward_error_correction.h"
 #include "modules/rtp_rtcp/source/rtp_packet_received.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/system/no_unique_address.h"
 #include "rtc_base/thread_annotations.h"
 

modules/rtp_rtcp/source/rtp_rtcp_impl2.h

@@ -21,6 +21,7 @@
 
 #include "absl/types/optional.h"
 #include "api/rtp_headers.h"
+#include "api/sequence_checker.h"
 #include "api/task_queue/task_queue_base.h"
 #include "api/video/video_bitrate_allocation.h"
 #include "modules/include/module_fec_types.h"
@@ -36,7 +37,6 @@
 #include "modules/rtp_rtcp/source/rtp_sender_egress.h"
 #include "rtc_base/gtest_prod_util.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/task_utils/pending_task_safety_flag.h"
 #include "rtc_base/task_utils/repeating_task.h"

modules/rtp_rtcp/source/rtp_sender_egress.h

@@ -19,6 +19,7 @@
 #include "absl/types/optional.h"
 #include "api/call/transport.h"
 #include "api/rtc_event_log/rtc_event_log.h"
+#include "api/sequence_checker.h"
 #include "api/task_queue/task_queue_base.h"
 #include "api/units/data_rate.h"
 #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h"
@@ -29,7 +30,6 @@
 #include "modules/rtp_rtcp/source/rtp_sequence_number_map.h"
 #include "rtc_base/rate_statistics.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/task_utils/pending_task_safety_flag.h"
 #include "rtc_base/task_utils/repeating_task.h"

modules/rtp_rtcp/source/rtp_sender_video.h

@@ -20,6 +20,7 @@
 #include "api/array_view.h"
 #include "api/frame_transformer_interface.h"
 #include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
 #include "api/task_queue/task_queue_base.h"
 #include "api/transport/rtp/dependency_descriptor.h"
 #include "api/video/video_codec_type.h"
@@ -37,7 +38,6 @@
 #include "rtc_base/race_checker.h"
 #include "rtc_base/rate_statistics.h"
 #include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {

modules/rtp_rtcp/source/ulpfec_receiver_impl.h

@@ -17,12 +17,12 @@
 #include <memory>
 #include <vector>
 
+#include "api/sequence_checker.h"
 #include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/include/ulpfec_receiver.h"
 #include "modules/rtp_rtcp/source/forward_error_correction.h"
 #include "modules/rtp_rtcp/source/rtp_packet_received.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/system/no_unique_address.h"
 
 namespace webrtc {

modules/utility/BUILD.gn

@@ -31,6 +31,7 @@ rtc_library("utility") {
 
   deps = [
     "..:module_api",
+    "../../api:sequence_checker",
     "../../api/task_queue",
     "../../common_audio",
     "../../rtc_base:checks",

modules/utility/include/jvm_android.h

@@ -16,8 +16,8 @@
 #include <memory>
 #include <string>
 
+#include "api/sequence_checker.h"
 #include "modules/utility/include/helpers_android.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 
 namespace webrtc {
 

modules/utility/source/process_thread_impl.h

@@ -17,6 +17,7 @@
 #include <memory>
 #include <queue>
 
+#include "api/sequence_checker.h"
 #include "api/task_queue/queued_task.h"
 #include "modules/include/module.h"
 #include "modules/utility/include/process_thread.h"
@@ -24,7 +25,6 @@
 #include "rtc_base/event.h"
 #include "rtc_base/location.h"
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 
 namespace webrtc {
 

modules/video_capture/windows/sink_filter_ds.h

@@ -17,9 +17,9 @@
 #include <memory>
 #include <vector>
 
+#include "api/sequence_checker.h"
 #include "modules/video_capture/video_capture_impl.h"
 #include "modules/video_capture/windows/help_functions_ds.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {

modules/video_coding/BUILD.gn

@@ -81,6 +81,7 @@ rtc_library("nack_module") {
 
   deps = [
     "..:module_api",
+    "../../api:sequence_checker",
     "../../api/units:time_delta",
     "../../api/units:timestamp",
     "../../rtc_base:checks",
@@ -88,7 +89,6 @@ rtc_library("nack_module") {
     "../../rtc_base:rtc_numerics",
     "../../rtc_base:rtc_task_queue",
     "../../rtc_base/experiments:field_trial_parser",
-    "../../rtc_base/synchronization:sequence_checker",
     "../../rtc_base/task_utils:pending_task_safety_flag",
     "../../rtc_base/task_utils:repeating_task",
     "../../system_wrappers",
@@ -168,6 +168,7 @@ rtc_library("video_coding") {
     "../../api:rtp_headers",
     "../../api:rtp_packet_info",
     "../../api:scoped_refptr",
+    "../../api:sequence_checker",
     "../../api/units:data_rate",
     "../../api/units:time_delta",
     "../../api/video:builtin_video_bitrate_allocator_factory",
@@ -197,7 +198,6 @@ rtc_library("video_coding") {
     "../../rtc_base/experiments:rate_control_settings",
     "../../rtc_base/experiments:rtt_mult_experiment",
     "../../rtc_base/synchronization:mutex",
-    "../../rtc_base/synchronization:sequence_checker",
     "../../rtc_base/system:no_unique_address",
     "../../rtc_base/task_utils:repeating_task",
     "../../rtc_base/task_utils:to_queued_task",
@@ -274,6 +274,7 @@ rtc_library("video_coding_legacy") {
     "..:module_api_public",
     "../../api:rtp_headers",
     "../../api:rtp_packet_info",
+    "../../api:sequence_checker",
     "../../api/video:encoded_image",
     "../../api/video:video_frame",
     "../../api/video:video_frame_type",
@@ -286,7 +287,6 @@ rtc_library("video_coding_legacy") {
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_event",
     "../../rtc_base/synchronization:mutex",
-    "../../rtc_base/synchronization:sequence_checker",
     "../../system_wrappers",
     "../rtp_rtcp:rtp_rtcp_format",
     "../rtp_rtcp:rtp_video_header",
@@ -339,6 +339,7 @@ rtc_library("video_coding_utility") {
   deps = [
     ":video_codec_interface",
     "../../api:scoped_refptr",
+    "../../api:sequence_checker",
     "../../api/video:encoded_frame",
     "../../api/video:encoded_image",
     "../../api/video:video_adaptation",
@@ -357,7 +358,6 @@ rtc_library("video_coding_utility") {
     "../../rtc_base/experiments:quality_scaling_experiment",
     "../../rtc_base/experiments:rate_control_settings",
     "../../rtc_base/experiments:stable_target_rate_experiment",
-    "../../rtc_base/synchronization:sequence_checker",
     "../../rtc_base/system:arch",
     "../../rtc_base/system:file_wrapper",
     "../../rtc_base/system:no_unique_address",
@@ -723,6 +723,7 @@ if (rtc_include_tests) {
       "../../api:create_frame_generator",
       "../../api:frame_generator_api",
       "../../api:scoped_refptr",
+      "../../api:sequence_checker",
       "../../api:videocodec_test_fixture_api",
       "../../api/task_queue",
       "../../api/video:builtin_video_bitrate_allocator_factory",
@@ -738,7 +739,6 @@ if (rtc_include_tests) {
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_task_queue",
       "../../rtc_base/synchronization:mutex",
-      "../../rtc_base/synchronization:sequence_checker",
       "../../rtc_base/system:no_unique_address",
       "../../rtc_base/task_utils:to_queued_task",
       "../../test:test_support",

modules/video_coding/codecs/test/videoprocessor.h

@@ -20,6 +20,7 @@
 #include <vector>
 
 #include "absl/types/optional.h"
+#include "api/sequence_checker.h"
 #include "api/task_queue/queued_task.h"
 #include "api/task_queue/task_queue_base.h"
 #include "api/test/videocodec_test_fixture.h"
@@ -37,7 +38,6 @@
 #include "rtc_base/buffer.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/constructor_magic.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/system/no_unique_address.h"
 #include "rtc_base/thread_annotations.h"
 #include "test/testsupport/frame_reader.h"

modules/video_coding/frame_buffer2.h

@@ -18,6 +18,7 @@
 #include <vector>
 
 #include "absl/container/inlined_vector.h"
+#include "api/sequence_checker.h"
 #include "api/video/encoded_frame.h"
 #include "modules/video_coding/include/video_coding_defines.h"
 #include "modules/video_coding/inter_frame_delay.h"
@@ -27,7 +28,6 @@
 #include "rtc_base/experiments/rtt_mult_experiment.h"
 #include "rtc_base/numerics/sequence_number_util.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/task_queue.h"
 #include "rtc_base/task_utils/repeating_task.h"

modules/video_coding/generic_decoder.h

@@ -14,6 +14,7 @@
 #include <memory>
 #include <string>
 
+#include "api/sequence_checker.h"
 #include "api/units/time_delta.h"
 #include "modules/video_coding/encoded_frame.h"
 #include "modules/video_coding/include/video_codec_interface.h"
@@ -21,7 +22,6 @@
 #include "modules/video_coding/timing.h"
 #include "rtc_base/experiments/field_trial_parser.h"
 #include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 
 namespace webrtc {
 

modules/video_coding/loss_notification_controller.h

@@ -17,8 +17,8 @@
 
 #include "absl/types/optional.h"
 #include "api/array_view.h"
+#include "api/sequence_checker.h"
 #include "modules/include/module_common_types.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/system/no_unique_address.h"
 
 namespace webrtc {

modules/video_coding/nack_module2.h

@@ -17,11 +17,11 @@
 #include <set>
 #include <vector>
 
+#include "api/sequence_checker.h"
 #include "api/units/time_delta.h"
 #include "modules/include/module_common_types.h"
 #include "modules/video_coding/histogram.h"
 #include "rtc_base/numerics/sequence_number_util.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/task_utils/pending_task_safety_flag.h"
 #include "rtc_base/task_utils/repeating_task.h"

modules/video_coding/utility/quality_scaler.h

@@ -18,12 +18,12 @@
 
 #include "absl/types/optional.h"
 #include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
 #include "api/video_codecs/video_encoder.h"
 #include "rtc_base/experiments/quality_scaling_experiment.h"
 #include "rtc_base/numerics/moving_average.h"
 #include "rtc_base/ref_count.h"
 #include "rtc_base/ref_counted_object.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/system/no_unique_address.h"
 #include "rtc_base/task_queue.h"
 

modules/video_coding/video_coding_impl.cc

@@ -13,10 +13,10 @@
 #include <algorithm>
 #include <memory>
 
+#include "api/sequence_checker.h"
 #include "api/video/encoded_image.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/timing.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "system_wrappers/include/clock.h"
 
 namespace webrtc {

modules/video_coding/video_coding_impl.h

@@ -16,6 +16,7 @@
 #include <vector>
 
 #include "absl/types/optional.h"
+#include "api/sequence_checker.h"
 #include "modules/video_coding/decoder_database.h"
 #include "modules/video_coding/frame_buffer.h"
 #include "modules/video_coding/generic_decoder.h"
@@ -25,7 +26,6 @@
 #include "modules/video_coding/timing.h"
 #include "rtc_base/one_time_event.h"
 #include "rtc_base/synchronization/mutex.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/thread_annotations.h"
 #include "system_wrappers/include/clock.h"
 

modules/video_coding/video_receiver.cc

@@ -14,6 +14,7 @@
 #include <vector>
 
 #include "api/rtp_headers.h"
+#include "api/sequence_checker.h"
 #include "api/video_codecs/video_codec.h"
 #include "api/video_codecs/video_decoder.h"
 #include "modules/utility/include/process_thread.h"
@@ -33,7 +34,6 @@
 #include "rtc_base/location.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/one_time_event.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/trace_event.h"
 #include "system_wrappers/include/clock.h"
 

modules/video_coding/video_receiver2.h

@@ -11,11 +11,11 @@
 #ifndef MODULES_VIDEO_CODING_VIDEO_RECEIVER2_H_
 #define MODULES_VIDEO_CODING_VIDEO_RECEIVER2_H_
 
+#include "api/sequence_checker.h"
 #include "modules/video_coding/decoder_database.h"
 #include "modules/video_coding/encoded_frame.h"
 #include "modules/video_coding/generic_decoder.h"
 #include "modules/video_coding/timing.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "system_wrappers/include/clock.h"
 
 namespace webrtc {

p2p/BUILD.gn

@@ -110,7 +110,6 @@ rtc_library("rtc_p2p") {
     "../rtc_base:socket_server",
     "../rtc_base:threading",
     "../rtc_base/experiments:field_trial_parser",
-    "../rtc_base/synchronization:sequence_checker",
     "../rtc_base/system:no_unique_address",
 
     # Needed by pseudo_tcp, which should move to a separate target.
@@ -183,6 +182,7 @@ if (rtc_include_tests) {
       ":rtc_p2p",
       "../api:libjingle_peerconnection_api",
       "../api:packet_socket_factory",
+      "../api:sequence_checker",
       "../api/crypto:options",
       "../api/transport:stun_types",
       "../rtc_base",
@@ -277,6 +277,7 @@ rtc_library("p2p_server_utils") {
   deps = [
     ":rtc_p2p",
     "../api:packet_socket_factory",
+    "../api:sequence_checker",
     "../api/transport:stun_types",
     "../rtc_base",
     "../rtc_base:checks",
@@ -298,6 +299,7 @@ rtc_library("libstunprober") {
   deps = [
     ":rtc_p2p",
     "../api:packet_socket_factory",
+    "../api:sequence_checker",
     "../api/transport:stun_types",
     "../rtc_base",
     "../rtc_base:async_resolver_interface",

p2p/base/dtls_transport.h

@@ -16,6 +16,7 @@
 #include <vector>
 
 #include "api/crypto/crypto_options.h"
+#include "api/sequence_checker.h"
 #include "p2p/base/dtls_transport_internal.h"
 #include "p2p/base/ice_transport_internal.h"
 #include "rtc_base/buffer.h"
@@ -24,7 +25,6 @@
 #include "rtc_base/ssl_stream_adapter.h"
 #include "rtc_base/stream.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/system/no_unique_address.h"
 
 namespace rtc {

p2p/base/test_turn_server.h

@@ -14,13 +14,13 @@
 #include <string>
 #include <vector>
 
+#include "api/sequence_checker.h"
 #include "api/transport/stun.h"
 #include "p2p/base/basic_packet_socket_factory.h"
 #include "p2p/base/turn_server.h"
 #include "rtc_base/async_udp_socket.h"
 #include "rtc_base/ssl_adapter.h"
 #include "rtc_base/ssl_identity.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/thread.h"
 
 namespace cricket {

p2p/base/turn_server.h

@@ -19,11 +19,11 @@
 #include <utility>
 #include <vector>
 
+#include "api/sequence_checker.h"
 #include "p2p/base/port_interface.h"
 #include "rtc_base/async_invoker.h"
 #include "rtc_base/async_packet_socket.h"
 #include "rtc_base/socket_address.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"
 

p2p/stunprober/stun_prober.h

@@ -15,6 +15,7 @@
 #include <string>
 #include <vector>
 
+#include "api/sequence_checker.h"
 #include "rtc_base/async_invoker.h"
 #include "rtc_base/byte_buffer.h"
 #include "rtc_base/callback.h"
@@ -22,7 +23,6 @@
 #include "rtc_base/ip_address.h"
 #include "rtc_base/network.h"
 #include "rtc_base/socket_address.h"
-#include "rtc_base/synchronization/sequence_checker.h"
 #include "rtc_base/system/rtc_export.h"
 #include "rtc_base/thread.h"
 

pc/BUILD.gn

@@ -90,6 +90,7 @@ rtc_library("rtc_pc_base") {
     "../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_library("rtc_pc_base") {
     "../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 @@ rtc_library("peerconnection") {
     "../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_library("peerconnection") {
     "../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 @@ rtc_library("connection_context") {
     "../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 @@ rtc_library("peer_connection_message_handler") {
     "../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 @@ rtc_library("rtp_transceiver") {
     "../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_library("rtp_transceiver") {
     "../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 @@ rtc_library("rtp_transmission_manager") {
     "../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 @@ rtc_library("audio_rtp_receiver") {
     "../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 @@ rtc_library("video_rtp_receiver") {
     "../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 @@ rtc_library("video_rtp_track_source") {
   ]
   deps = [
     ":video_track_source",
+    "../api:sequence_checker",
     "../api/video:recordable_encoded_frame",
     "../api/video:video_frame",
     "../media:rtc_media_base",
@@ -579,9 +584,9 @@ rtc_library("audio_track") {
   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 @@ rtc_library("video_track") {
   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 @@ rtc_library("jitter_buffer_delay") {
   ]
   deps = [
     ":jitter_buffer_delay_interface",
+    "../api:sequence_checker",
     "../media:rtc_media_base",
     "../rtc_base",
     "../rtc_base:checks",
@@ -664,6 +671,7 @@ rtc_library("remote_audio_source") {
     "../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 @@ rtc_library("video_track_source") {
   ]
   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 @@ if (rtc_include_tests && !build_with_chromium) {
       "../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 @@ if (rtc_include_tests && !build_with_chromium) {
       "../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",

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 {
 

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 {
 

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"

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"

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 {

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"
 

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"

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 {
 

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 {
 

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"
 

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 {

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"