diff --git a/logging/BUILD.gn b/logging/BUILD.gn index 13e8523a85..849c3b2e76 100644 --- a/logging/BUILD.gn +++ b/logging/BUILD.gn @@ -49,7 +49,6 @@ rtc_source_set("rtc_stream_config") { ] deps = [ - ":rtc_event_log_api", "../api:rtp_headers", "../api:rtp_parameters", ] @@ -62,8 +61,8 @@ rtc_source_set("rtc_event_pacing") { ] deps = [ - ":rtc_event_log_api", "../api:scoped_refptr", + "../api/rtc_event_log", "//third_party/abseil-cpp/absl/memory", ] } @@ -81,9 +80,9 @@ rtc_source_set("rtc_event_audio") { ] deps = [ - ":rtc_event_log_api", ":rtc_stream_config", "../api:scoped_refptr", + "../api/rtc_event_log", "../modules/audio_coding:audio_network_adaptor_config", "../rtc_base:checks", "//third_party/abseil-cpp/absl/memory", @@ -107,8 +106,8 @@ rtc_source_set("rtc_event_bwe") { ] deps = [ - ":rtc_event_log_api", "../api:scoped_refptr", + "../api/rtc_event_log", "../modules/remote_bitrate_estimator", "//third_party/abseil-cpp/absl/memory", ] @@ -125,7 +124,7 @@ rtc_source_set("rtc_event_generic_packet_events") { "rtc_event_log/events/rtc_event_generic_packet_sent.h", ] deps = [ - ":rtc_event_log_api", + "../api/rtc_event_log", "../rtc_base:timeutils", "//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/types:optional", @@ -145,9 +144,9 @@ rtc_source_set("rtc_event_rtp_rtcp") { ] deps = [ - ":rtc_event_log_api", "../api:array_view", "../api:scoped_refptr", + "../api/rtc_event_log", "../modules/rtp_rtcp:rtp_rtcp_format", "../rtc_base:checks", "../rtc_base:rtc_base_approved", @@ -164,9 +163,9 @@ rtc_source_set("rtc_event_video") { ] deps = [ - ":rtc_event_log_api", ":rtc_stream_config", "../api:scoped_refptr", + "../api/rtc_event_log", "../rtc_base:checks", "//third_party/abseil-cpp/absl/memory", ] @@ -274,7 +273,6 @@ rtc_source_set("fake_rtc_event_log") { deps = [ ":ice_log", - ":rtc_event_log_api", "../api/rtc_event_log", "../rtc_base", "../rtc_base:checks", @@ -432,11 +430,8 @@ rtc_source_set("ice_log") { ] deps = [ - ":rtc_event_log_api", "../api:libjingle_logging_api", - - # For api/dtls_transport_interface.h - "../api:libjingle_peerconnection_api", + "../api:libjingle_peerconnection_api", # For api/dtls_transport_interface.h "../api/rtc_event_log", "../rtc_base:rtc_base_approved", "//third_party/abseil-cpp/absl/memory", diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder.h b/logging/rtc_event_log/encoder/rtc_event_log_encoder.h index 6ce750f67e..3c3dc78990 100644 --- a/logging/rtc_event_log/encoder/rtc_event_log_encoder.h +++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder.h @@ -15,7 +15,7 @@ #include #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { class RtcEventLogEncoder { diff --git a/logging/rtc_event_log/events/rtc_event_alr_state.h b/logging/rtc_event_log/events/rtc_event_alr_state.h index 9769585d3d..0869aa4d98 100644 --- a/logging/rtc_event_log/events/rtc_event_alr_state.h +++ b/logging/rtc_event_log/events/rtc_event_alr_state.h @@ -13,7 +13,7 @@ #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h b/logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h index ec6ca1125c..7c50054561 100644 --- a/logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h +++ b/logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h @@ -13,7 +13,7 @@ #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_audio_playout.h b/logging/rtc_event_log/events/rtc_event_audio_playout.h index 5c95347730..45836b79e3 100644 --- a/logging/rtc_event_log/events/rtc_event_audio_playout.h +++ b/logging/rtc_event_log/events/rtc_event_audio_playout.h @@ -15,7 +15,7 @@ #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.h b/logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.h index 2b73f63f00..67f28602f3 100644 --- a/logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.h +++ b/logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.h @@ -13,7 +13,7 @@ #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h b/logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h index c0efa95090..8617b950e7 100644 --- a/logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h +++ b/logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h @@ -13,7 +13,7 @@ #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h b/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h index 60c4c7638e..8908ce2be1 100644 --- a/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h +++ b/logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h @@ -15,7 +15,7 @@ #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h b/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h index 0192bbe9fd..78829a9586 100644 --- a/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h +++ b/logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h @@ -15,7 +15,7 @@ #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_dtls_transport_state.h b/logging/rtc_event_log/events/rtc_event_dtls_transport_state.h index b61cb33c74..4fbe5a7932 100644 --- a/logging/rtc_event_log/events/rtc_event_dtls_transport_state.h +++ b/logging/rtc_event_log/events/rtc_event_dtls_transport_state.h @@ -14,7 +14,7 @@ #include #include "api/dtls_transport_interface.h" -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_dtls_writable_state.h b/logging/rtc_event_log/events/rtc_event_dtls_writable_state.h index 4f920d9fb6..06a7f9db7e 100644 --- a/logging/rtc_event_log/events/rtc_event_dtls_writable_state.h +++ b/logging/rtc_event_log/events/rtc_event_dtls_writable_state.h @@ -13,7 +13,7 @@ #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_generic_ack_received.h b/logging/rtc_event_log/events/rtc_event_generic_ack_received.h index f4399517ac..689c124619 100644 --- a/logging/rtc_event_log/events/rtc_event_generic_ack_received.h +++ b/logging/rtc_event_log/events/rtc_event_generic_ack_received.h @@ -15,7 +15,7 @@ #include #include "absl/types/optional.h" -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_generic_packet_received.h b/logging/rtc_event_log/events/rtc_event_generic_packet_received.h index 9b16d8825a..1034826a47 100644 --- a/logging/rtc_event_log/events/rtc_event_generic_packet_received.h +++ b/logging/rtc_event_log/events/rtc_event_generic_packet_received.h @@ -13,7 +13,7 @@ #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_generic_packet_sent.h b/logging/rtc_event_log/events/rtc_event_generic_packet_sent.h index 38936805ea..d87a54cbe2 100644 --- a/logging/rtc_event_log/events/rtc_event_generic_packet_sent.h +++ b/logging/rtc_event_log/events/rtc_event_generic_packet_sent.h @@ -13,7 +13,7 @@ #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h index 3fe3307ba1..88b8c8268f 100644 --- a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h +++ b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h @@ -15,7 +15,7 @@ #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h index 9fb83d87cf..338942acb3 100644 --- a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h +++ b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h @@ -15,7 +15,7 @@ #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_probe_cluster_created.h b/logging/rtc_event_log/events/rtc_event_probe_cluster_created.h index 002537e978..7bfe6a252e 100644 --- a/logging/rtc_event_log/events/rtc_event_probe_cluster_created.h +++ b/logging/rtc_event_log/events/rtc_event_probe_cluster_created.h @@ -15,7 +15,7 @@ #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_probe_result_failure.h b/logging/rtc_event_log/events/rtc_event_probe_result_failure.h index 02e353b502..a493de8ec3 100644 --- a/logging/rtc_event_log/events/rtc_event_probe_result_failure.h +++ b/logging/rtc_event_log/events/rtc_event_probe_result_failure.h @@ -15,7 +15,7 @@ #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_probe_result_success.h b/logging/rtc_event_log/events/rtc_event_probe_result_success.h index b3a93fe985..e0aba982a1 100644 --- a/logging/rtc_event_log/events/rtc_event_probe_result_success.h +++ b/logging/rtc_event_log/events/rtc_event_probe_result_success.h @@ -15,7 +15,7 @@ #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_route_change.h b/logging/rtc_event_log/events/rtc_event_route_change.h index 3648891931..09fb31c570 100644 --- a/logging/rtc_event_log/events/rtc_event_route_change.h +++ b/logging/rtc_event_log/events/rtc_event_route_change.h @@ -13,7 +13,7 @@ #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h b/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h index 2d896127f0..8237afea90 100644 --- a/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h +++ b/logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h @@ -16,7 +16,7 @@ #include #include "api/array_view.h" -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" #include "rtc_base/buffer.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h b/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h index d281206c25..f451c7301e 100644 --- a/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h +++ b/logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h @@ -16,7 +16,7 @@ #include #include "api/array_view.h" -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" #include "rtc_base/buffer.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.h b/logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.h index c689378d9a..7e30d6d7c8 100644 --- a/logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.h +++ b/logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.h @@ -13,7 +13,7 @@ #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" #include "modules/rtp_rtcp/source/rtp_packet.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.h b/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.h index 4f9cd68374..9211367bf4 100644 --- a/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.h +++ b/logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.h @@ -13,7 +13,7 @@ #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" #include "modules/rtp_rtcp/source/rtp_packet.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h b/logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h index 801ba7ddd4..fe5099d11b 100644 --- a/logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h +++ b/logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h @@ -13,7 +13,7 @@ #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" #include "logging/rtc_event_log/rtc_stream_config.h" namespace webrtc { diff --git a/logging/rtc_event_log/events/rtc_event_video_send_stream_config.h b/logging/rtc_event_log/events/rtc_event_video_send_stream_config.h index fe274c8c3a..11dd148b95 100644 --- a/logging/rtc_event_log/events/rtc_event_video_send_stream_config.h +++ b/logging/rtc_event_log/events/rtc_event_video_send_stream_config.h @@ -13,7 +13,7 @@ #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" #include "logging/rtc_event_log/rtc_stream_config.h" namespace webrtc { diff --git a/logging/rtc_event_log/fake_rtc_event_log.h b/logging/rtc_event_log/fake_rtc_event_log.h index 6522fb6f54..fb0e6ff4dc 100644 --- a/logging/rtc_event_log/fake_rtc_event_log.h +++ b/logging/rtc_event_log/fake_rtc_event_log.h @@ -14,8 +14,8 @@ #include #include +#include "api/rtc_event_log/rtc_event.h" #include "api/rtc_event_log/rtc_event_log.h" -#include "logging/rtc_event_log/events/rtc_event.h" #include "rtc_base/async_invoker.h" #include "rtc_base/thread.h" diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn index 7d72a43e6d..cb577100e5 100644 --- a/modules/audio_coding/BUILD.gn +++ b/modules/audio_coding/BUILD.gn @@ -910,7 +910,6 @@ rtc_static_library("audio_network_adaptor") { "../../api/rtc_event_log", "../../common_audio", "../../logging:rtc_event_audio", - "../../logging:rtc_event_log_api", "../../rtc_base:checks", "../../rtc_base:protobuf_utils", "../../rtc_base:rtc_base_approved", @@ -2024,12 +2023,12 @@ if (rtc_include_tests) { "../../api/audio_codecs/opus:audio_decoder_opus", "../../api/audio_codecs/opus:audio_encoder_multiopus", "../../api/audio_codecs/opus:audio_encoder_opus", + "../../api/rtc_event_log", "../../common_audio", "../../common_audio:common_audio_c", "../../common_audio:mock_common_audio", "../../logging:mocks", "../../logging:rtc_event_audio", - "../../logging:rtc_event_log_api", "../../modules/rtp_rtcp:rtp_rtcp_format", "../../rtc_base", "../../rtc_base:checks", diff --git a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc index 9612996505..8ca26bb3ad 100644 --- a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc +++ b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc @@ -13,7 +13,7 @@ #include #include -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" #include "logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h" #include "logging/rtc_event_log/mock/mock_rtc_event_log.h" #include "modules/audio_coding/audio_network_adaptor/mock/mock_controller.h" diff --git a/modules/audio_coding/audio_network_adaptor/event_log_writer.cc b/modules/audio_coding/audio_network_adaptor/event_log_writer.cc index c1beac2604..d6893cd0e3 100644 --- a/modules/audio_coding/audio_network_adaptor/event_log_writer.cc +++ b/modules/audio_coding/audio_network_adaptor/event_log_writer.cc @@ -18,8 +18,8 @@ #include "absl/memory/memory.h" #include "absl/types/optional.h" +#include "api/rtc_event_log/rtc_event.h" #include "api/rtc_event_log/rtc_event_log.h" -#include "logging/rtc_event_log/events/rtc_event.h" #include "logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h" #include "rtc_base/checks.h" diff --git a/modules/bitrate_controller/BUILD.gn b/modules/bitrate_controller/BUILD.gn index a9af8f4a17..ce1dcf062d 100644 --- a/modules/bitrate_controller/BUILD.gn +++ b/modules/bitrate_controller/BUILD.gn @@ -30,7 +30,6 @@ rtc_static_library("bitrate_controller") { "../../api/units:time_delta", "../../api/units:timestamp", "../../logging:rtc_event_bwe", - "../../logging:rtc_event_log_api", "../../rtc_base:checks", "../../rtc_base:logging", "../../rtc_base/experiments:field_trial_parser", @@ -51,9 +50,9 @@ if (rtc_include_tests) { ] deps = [ ":bitrate_controller", + "../../api/rtc_event_log", "../../logging:mocks", "../../logging:rtc_event_bwe", - "../../logging:rtc_event_log_api", "../../test:test_support", ] } diff --git a/modules/bitrate_controller/send_side_bandwidth_estimation.cc b/modules/bitrate_controller/send_side_bandwidth_estimation.cc index 2905e6c8dd..0d072ad8e4 100644 --- a/modules/bitrate_controller/send_side_bandwidth_estimation.cc +++ b/modules/bitrate_controller/send_side_bandwidth_estimation.cc @@ -16,8 +16,8 @@ #include #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" #include "api/rtc_event_log/rtc_event_log.h" -#include "logging/rtc_event_log/events/rtc_event.h" #include "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "rtc_base/checks.h" diff --git a/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc b/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc index fa389dedf0..a6203f3edf 100644 --- a/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc +++ b/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc @@ -10,7 +10,7 @@ #include "modules/bitrate_controller/send_side_bandwidth_estimation.h" -#include "logging/rtc_event_log/events/rtc_event.h" +#include "api/rtc_event_log/rtc_event.h" #include "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h" #include "logging/rtc_event_log/mock/mock_rtc_event_log.h" #include "test/gmock.h" diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn index 045fd48a9e..d932e64423 100644 --- a/modules/congestion_controller/goog_cc/BUILD.gn +++ b/modules/congestion_controller/goog_cc/BUILD.gn @@ -91,7 +91,6 @@ rtc_source_set("alr_detector") { "../../../api/rtc_event_log", "../../../api/transport:field_trial_based_config", "../../../api/transport:webrtc_key_value_config", - "../../../logging:rtc_event_log_api", "../../../logging:rtc_event_pacing", "../../../rtc_base:checks", "../../../rtc_base:safe_conversions", @@ -155,7 +154,6 @@ rtc_source_set("delay_based_bwe") { "../../../api/transport:network_control", "../../../api/transport:webrtc_key_value_config", "../../../logging:rtc_event_bwe", - "../../../logging:rtc_event_log_api", "../../../rtc_base:checks", "../../../rtc_base:rtc_base_approved", "../../../rtc_base/experiments:field_trial_parser", diff --git a/modules/congestion_controller/goog_cc/alr_detector.cc b/modules/congestion_controller/goog_cc/alr_detector.cc index 2ee77b0a6c..ff50429448 100644 --- a/modules/congestion_controller/goog_cc/alr_detector.cc +++ b/modules/congestion_controller/goog_cc/alr_detector.cc @@ -14,8 +14,8 @@ #include #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" #include "api/rtc_event_log/rtc_event_log.h" -#include "logging/rtc_event_log/events/rtc_event.h" #include "logging/rtc_event_log/events/rtc_event_alr_state.h" #include "rtc_base/checks.h" #include "rtc_base/numerics/safe_conversions.h" diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe.cc b/modules/congestion_controller/goog_cc/delay_based_bwe.cc index f60863cc48..56714044fe 100644 --- a/modules/congestion_controller/goog_cc/delay_based_bwe.cc +++ b/modules/congestion_controller/goog_cc/delay_based_bwe.cc @@ -17,8 +17,8 @@ #include #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" #include "api/rtc_event_log/rtc_event_log.h" -#include "logging/rtc_event_log/events/rtc_event.h" #include "logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h" #include "modules/congestion_controller/goog_cc/trendline_estimator.h" #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" diff --git a/modules/pacing/BUILD.gn b/modules/pacing/BUILD.gn index 30b1b244a9..258e511929 100644 --- a/modules/pacing/BUILD.gn +++ b/modules/pacing/BUILD.gn @@ -41,7 +41,6 @@ rtc_static_library("pacing") { "../../api/units:time_delta", "../../api/units:timestamp", "../../logging:rtc_event_bwe", - "../../logging:rtc_event_log_api", "../../logging:rtc_event_pacing", "../../rtc_base:checks", "../../rtc_base:rtc_base_approved", diff --git a/modules/pacing/bitrate_prober.cc b/modules/pacing/bitrate_prober.cc index eb4792b5d3..99041dae4c 100644 --- a/modules/pacing/bitrate_prober.cc +++ b/modules/pacing/bitrate_prober.cc @@ -13,8 +13,8 @@ #include #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" #include "api/rtc_event_log/rtc_event_log.h" -#include "logging/rtc_event_log/events/rtc_event.h" #include "logging/rtc_event_log/events/rtc_event_probe_cluster_created.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn index 73f378f8d9..eac4c0831c 100644 --- a/modules/rtp_rtcp/BUILD.gn +++ b/modules/rtp_rtcp/BUILD.gn @@ -473,6 +473,7 @@ if (rtc_include_tests) { "../../api:rtp_parameters", "../../api:scoped_refptr", "../../api:transport_api", + "../../api/rtc_event_log", "../../api/transport:field_trial_based_config", "../../api/units:timestamp", "../../api/video:video_bitrate_allocation", @@ -485,7 +486,6 @@ if (rtc_include_tests) { "../../common_video", "../../common_video/test:utilities", "../../logging:mocks", - "../../logging:rtc_event_log_api", "../../rtc_base:checks", "../../rtc_base:rate_limiter", "../../rtc_base:rtc_base_approved", diff --git a/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_unittest.cc index 517266a11f..0664fa193a 100644 --- a/modules/rtp_rtcp/source/rtp_sender_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_sender_unittest.cc @@ -14,10 +14,10 @@ #include #include "absl/memory/memory.h" +#include "api/rtc_event_log/rtc_event.h" #include "api/transport/field_trial_based_config.h" #include "api/video/video_codec_constants.h" #include "api/video/video_timing.h" -#include "logging/rtc_event_log/events/rtc_event.h" #include "logging/rtc_event_log/mock/mock_rtc_event_log.h" #include "modules/rtp_rtcp/include/rtp_cvo.h" #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn index 7a0f332a54..0a81bf3e2d 100644 --- a/test/fuzzers/BUILD.gn +++ b/test/fuzzers/BUILD.gn @@ -254,7 +254,6 @@ webrtc_fuzzer_test("congestion_controller_feedback_fuzzer") { "congestion_controller_feedback_fuzzer.cc", ] deps = [ - "../../logging:rtc_event_log_api", "../../modules/congestion_controller", "../../modules/pacing", "../../modules/remote_bitrate_estimator",