Stop using rtc_event.h forward header

Bug: webrtc:10206
Change-Id: I16905ec745673178195d6715fda6175c31500163
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/151601
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29149}

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",
-
+    "../api:libjingle_peerconnection_api",  # For api/dtls_transport_interface.h
-    # For api/dtls_transport_interface.h
-    "../api:libjingle_peerconnection_api",
     "../api/rtc_event_log",
     "../rtc_base:rtc_base_approved",
     "//third_party/abseil-cpp/absl/memory",

logging/rtc_event_log/encoder/rtc_event_log_encoder.h

@@ -15,7 +15,7 @@
 #include <memory>
 #include <string>
 
-#include "logging/rtc_event_log/events/rtc_event.h"
+#include "api/rtc_event_log/rtc_event.h"
 
 namespace webrtc {
 class RtcEventLogEncoder {

logging/rtc_event_log/events/rtc_event_alr_state.h

@@ -13,7 +13,7 @@
 
 #include <memory>
 
-#include "logging/rtc_event_log/events/rtc_event.h"
+#include "api/rtc_event_log/rtc_event.h"
 
 namespace webrtc {
 

logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h

@@ -13,7 +13,7 @@
 
 #include <memory>
 
-#include "logging/rtc_event_log/events/rtc_event.h"
+#include "api/rtc_event_log/rtc_event.h"
 
 namespace webrtc {
 

logging/rtc_event_log/events/rtc_event_audio_playout.h

@@ -15,7 +15,7 @@
 
 #include <memory>
 
-#include "logging/rtc_event_log/events/rtc_event.h"
+#include "api/rtc_event_log/rtc_event.h"
 
 namespace webrtc {
 

logging/rtc_event_log/events/rtc_event_audio_receive_stream_config.h

@@ -13,7 +13,7 @@
 
 #include <memory>
 
-#include "logging/rtc_event_log/events/rtc_event.h"
+#include "api/rtc_event_log/rtc_event.h"
 
 namespace webrtc {
 

logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h

@@ -13,7 +13,7 @@
 
 #include <memory>
 
-#include "logging/rtc_event_log/events/rtc_event.h"
+#include "api/rtc_event_log/rtc_event.h"
 
 namespace webrtc {
 

logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h

@@ -15,7 +15,7 @@
 
 #include <memory>
 
-#include "logging/rtc_event_log/events/rtc_event.h"
+#include "api/rtc_event_log/rtc_event.h"
 
 namespace webrtc {
 

logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h

@@ -15,7 +15,7 @@
 
 #include <memory>
 
-#include "logging/rtc_event_log/events/rtc_event.h"
+#include "api/rtc_event_log/rtc_event.h"
 
 namespace webrtc {
 

logging/rtc_event_log/events/rtc_event_dtls_transport_state.h

@@ -14,7 +14,7 @@
 #include <memory>
 
 #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 {
 

logging/rtc_event_log/events/rtc_event_dtls_writable_state.h

@@ -13,7 +13,7 @@
 
 #include <memory>
 
-#include "logging/rtc_event_log/events/rtc_event.h"
+#include "api/rtc_event_log/rtc_event.h"
 
 namespace webrtc {
 

logging/rtc_event_log/events/rtc_event_generic_ack_received.h

@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "absl/types/optional.h"
-#include "logging/rtc_event_log/events/rtc_event.h"
+#include "api/rtc_event_log/rtc_event.h"
 
 namespace webrtc {
 

logging/rtc_event_log/events/rtc_event_generic_packet_received.h

@@ -13,7 +13,7 @@
 
 #include <memory>
 
-#include "logging/rtc_event_log/events/rtc_event.h"
+#include "api/rtc_event_log/rtc_event.h"
 
 namespace webrtc {
 

logging/rtc_event_log/events/rtc_event_generic_packet_sent.h

@@ -13,7 +13,7 @@
 
 #include <memory>
 
-#include "logging/rtc_event_log/events/rtc_event.h"
+#include "api/rtc_event_log/rtc_event.h"
 
 namespace webrtc {
 

logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h

@@ -15,7 +15,7 @@
 
 #include <memory>
 
-#include "logging/rtc_event_log/events/rtc_event.h"
+#include "api/rtc_event_log/rtc_event.h"
 
 namespace webrtc {
 

logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h

@@ -15,7 +15,7 @@
 
 #include <memory>
 
-#include "logging/rtc_event_log/events/rtc_event.h"
+#include "api/rtc_event_log/rtc_event.h"
 
 namespace webrtc {
 

logging/rtc_event_log/events/rtc_event_probe_cluster_created.h

@@ -15,7 +15,7 @@
 
 #include <memory>
 
-#include "logging/rtc_event_log/events/rtc_event.h"
+#include "api/rtc_event_log/rtc_event.h"
 
 namespace webrtc {
 

logging/rtc_event_log/events/rtc_event_probe_result_failure.h

@@ -15,7 +15,7 @@
 
 #include <memory>
 
-#include "logging/rtc_event_log/events/rtc_event.h"
+#include "api/rtc_event_log/rtc_event.h"
 
 namespace webrtc {
 

logging/rtc_event_log/events/rtc_event_probe_result_success.h

@@ -15,7 +15,7 @@
 
 #include <memory>
 
-#include "logging/rtc_event_log/events/rtc_event.h"
+#include "api/rtc_event_log/rtc_event.h"
 
 namespace webrtc {
 

logging/rtc_event_log/events/rtc_event_route_change.h

@@ -13,7 +13,7 @@
 
 #include <memory>
 
-#include "logging/rtc_event_log/events/rtc_event.h"
+#include "api/rtc_event_log/rtc_event.h"
 
 namespace webrtc {
 

logging/rtc_event_log/events/rtc_event_rtcp_packet_incoming.h

@@ -16,7 +16,7 @@
 #include <memory>
 
 #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 {

logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h

@@ -16,7 +16,7 @@
 #include <memory>
 
 #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 {

logging/rtc_event_log/events/rtc_event_rtp_packet_incoming.h

@@ -13,7 +13,7 @@
 
 #include <memory>
 
-#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 {

logging/rtc_event_log/events/rtc_event_rtp_packet_outgoing.h

@@ -13,7 +13,7 @@
 
 #include <memory>
 
-#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 {

logging/rtc_event_log/events/rtc_event_video_receive_stream_config.h

@@ -13,7 +13,7 @@
 
 #include <memory>
 
-#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 {

logging/rtc_event_log/events/rtc_event_video_send_stream_config.h

@@ -13,7 +13,7 @@
 
 #include <memory>
 
-#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 {

logging/rtc_event_log/fake_rtc_event_log.h

@@ -14,8 +14,8 @@
 #include <map>
 #include <memory>
 
+#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"
 

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",

modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc

@@ -13,7 +13,7 @@
 #include <utility>
 #include <vector>
 
-#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"

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"
 

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",
     ]
   }

modules/bitrate_controller/send_side_bandwidth_estimation.cc

@@ -16,8 +16,8 @@
 #include <string>
 
 #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"

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"

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",

modules/congestion_controller/goog_cc/alr_detector.cc

@@ -14,8 +14,8 @@
 #include <cstdio>
 
 #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"

modules/congestion_controller/goog_cc/delay_based_bwe.cc

@@ -17,8 +17,8 @@
 #include <utility>
 
 #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"

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",

modules/pacing/bitrate_prober.cc

@@ -13,8 +13,8 @@
 #include <algorithm>
 
 #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"

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",

modules/rtp_rtcp/source/rtp_sender_unittest.cc

@@ -14,10 +14,10 @@
 #include <vector>
 
 #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"

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",