diff options
Diffstat (limited to 'third_party/libwebrtc/rtc_tools/network_tester')
6 files changed, 4 insertions, 14 deletions
diff --git a/third_party/libwebrtc/rtc_tools/network_tester/BUILD.gn b/third_party/libwebrtc/rtc_tools/network_tester/BUILD.gn index efe2123510..5930431ab9 100644 --- a/third_party/libwebrtc/rtc_tools/network_tester/BUILD.gn +++ b/third_party/libwebrtc/rtc_tools/network_tester/BUILD.gn @@ -46,13 +46,13 @@ if (rtc_enable_protobuf) { "../../p2p:rtc_p2p", "../../rtc_base:async_packet_socket", "../../rtc_base:checks", - "../../rtc_base:ignore_wundef", "../../rtc_base:ip_address", "../../rtc_base:logging", "../../rtc_base:macromagic", "../../rtc_base:protobuf_utils", "../../rtc_base:rtc_task_queue", "../../rtc_base:socket_address", + "../../rtc_base:socket_server", "../../rtc_base:threading", "../../rtc_base:timeutils", "../../rtc_base/synchronization:mutex", diff --git a/third_party/libwebrtc/rtc_tools/network_tester/config_reader.h b/third_party/libwebrtc/rtc_tools/network_tester/config_reader.h index 3735555d51..3903613b5b 100644 --- a/third_party/libwebrtc/rtc_tools/network_tester/config_reader.h +++ b/third_party/libwebrtc/rtc_tools/network_tester/config_reader.h @@ -15,12 +15,9 @@ #include <string> #include "absl/types/optional.h" -#include "rtc_base/ignore_wundef.h" #ifdef WEBRTC_NETWORK_TESTER_PROTO -RTC_PUSH_IGNORING_WUNDEF() #include "rtc_tools/network_tester/network_tester_config.pb.h" -RTC_POP_IGNORING_WUNDEF() using webrtc::network_tester::config::NetworkTesterAllConfigs; #else class NetworkTesterConfigs; diff --git a/third_party/libwebrtc/rtc_tools/network_tester/packet_logger.h b/third_party/libwebrtc/rtc_tools/network_tester/packet_logger.h index c3ac309cf7..c8bfccba10 100644 --- a/third_party/libwebrtc/rtc_tools/network_tester/packet_logger.h +++ b/third_party/libwebrtc/rtc_tools/network_tester/packet_logger.h @@ -14,12 +14,8 @@ #include <fstream> #include <string> -#include "rtc_base/ignore_wundef.h" - #ifdef WEBRTC_NETWORK_TESTER_PROTO -RTC_PUSH_IGNORING_WUNDEF() #include "rtc_tools/network_tester/network_tester_packet.pb.h" -RTC_POP_IGNORING_WUNDEF() using webrtc::network_tester::packet::NetworkTesterPacket; #else class NetworkTesterPacket; diff --git a/third_party/libwebrtc/rtc_tools/network_tester/packet_sender.h b/third_party/libwebrtc/rtc_tools/network_tester/packet_sender.h index 7fd500f27c..caa92499f3 100644 --- a/third_party/libwebrtc/rtc_tools/network_tester/packet_sender.h +++ b/third_party/libwebrtc/rtc_tools/network_tester/packet_sender.h @@ -17,13 +17,10 @@ #include "api/sequence_checker.h" #include "api/task_queue/pending_task_safety_flag.h" #include "api/task_queue/task_queue_factory.h" -#include "rtc_base/ignore_wundef.h" #include "rtc_base/system/no_unique_address.h" #ifdef WEBRTC_NETWORK_TESTER_PROTO -RTC_PUSH_IGNORING_WUNDEF() #include "rtc_tools/network_tester/network_tester_packet.pb.h" -RTC_POP_IGNORING_WUNDEF() using webrtc::network_tester::packet::NetworkTesterPacket; #else class NetworkTesterPacket; diff --git a/third_party/libwebrtc/rtc_tools/network_tester/server.cc b/third_party/libwebrtc/rtc_tools/network_tester/server.cc index f0f610a925..a6cd09fdca 100644 --- a/third_party/libwebrtc/rtc_tools/network_tester/server.cc +++ b/third_party/libwebrtc/rtc_tools/network_tester/server.cc @@ -9,6 +9,7 @@ */ #include "rtc_base/null_socket_server.h" +#include "rtc_base/thread.h" #include "rtc_tools/network_tester/test_controller.h" int main(int /*argn*/, char* /*argv*/[]) { diff --git a/third_party/libwebrtc/rtc_tools/network_tester/test_controller.h b/third_party/libwebrtc/rtc_tools/network_tester/test_controller.h index b08fbd5dd8..3638c75af1 100644 --- a/third_party/libwebrtc/rtc_tools/network_tester/test_controller.h +++ b/third_party/libwebrtc/rtc_tools/network_tester/test_controller.h @@ -22,19 +22,18 @@ #include "api/sequence_checker.h" #include "p2p/base/basic_packet_socket_factory.h" #include "rtc_base/async_packet_socket.h" -#include "rtc_base/ignore_wundef.h" #include "rtc_base/socket_address.h" +#include "rtc_base/socket_server.h" #include "rtc_base/synchronization/mutex.h" #include "rtc_base/system/no_unique_address.h" #include "rtc_base/third_party/sigslot/sigslot.h" +#include "rtc_base/thread.h" #include "rtc_base/thread_annotations.h" #include "rtc_tools/network_tester/packet_logger.h" #include "rtc_tools/network_tester/packet_sender.h" #ifdef WEBRTC_NETWORK_TESTER_PROTO -RTC_PUSH_IGNORING_WUNDEF() #include "rtc_tools/network_tester/network_tester_packet.pb.h" -RTC_POP_IGNORING_WUNDEF() using webrtc::network_tester::packet::NetworkTesterPacket; #else class NetworkTesterPacket; |