Apply include-cleaner to test/network

This was generated by Running $ for i in test/network/*.cc; do ./tools_webrtc/iwyu/apply-include-cleaner $i; done $ for i in test/network/*.h; do ./tools_webrtc/iwyu/apply-include-cleaner $i; done $ python3 ./tools_webrtc/gn_check_autofix.py -C out/Default manually removing <sys/socket.h> include as suspicious. manually modifying test/DEPS file. Bug: webrtc:42226242 Change-Id: Ifda037e1385996ac3b68190c7e30e5309356ebb1 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/376382 Reviewed-by: Per Kjellander <perkj@webrtc.org> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Reviewed-by: Artem Titov <titovartem@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43857}
2025-02-05 14:20:45 +01:00 · 2025-02-05 14:20:45 +01:00 · d1c0896062
commit d1c0896062
parent c84133987c
25 changed files with 209 additions and 77 deletions
--- a/test/DEPS
+++ b/test/DEPS
@ -88,8 +88,9 @@ specific_include_rules = {
  "benchmark_main\.cc": [
    "+benchmark",
  ],
-  "emulated_turn_server\.h": [
+  "emulated_turn_server\.(h|cc)": [
     "+p2p/base/turn_server.h",
+     "+p2p/base/port_interface.h",
  ],
  "wait_until\.cc": [
    "+absl/functional/overload.h",
--- a/test/network/BUILD.gn
+++ b/test/network/BUILD.gn
@ -38,8 +38,9 @@ rtc_library("emulated_network") {
    "traffic_route.h",
  ]
  deps = [
-    "../..//test/network:simulated_network",
+    ":simulated_network",
    "../../api:array_view",
+    "../../api:async_dns_resolver",
    "../../api:field_trials_view",
    "../../api:network_emulation_manager_api",
    "../../api:packet_socket_factory",
@ -59,6 +60,7 @@ rtc_library("emulated_network") {
    "../../api/units:timestamp",
    "../../p2p:basic_packet_socket_factory",
    "../../p2p:p2p_server_utils",
+    "../../p2p:port_interface",
    "../../rtc_base:async_packet_socket",
    "../../rtc_base:checks",
    "../../rtc_base:copy_on_write_buffer",
@ -68,7 +70,6 @@ rtc_library("emulated_network") {
    "../../rtc_base:network",
    "../../rtc_base:network_constants",
    "../../rtc_base:random",
-    "../../rtc_base:rtc_base_tests_utils",
    "../../rtc_base:rtc_event",
    "../../rtc_base:safe_minmax",
    "../../rtc_base:socket",
@ -77,18 +78,16 @@ rtc_library("emulated_network") {
    "../../rtc_base:stringutils",
    "../../rtc_base:task_queue_for_test",
    "../../rtc_base:threading",
-    "../../rtc_base/memory:always_valid_pointer",
    "../../rtc_base/network:received_packet",
    "../../rtc_base/synchronization:mutex",
    "../../rtc_base/system:no_unique_address",
    "../../rtc_base/task_utils:repeating_task",
+    "../../rtc_base/third_party/sigslot",
    "../../system_wrappers",
-    "../../test:scoped_key_value_config",
    "../scenario:column_printer",
    "../time_controller",
    "//third_party/abseil-cpp/absl/algorithm:container",
    "//third_party/abseil-cpp/absl/base:nullability",
-    "//third_party/abseil-cpp/absl/memory",
    "//third_party/abseil-cpp/absl/strings:string_view",
  ]
 }
@ -99,9 +98,9 @@ if (rtc_include_tests && !build_with_chromium) {
    sources = [ "network_emulation_pc_unittest.cc" ]
    deps = [
      ":emulated_network",
+      ":simulated_network",
+      "..:test_support",
      "..:wait_until",
-      "../:test_support",
-      "../..//test/network:simulated_network",
      "../../api:audio_options_api",
      "../../api:enable_media_with_defaults",
      "../../api:libjingle_peerconnection_api",
@ -115,17 +114,12 @@ if (rtc_include_tests && !build_with_chromium) {
      "../../api/task_queue:default_task_queue_factory",
      "../../api/test/network_emulation",
      "../../api/transport:field_trial_based_config",
-      "../../media:rtc_audio_video",
      "../../modules/audio_device:test_audio_device_module",
-      "../../p2p:basic_packet_socket_factory",
      "../../p2p:basic_port_allocator",
      "../../p2p:port_allocator",
      "../../pc:pc_test_utils",
      "../../pc:peerconnection_wrapper",
-      "../../rtc_base:gunit_helpers",
-      "../../rtc_base:logging",
      "../../rtc_base:network",
-      "../../rtc_base:rtc_event",
      "../../rtc_base:task_queue_for_test",
    ]
  }
@ -136,16 +130,18 @@ rtc_library("cross_traffic_unittest") {
  sources = [ "cross_traffic_unittest.cc" ]
  deps = [
    ":emulated_network",
-    "../:test_support",
-    "../..//test/network:simulated_network",
+    "..:test_support",
    "../../api:network_emulation_manager_api",
    "../../api:simulated_network_api",
+    "../../api/test/network_emulation",
    "../../api/units:data_rate",
+    "../../api/units:data_size",
+    "../../api/units:time_delta",
+    "../../api/units:timestamp",
+    "../../rtc_base:ip_address",
    "../../rtc_base:logging",
-    "../../rtc_base:network_constants",
-    "../../rtc_base:rtc_event",
-    "../time_controller",
-    "//third_party/abseil-cpp/absl/memory",
+    "../../rtc_base:task_queue_for_test",
+    "../../system_wrappers",
  ]
 }

@ -155,14 +151,13 @@ if (rtc_include_tests) {
    sources = [ "network_emulation_unittest.cc" ]
    deps = [
      ":emulated_network",
+      ":simulated_network",
+      "..:test_support",
      "..:wait_until",
-      "../:test_support",
-      "../..//test/network:simulated_network",
-      "../../api:create_time_controller",
      "../../api:network_emulation_manager_api",
      "../../api:rtc_error_matchers",
      "../../api:simulated_network_api",
-      "../../api/task_queue:task_queue",
+      "../../api/task_queue",
      "../../api/test/network_emulation",
      "../../api/transport:ecn_marking",
      "../../api/transport:stun_types",
@ -173,12 +168,9 @@ if (rtc_include_tests) {
      "../../rtc_base:byte_buffer",
      "../../rtc_base:checks",
      "../../rtc_base:copy_on_write_buffer",
-      "../../rtc_base:gunit_helpers",
      "../../rtc_base:ip_address",
-      "../../rtc_base:logging",
      "../../rtc_base:macromagic",
      "../../rtc_base:net_helpers",
-      "../../rtc_base:rtc_event",
      "../../rtc_base:socket",
      "../../rtc_base:socket_address",
      "../../rtc_base:task_queue_for_test",
@ -197,11 +189,16 @@ if (rtc_include_tests) {
    ]
    deps = [
      ":emulated_network",
-      "../..//test/network:simulated_network",
+      ":simulated_network",
+      "../../api:network_emulation_manager_api",
+      "../../api:simulated_network_api",
      "../../api/transport:network_control",
      "../../api/transport:test_feedback_generator_interface",
+      "../../api/units:data_rate",
+      "../../api/units:data_size",
+      "../../api/units:time_delta",
+      "../../api/units:timestamp",
      "../../rtc_base:checks",
-      "../time_controller",
      "//third_party/abseil-cpp/absl/memory",
    ]
  }
@ -210,8 +207,11 @@ if (rtc_include_tests) {
    testonly = true
    sources = [ "feedback_generator_unittest.cc" ]
    deps = [
-      "../:test_support",
+      "..:test_support",
+      "../../api:simulated_network_api",
      "../../api/transport:test_feedback_generator",
+      "../../api/transport:test_feedback_generator_interface",
+      "../../api/units:time_delta",
    ]
  }

@ -249,6 +249,8 @@ rtc_library("simulated_network") {
    "../../rtc_base:race_checker",
    "../../rtc_base:random",
    "../../rtc_base/synchronization:mutex",
+    "../../rtc_base/system:rtc_export",
+    "//third_party/abseil-cpp/absl/functional:any_invocable",
  ]
 }

@ -258,14 +260,11 @@ if (rtc_include_tests) {
    sources = [ "simulated_network_unittest.cc" ]
    deps = [
      ":simulated_network",
-      "../:test_support",
+      "..:test_support",
      "../../api:simulated_network_api",
      "../../api/units:data_rate",
-      "../../api/units:data_size",
      "../../api/units:time_delta",
      "../../api/units:timestamp",
-      "//testing/gtest",
-      "//third_party/abseil-cpp/absl/algorithm:container",
    ]
  }
 }
@ -278,15 +277,14 @@ if (rtc_enable_protobuf) {
    ]
    deps = [
      ":simulated_network",
-      "../../api:network_emulation_manager_api",
      "../../api:sequence_checker",
      "../../api:simulated_network_api",
-      "../../api/task_queue:task_queue",
+      "../../api/task_queue",
      "../../api/test/network_emulation:network_config_schedule_proto",
      "../../api/units:data_rate",
      "../../api/units:time_delta",
      "../../api/units:timestamp",
-      "../../api/units:timestamp",
+      "../../rtc_base:checks",
      "../../rtc_base:macromagic",
      "../../rtc_base/task_utils:repeating_task",
      "../../system_wrappers",
@ -300,18 +298,14 @@ if (rtc_enable_protobuf) {
      sources = [ "schedulable_network_behavior_test.cc" ]
      deps = [
        ":schedulable_network_behavior",
-        "../:test_support",
+        "..:test_support",
        "../../api:create_network_emulation_manager",
        "../../api:network_emulation_manager_api",
        "../../api:simulated_network_api",
        "../../api/test/network_emulation:network_config_schedule_proto",
-        "../../api/units:data_rate",
-        "../../api/units:data_size",
        "../../api/units:time_delta",
        "../../api/units:timestamp",
        "../../system_wrappers",
-        "//testing/gtest",
-        "//third_party/abseil-cpp/absl/algorithm:container",
      ]
    }
  }
--- a/test/network/cross_traffic.cc
+++ b/test/network/cross_traffic.cc
@ -12,13 +12,26 @@

 #include <math.h>

-#include <optional>
+#include <algorithm>
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
 #include <utility>

-#include "absl/memory/memory.h"
+#include "api/sequence_checker.h"
+#include "api/task_queue/task_queue_base.h"
+#include "api/test/network_emulation/cross_traffic.h"
+#include "api/units/data_rate.h"
+#include "api/units/data_size.h"
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
 #include "cross_traffic.h"
-#include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_minmax.h"
+#include "rtc_base/strings/string_builder.h"
+#include "system_wrappers/include/clock.h"
+#include "test/network/network_emulation.h"
+#include "test/scenario/column_printer.h"

 namespace webrtc {
 namespace test {
--- a/test/network/cross_traffic.h
+++ b/test/network/cross_traffic.h
@ -11,17 +11,26 @@
 #ifndef TEST_NETWORK_CROSS_TRAFFIC_H_
 #define TEST_NETWORK_CROSS_TRAFFIC_H_

-#include <algorithm>
+#include <cmath>
+#include <cstddef>
+#include <deque>
+#include <functional>
+#include <list>
 #include <map>
-#include <memory>
+#include <set>

 #include "api/sequence_checker.h"
+#include "api/task_queue/task_queue_base.h"
+#include "api/test/network_emulation/cross_traffic.h"
+#include "api/test/network_emulation/network_emulation_interfaces.h"
 #include "api/test/network_emulation_manager.h"
 #include "api/units/data_rate.h"
 #include "api/units/data_size.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
 #include "rtc_base/random.h"
+#include "rtc_base/thread_annotations.h"
+#include "system_wrappers/include/clock.h"
 #include "test/network/network_emulation.h"
 #include "test/scenario/column_printer.h"

--- a/test/network/cross_traffic_unittest.cc
+++ b/test/network/cross_traffic_unittest.cc
@ -11,24 +11,26 @@
 #include "test/network/cross_traffic.h"

 #include <atomic>
-#include <memory>
-#include <optional>
-#include <utility>
+#include <cstddef>
+#include <cstdint>
 #include <vector>

-#include "absl/memory/memory.h"
+#include "api/test/network_emulation/cross_traffic.h"
+#include "api/test/network_emulation/network_emulation_interfaces.h"
 #include "api/test/network_emulation_manager.h"
 #include "api/test/simulated_network.h"
 #include "api/units/data_rate.h"
-#include "rtc_base/event.h"
+#include "api/units/data_size.h"
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/network_constants.h"
-#include "test/gmock.h"
+#include "rtc_base/task_queue_for_test.h"
+#include "system_wrappers/include/clock.h"
 #include "test/gtest.h"
+#include "test/network/network_emulation.h"
 #include "test/network/network_emulation_manager.h"
-#include "test/network/simulated_network.h"
 #include "test/network/traffic_route.h"
-#include "test/time_controller/simulated_time_controller.h"

 namespace webrtc {
 namespace test {
--- a/test/network/emulated_network_manager.cc
+++ b/test/network/emulated_network_manager.cc
@ -15,9 +15,15 @@
 #include <utility>
 #include <vector>

-#include "absl/memory/memory.h"
+#include "api/sequence_checker.h"
+#include "api/test/network_emulation/network_emulation_interfaces.h"
+#include "api/test/time_controller.h"
 #include "p2p/base/basic_packet_socket_factory.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/network.h"
+#include "rtc_base/task_queue_for_test.h"
 #include "test/network/fake_network_socket_server.h"
+#include "test/network/network_emulation.h"

 namespace webrtc {
 namespace test {
--- a/test/network/emulated_network_manager.h
+++ b/test/network/emulated_network_manager.h
@ -15,13 +15,16 @@
 #include <memory>
 #include <vector>

-#include "api/sequence_checker.h"
+#include "api/packet_socket_factory.h"
+#include "api/test/network_emulation/network_emulation_interfaces.h"
 #include "api/test/network_emulation_manager.h"
 #include "api/test/time_controller.h"
-#include "rtc_base/ip_address.h"
 #include "rtc_base/network.h"
 #include "rtc_base/socket_server.h"
+#include "rtc_base/task_queue_for_test.h"
+#include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"
+#include "rtc_base/thread_annotations.h"
 #include "test/network/network_emulation.h"

 namespace webrtc {
--- a/test/network/emulated_turn_server.cc
+++ b/test/network/emulated_turn_server.cc
@ -10,13 +10,28 @@

 #include "test/network/emulated_turn_server.h"

+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <string>
 #include <utility>

+#include "api/async_dns_resolver.h"
 #include "api/packet_socket_factory.h"
+#include "api/sequence_checker.h"
+#include "api/test/network_emulation/network_emulation_interfaces.h"
+#include "api/test/network_emulation_manager.h"
+#include "p2p/base/port_interface.h"
+#include "p2p/base/turn_server.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "rtc_base/network/received_packet.h"
+#include "rtc_base/socket.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/strings/string_builder.h"
 #include "rtc_base/task_queue_for_test.h"
+#include "rtc_base/thread.h"

 namespace {

--- a/test/network/emulated_turn_server.h
+++ b/test/network/emulated_turn_server.h
@ -16,10 +16,14 @@
 #include <string>

 #include "absl/strings/string_view.h"
+#include "api/test/network_emulation/network_emulation_interfaces.h"
 #include "api/test/network_emulation_manager.h"
 #include "api/transport/stun.h"
 #include "p2p/base/turn_server.h"
 #include "rtc_base/async_packet_socket.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/thread.h"
+#include "rtc_base/thread_annotations.h"

 namespace webrtc {
 namespace test {
--- a/test/network/fake_network_socket_server.cc
+++ b/test/network/fake_network_socket_server.cc
@ -10,19 +10,33 @@

 #include "test/network/fake_network_socket_server.h"

-#include <algorithm>
+#include <cerrno>
+#include <cstddef>
+#include <cstdint>
+#include <map>
+#include <optional>
 #include <string>
 #include <utility>
 #include <vector>

 #include "absl/algorithm/container.h"
 #include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
 #include "api/task_queue/pending_task_safety_flag.h"
+#include "api/test/network_emulation/network_emulation_interfaces.h"
 #include "api/transport/ecn_marking.h"
+#include "api/units/time_delta.h"
 #include "rtc_base/checks.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "rtc_base/event.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/socket.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/synchronization/mutex.h"
 #include "rtc_base/thread.h"
+#include "rtc_base/thread_annotations.h"
+#include "test/network/network_emulation.h"

 namespace webrtc {
 namespace test {
--- a/test/network/fake_network_socket_server.h
+++ b/test/network/fake_network_socket_server.h
@ -11,15 +11,15 @@
 #ifndef TEST_NETWORK_FAKE_NETWORK_SOCKET_SERVER_H_
 #define TEST_NETWORK_FAKE_NETWORK_SOCKET_SERVER_H_

-#include <set>
 #include <vector>

-#include "api/units/timestamp.h"
+#include "api/units/time_delta.h"
 #include "rtc_base/event.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/socket.h"
 #include "rtc_base/socket_server.h"
 #include "rtc_base/synchronization/mutex.h"
-#include "system_wrappers/include/clock.h"
+#include "rtc_base/thread_annotations.h"
 #include "test/network/network_emulation.h"

 namespace webrtc {
--- a/test/network/feedback_generator.cc
+++ b/test/network/feedback_generator.cc
@ -9,10 +9,21 @@
 */
 #include "test/network/feedback_generator.h"

+#include <cstddef>
+#include <utility>
+#include <vector>
+
 #include "absl/memory/memory.h"
+#include "api/test/network_emulation_manager.h"
+#include "api/test/simulated_network.h"
 #include "api/transport/network_types.h"
+#include "api/units/data_rate.h"
+#include "api/units/data_size.h"
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
 #include "rtc_base/checks.h"
 #include "test/network/network_emulation_manager.h"
+#include "test/network/simulated_network.h"

 namespace webrtc {

--- a/test/network/feedback_generator.h
+++ b/test/network/feedback_generator.h
@ -10,17 +10,20 @@
 #ifndef TEST_NETWORK_FEEDBACK_GENERATOR_H_
 #define TEST_NETWORK_FEEDBACK_GENERATOR_H_

+#include <cstddef>
 #include <cstdint>
 #include <queue>
-#include <utility>
 #include <vector>

+#include "api/test/simulated_network.h"
 #include "api/transport/network_types.h"
 #include "api/transport/test/feedback_generator_interface.h"
+#include "api/units/data_rate.h"
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
 #include "test/network/network_emulation.h"
 #include "test/network/network_emulation_manager.h"
 #include "test/network/simulated_network.h"
-#include "test/time_controller/simulated_time_controller.h"

 namespace webrtc {

--- a/test/network/feedback_generator_unittest.cc
+++ b/test/network/feedback_generator_unittest.cc
@ -8,7 +8,12 @@
 *  be found in the AUTHORS file in the root of the source tree.
 */

+#include <cstddef>
+
+#include "api/test/simulated_network.h"
 #include "api/transport/test/create_feedback_generator.h"
+#include "api/transport/test/feedback_generator_interface.h"
+#include "api/units/time_delta.h"
 #include "test/gtest.h"

 namespace webrtc {
--- a/test/network/network_emulation.cc
+++ b/test/network/network_emulation.cc
@ -13,6 +13,7 @@
 #include <stdint.h>

 #include <algorithm>
+#include <cstddef>
 #include <functional>
 #include <limits>
 #include <map>
@ -28,11 +29,20 @@
 #include "api/task_queue/task_queue_base.h"
 #include "api/test/network_emulation/network_emulation_interfaces.h"
 #include "api/test/network_emulation_manager.h"
+#include "api/test/simulated_network.h"
 #include "api/transport/ecn_marking.h"
 #include "api/units/data_size.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/copy_on_write_buffer.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/network.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/synchronization/mutex.h"
+#include "rtc_base/task_utils/repeating_task.h"
+#include "system_wrappers/include/clock.h"

 namespace webrtc {
 namespace {
--- a/test/network/network_emulation.h
+++ b/test/network/network_emulation.h
@ -14,6 +14,7 @@
 #include <cstdint>
 #include <cstring>
 #include <deque>
+#include <functional>
 #include <map>
 #include <memory>
 #include <optional>
@ -22,7 +23,6 @@
 #include <vector>

 #include "absl/base/nullability.h"
-#include "api/array_view.h"
 #include "api/numerics/samples_stats_counter.h"
 #include "api/sequence_checker.h"
 #include "api/task_queue/task_queue_base.h"
@ -30,15 +30,17 @@
 #include "api/test/network_emulation_manager.h"
 #include "api/test/simulated_network.h"
 #include "api/transport/ecn_marking.h"
+#include "api/units/data_size.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
+#include "rtc_base/checks.h"
 #include "rtc_base/copy_on_write_buffer.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/network.h"
 #include "rtc_base/network_constants.h"
 #include "rtc_base/socket_address.h"
 #include "rtc_base/synchronization/mutex.h"
 #include "rtc_base/system/no_unique_address.h"
-#include "rtc_base/task_queue_for_test.h"
 #include "rtc_base/task_utils/repeating_task.h"
 #include "rtc_base/thread_annotations.h"
 #include "system_wrappers/include/clock.h"
--- a/test/network/network_emulation_manager.cc
+++ b/test/network/network_emulation_manager.cc
@ -11,15 +11,31 @@
 #include "test/network/network_emulation_manager.h"

 #include <algorithm>
+#include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <memory>
+#include <optional>
 #include <utility>
 #include <vector>

+#include "api/array_view.h"
 #include "api/field_trials_view.h"
-#include "api/units/time_delta.h"
+#include "api/task_queue/task_queue_factory.h"
+#include "api/test/network_emulation/cross_traffic.h"
+#include "api/test/network_emulation/network_emulation_interfaces.h"
+#include "api/test/network_emulation_manager.h"
+#include "api/test/simulated_network.h"
+#include "api/test/time_controller.h"
 #include "api/units/timestamp.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/ip_address.h"
+#include "rtc_base/strings/string_builder.h"
+#include "rtc_base/task_utils/repeating_task.h"
+#include "test/network/cross_traffic.h"
+#include "test/network/emulated_network_manager.h"
 #include "test/network/emulated_turn_server.h"
+#include "test/network/network_emulation.h"
 #include "test/network/simulated_network.h"
 #include "test/network/traffic_route.h"
 #include "test/time_controller/real_time_controller.h"
--- a/test/network/network_emulation_manager.h
+++ b/test/network/network_emulation_manager.h
@ -11,19 +11,24 @@
 #ifndef TEST_NETWORK_NETWORK_EMULATION_MANAGER_H_
 #define TEST_NETWORK_NETWORK_EMULATION_MANAGER_H_

+#include <cstdint>
+#include <functional>
+#include <list>
 #include <map>
 #include <memory>
+#include <optional>
 #include <set>
 #include <utility>
 #include <vector>

 #include "api/array_view.h"
-#include "api/field_trials_view.h"
+#include "api/test/network_emulation/cross_traffic.h"
+#include "api/test/network_emulation/network_emulation_interfaces.h"
 #include "api/test/network_emulation_manager.h"
 #include "api/test/simulated_network.h"
 #include "api/test/time_controller.h"
-#include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/task_queue_for_test.h"
 #include "rtc_base/task_utils/repeating_task.h"
 #include "system_wrappers/include/clock.h"
--- a/test/network/schedulable_network_behavior.cc
+++ b/test/network/schedulable_network_behavior.cc
@ -9,16 +9,19 @@
 */
 #include "test/network/schedulable_network_behavior.h"

+#include <algorithm>
 #include <cstdint>
 #include <utility>

 #include "absl/functional/any_invocable.h"
 #include "api/sequence_checker.h"
+#include "api/task_queue/task_queue_base.h"
 #include "api/test/network_emulation/network_config_schedule.pb.h"
 #include "api/test/simulated_network.h"
 #include "api/units/data_rate.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
+#include "rtc_base/checks.h"
 #include "rtc_base/task_utils/repeating_task.h"
 #include "system_wrappers/include/clock.h"
 #include "test/network/simulated_network.h"
--- a/test/network/schedulable_network_behavior_test.cc
+++ b/test/network/schedulable_network_behavior_test.cc
@ -14,6 +14,7 @@
 #include <vector>

 #include "api/test/create_network_emulation_manager.h"
+#include "api/test/network_emulation/network_config_schedule.pb.h"
 #include "api/test/network_emulation_manager.h"
 #include "api/test/simulated_network.h"
 #include "api/units/time_delta.h"
--- a/test/network/simulated_network.cc
+++ b/test/network/simulated_network.cc
@ -13,15 +13,20 @@
 #include <algorithm>
 #include <cmath>
 #include <cstdint>
+#include <functional>
 #include <optional>
 #include <utility>
+#include <vector>

+#include "absl/functional/any_invocable.h"
 #include "api/test/simulated_network.h"
 #include "api/units/data_rate.h"
 #include "api/units/data_size.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
 #include "rtc_base/checks.h"
+#include "rtc_base/race_checker.h"
+#include "rtc_base/synchronization/mutex.h"

 namespace webrtc {
 namespace {
--- a/test/network/simulated_network.h
+++ b/test/network/simulated_network.h
@ -14,16 +14,19 @@

 #include <cstdint>
 #include <deque>
+#include <functional>
 #include <optional>
 #include <queue>
 #include <vector>

+#include "absl/functional/any_invocable.h"
 #include "api/sequence_checker.h"
 #include "api/test/simulated_network.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/system/rtc_export.h"
 #include "rtc_base/thread_annotations.h"

 namespace webrtc {
--- a/test/network/simulated_network_unittest.cc
+++ b/test/network/simulated_network_unittest.cc
@ -9,14 +9,11 @@
 */
 #include "test/network/simulated_network.h"

-#include <algorithm>
+#include <cstddef>
 #include <cstdint>
-#include <map>
 #include <optional>
-#include <set>
 #include <vector>

-#include "absl/algorithm/container.h"
 #include "api/test/simulated_network.h"
 #include "api/units/data_rate.h"
 #include "api/units/time_delta.h"
--- a/test/network/traffic_route.cc
+++ b/test/network/traffic_route.cc
@ -11,12 +11,19 @@
 #include "test/network/traffic_route.h"

 #include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
 #include <memory>
 #include <optional>
 #include <utility>

-#include "rtc_base/logging.h"
-#include "rtc_base/numerics/safe_minmax.h"
+#include "api/test/network_emulation/network_emulation_interfaces.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/copy_on_write_buffer.h"
+#include "rtc_base/socket_address.h"
+#include "system_wrappers/include/clock.h"
+#include "test/network/network_emulation.h"

 namespace webrtc {
 namespace test {
--- a/test/network/traffic_route.h
+++ b/test/network/traffic_route.h
@ -11,11 +11,14 @@
 #ifndef TEST_NETWORK_TRAFFIC_ROUTE_H_
 #define TEST_NETWORK_TRAFFIC_ROUTE_H_

+#include <cstddef>
+#include <cstdint>
+#include <functional>
 #include <memory>
 #include <vector>

-#include "api/test/network_emulation_manager.h"
-#include "rtc_base/copy_on_write_buffer.h"
+#include "api/test/network_emulation/cross_traffic.h"
+#include "api/test/network_emulation/network_emulation_interfaces.h"
 #include "system_wrappers/include/clock.h"
 #include "test/network/network_emulation.h"