From 2395c1f954c04f718c805d910f20d5b283fe3dc6 Mon Sep 17 00:00:00 2001 From: Evan Shrubsole Date: Wed, 25 Mar 2026 10:51:18 +0000 Subject: [PATCH] Remove SIMULATED_WAIT Bug: webrtc:381524905 Change-Id: I24c455d6656412a9ce2e16250564d9986a6a6964 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/460080 Auto-Submit: Evan Shrubsole Commit-Queue: Harald Alvestrand Reviewed-by: Harald Alvestrand Commit-Queue: Evan Shrubsole Cr-Commit-Position: refs/heads/main@{#47280} --- media/BUILD.gn | 1 - modules/audio_processing/aec3/BUILD.gn | 1 - modules/audio_processing/agc2/BUILD.gn | 8 ------ .../capture_levels_adjuster/BUILD.gn | 1 - .../audio_processing/capture_mixer/BUILD.gn | 1 - modules/video_capture/BUILD.gn | 1 - p2p/BUILD.gn | 1 - rtc_base/BUILD.gn | 26 ------------------ rtc_base/experiments/BUILD.gn | 1 - rtc_base/gunit.h | 27 ------------------- rtc_base/win32_unittest.cc | 1 - rtc_tools/network_tester/BUILD.gn | 1 - sdk/BUILD.gn | 2 +- sdk/objc/unittests/RTCAudioSessionTest.mm | 9 ++++--- sdk/objc/unittests/RTCCertificateTest.mm | 4 +-- sdk/objc/unittests/RTCConfigurationTest.mm | 4 +-- .../RTCDataChannelConfigurationTest.mm | 2 +- .../unittests/RTCFileVideoCapturer_xctest.mm | 3 ++- sdk/objc/unittests/RTCIceCandidateTest.mm | 4 +-- sdk/objc/unittests/RTCIceServerTest.mm | 4 +-- sdk/objc/unittests/RTCMediaConstraintsTest.mm | 4 +-- .../RTCPeerConnectionFactoryBuilderTest.mm | 3 ++- sdk/objc/unittests/RTCPeerConnectionTest.mm | 4 +-- .../unittests/RTCSessionDescriptionTest.mm | 3 ++- sdk/objc/unittests/RTCTracingTest.mm | 4 +-- sdk/objc/unittests/avformatmappertests.mm | 2 +- sdk/objc/unittests/nalu_rewriter_xctest.mm | 8 ++---- .../objc_video_decoder_factory_tests.mm | 3 ++- .../objc_video_encoder_factory_tests.mm | 3 ++- stats/BUILD.gn | 1 - test/pc/e2e/BUILD.gn | 1 - 31 files changed, 35 insertions(+), 103 deletions(-) delete mode 100644 rtc_base/gunit.h diff --git a/media/BUILD.gn b/media/BUILD.gn index d02dea6768..54d8b8b160 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -871,7 +871,6 @@ if (rtc_include_tests) { "../rtc_base:checks", "../rtc_base:copy_on_write_buffer", "../rtc_base:dscp", - "../rtc_base:gunit_helpers", "../rtc_base:logging", "../rtc_base:macromagic", "../rtc_base:network_route", diff --git a/modules/audio_processing/aec3/BUILD.gn b/modules/audio_processing/aec3/BUILD.gn index 6b5279b56a..d0e1c0d7a5 100644 --- a/modules/audio_processing/aec3/BUILD.gn +++ b/modules/audio_processing/aec3/BUILD.gn @@ -325,7 +325,6 @@ if (rtc_include_tests) { "../../../api/environment:environment_factory", "../../../rtc_base:checks", "../../../rtc_base:cpu_info", - "../../../rtc_base:gunit_helpers", "../../../rtc_base:random", "../../../rtc_base:safe_minmax", "../../../rtc_base:stringutils", diff --git a/modules/audio_processing/agc2/BUILD.gn b/modules/audio_processing/agc2/BUILD.gn index 92276ee60c..55e28a79ba 100644 --- a/modules/audio_processing/agc2/BUILD.gn +++ b/modules/audio_processing/agc2/BUILD.gn @@ -304,7 +304,6 @@ rtc_library("speech_level_estimator_unittest") { "..:apm_logging", "../../../api/audio:audio_processing", "../../../rtc_base:checks", - "../../../rtc_base:gunit_helpers", "../../../test:test_support", ] } @@ -323,7 +322,6 @@ rtc_library("adaptive_digital_gain_controller_unittest") { "..:audio_frame_view", "../../../api/audio:audio_processing", "../../../common_audio", - "../../../rtc_base:gunit_helpers", "../../../test:test_support", ] } @@ -337,7 +335,6 @@ rtc_library("gain_applier_unittest") { ":gain_applier", ":test_utils", "../../../api/audio:audio_frame_api", - "../../../rtc_base:gunit_helpers", "../../../test:test_support", ] } @@ -354,7 +351,6 @@ rtc_library("saturation_protector_unittest") { ":common", ":saturation_protector", "..:apm_logging", - "../../../rtc_base:gunit_helpers", "../../../test:test_support", ] } @@ -364,7 +360,6 @@ rtc_library("biquad_filter_unittests") { sources = [ "biquad_filter_unittest.cc" ] deps = [ ":biquad_filter", - "../../../rtc_base:gunit_helpers", "../../../test:test_support", ] } @@ -393,7 +388,6 @@ rtc_library("fixed_digital_unittests") { "../../../api/audio:audio_frame_api", "../../../common_audio", "../../../rtc_base:checks", - "../../../rtc_base:gunit_helpers", "../../../system_wrappers:metrics", "../../../test:test_support", ] @@ -442,7 +436,6 @@ rtc_library("noise_estimator_unittests") { "../../../api:function_view", "../../../api/audio:audio_frame_api", "../../../rtc_base:checks", - "../../../rtc_base:gunit_helpers", "../../../test:test_support", ] } @@ -455,7 +448,6 @@ rtc_library("vad_wrapper_unittests") { ":vad_wrapper", "../../../api/audio:audio_frame_api", "../../../rtc_base:checks", - "../../../rtc_base:gunit_helpers", "../../../rtc_base:safe_compare", "../../../test:test_support", ] diff --git a/modules/audio_processing/capture_levels_adjuster/BUILD.gn b/modules/audio_processing/capture_levels_adjuster/BUILD.gn index b8df947692..61292c7d6a 100644 --- a/modules/audio_processing/capture_levels_adjuster/BUILD.gn +++ b/modules/audio_processing/capture_levels_adjuster/BUILD.gn @@ -38,7 +38,6 @@ rtc_library("capture_levels_adjuster_unittests") { ":capture_levels_adjuster", "..:audio_buffer", "..:audioproc_test_utils", - "../../../rtc_base:gunit_helpers", "../../../rtc_base:stringutils", "../../../test:test_support", ] diff --git a/modules/audio_processing/capture_mixer/BUILD.gn b/modules/audio_processing/capture_mixer/BUILD.gn index 16dfba79e6..c7b2b4c6f4 100644 --- a/modules/audio_processing/capture_mixer/BUILD.gn +++ b/modules/audio_processing/capture_mixer/BUILD.gn @@ -48,7 +48,6 @@ rtc_library("capture_mixer_unittests") { deps = [ ":capture_mixer", "..:audioproc_test_utils", - "../../../rtc_base:gunit_helpers", "../../../rtc_base:stringutils", "../../../test:test_support", ] diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn index 741380d68e..ef4c4ff848 100644 --- a/modules/video_capture/BUILD.gn +++ b/modules/video_capture/BUILD.gn @@ -193,7 +193,6 @@ if (!build_with_chromium || is_linux || is_chromeos) { "../../api/video:video_rtp_headers", "../../common_video", "../../rtc_base:checks", - "../../rtc_base:gunit_helpers", "../../rtc_base:macromagic", "../../rtc_base:timeutils", "../../rtc_base/synchronization:mutex", diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn index bc12178f5e..8ff23691b9 100644 --- a/p2p/BUILD.gn +++ b/p2p/BUILD.gn @@ -1195,7 +1195,6 @@ if (rtc_include_tests) { "../rtc_base:copy_on_write_buffer", "../rtc_base:crypto_random", "../rtc_base:dscp", - "../rtc_base:gunit_helpers", "../rtc_base:ip_address", "../rtc_base:logging", "../rtc_base:mdns_responder_interface", diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 29888f043b..7f9af04c8c 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -751,7 +751,6 @@ if (rtc_include_tests) { sources = [ "task_queue_stdlib_unittest.cc" ] deps = [ - ":gunit_helpers", ":logging", ":rtc_event", ":rtc_task_queue_stdlib", @@ -1415,7 +1414,6 @@ if (rtc_include_tests) { sources = [ "async_packet_socket_unittest.cc" ] deps = [ ":async_packet_socket", - ":gunit_helpers", ":socket", ":socket_address", "../test:test_support", @@ -1429,7 +1427,6 @@ if (rtc_include_tests) { deps = [ ":async_packet_socket", ":async_udp_socket", - ":gunit_helpers", ":mock_socket", ":rtc_base_tests_utils", ":socket", @@ -1450,7 +1447,6 @@ if (rtc_include_tests) { deps = [ ":async_packet_socket", ":async_tcp_socket", - ":gunit_helpers", ":net_helpers", ":rtc_base_tests_utils", ":socket", @@ -1739,19 +1735,6 @@ rtc_source_set("gtest_prod") { sources = [ "gtest_prod_util.h" ] } -rtc_library("gunit_helpers") { - testonly = true - sources = [ "gunit.h" ] - deps = [ - ":logging", - ":rtc_base_tests_utils", - ":stringutils", - ":threading", - "../test:test_support", - "//third_party/abseil-cpp/absl/strings:string_view", - ] -} - rtc_library("testclient") { testonly = true sources = [ @@ -1762,7 +1745,6 @@ rtc_library("testclient") { ":async_packet_socket", ":async_udp_socket", ":buffer", - ":gunit_helpers", ":rtc_base_tests_utils", ":socket", ":socket_address", @@ -1783,7 +1765,6 @@ rtc_library("callback_list_unittests") { sources = [ "callback_list_unittest.cc" ] deps = [ ":callback_list", - ":gunit_helpers", ":untyped_function", "../api:function_view", "../test:test_support", @@ -1995,7 +1976,6 @@ if (rtc_include_tests) { sources = [ "operations_chain_unittest.cc" ] deps = [ ":checks", - ":gunit_helpers", ":rtc_event", ":rtc_operations_chain", ":threading", @@ -2026,7 +2006,6 @@ if (rtc_include_tests) { ":buffer", ":checks", ":file_rotating_stream", - ":gunit_helpers", ":ip_address", ":logging", ":net_helpers", @@ -2127,7 +2106,6 @@ if (rtc_include_tests) { ":divide_round", ":event_tracer", ":frequency_tracker", - ":gunit_helpers", ":histogram_percentile_counter", ":ip_address", ":logging", @@ -2202,7 +2180,6 @@ if (rtc_include_tests) { sources = [ "task_queue_unittest.cc" ] deps = [ - ":gunit_helpers", ":rtc_base_tests_utils", ":rtc_event", ":task_queue_for_test", @@ -2219,7 +2196,6 @@ if (rtc_include_tests) { sources = [ "weak_ptr_unittest.cc" ] deps = [ - ":gunit_helpers", ":rtc_base_tests_utils", ":rtc_event", ":task_queue_for_test", @@ -2259,7 +2235,6 @@ if (rtc_include_tests) { sources = [ "strings/json_unittest.cc" ] deps = [ - ":gunit_helpers", ":rtc_base_tests_utils", ":rtc_json", "../test:test_support", @@ -2303,7 +2278,6 @@ if (rtc_include_tests) { ":data_rate_limiter", ":denormal_disabler", ":digest", - ":gunit_helpers", ":ifaddrs_converter", ":ip_address", ":logging", diff --git a/rtc_base/experiments/BUILD.gn b/rtc_base/experiments/BUILD.gn index 13601c302c..98d3025a04 100644 --- a/rtc_base/experiments/BUILD.gn +++ b/rtc_base/experiments/BUILD.gn @@ -235,7 +235,6 @@ if (rtc_include_tests && !build_with_chromium) { ":quality_scaler_settings", ":quality_scaling_experiment", ":rate_control_settings", - "..:gunit_helpers", "../../api:field_trials", "../../api:field_trials_view", "../../api/units:data_rate", diff --git a/rtc_base/gunit.h b/rtc_base/gunit.h deleted file mode 100644 index cf61fabf1a..0000000000 --- a/rtc_base/gunit.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2004 The WebRTC Project Authors. All rights reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef RTC_BASE_GUNIT_H_ -#define RTC_BASE_GUNIT_H_ - -// TODO(bugs.webrtc.org/42226242): remove transitive includes -#include "rtc_base/thread.h" // IWYU pragma: keep -#include "test/gtest.h" // IWYU pragma: keep - -// Wait until "ex" is true, or "timeout" expires, using fake clock where -// messages are processed every millisecond. -// TODO(pthatcher): Allow tests to control how many milliseconds to advance. -#define SIMULATED_WAIT(ex, timeout, clock) \ - for (int64_t wait_start = ::webrtc::TimeMillis(); \ - !(ex) && ::webrtc::TimeMillis() < wait_start + (timeout);) { \ - (clock).AdvanceTime(webrtc::TimeDelta::Millis(1)); \ - } - -#endif // RTC_BASE_GUNIT_H_ diff --git a/rtc_base/win32_unittest.cc b/rtc_base/win32_unittest.cc index 902f91532a..863376f766 100644 --- a/rtc_base/win32_unittest.cc +++ b/rtc_base/win32_unittest.cc @@ -12,7 +12,6 @@ #include -#include "rtc_base/gunit.h" #include "rtc_base/ip_address.h" #include "rtc_base/net_helpers.h" #include "test/gtest.h" diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn index fd98be799b..f39654771e 100644 --- a/rtc_tools/network_tester/BUILD.gn +++ b/rtc_tools/network_tester/BUILD.gn @@ -90,7 +90,6 @@ if (rtc_enable_protobuf) { "../../api:rtc_error_matchers", "../../api/environment", "../../api/environment:environment_factory", - "../../rtc_base:gunit_helpers", "../../rtc_base:random", "../../rtc_base:threading", "../../rtc_base:timeutils", diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index 065df50da8..5252eb9193 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -1236,9 +1236,9 @@ if (is_ios || is_mac) { "../media:rtc_media_base", "../media:rtc_media_tests_utils", "../modules/video_coding:video_codec_interface", - "../rtc_base:gunit_helpers", "../rtc_base:refcount", "../rtc_base:rtc_event", + "../rtc_base:threading", "../rtc_base/system:unused", "../system_wrappers", "../test:create_test_environment", diff --git a/sdk/objc/unittests/RTCAudioSessionTest.mm b/sdk/objc/unittests/RTCAudioSessionTest.mm index 03f7b6942b..a8c0679f8e 100644 --- a/sdk/objc/unittests/RTCAudioSessionTest.mm +++ b/sdk/objc/unittests/RTCAudioSessionTest.mm @@ -12,10 +12,12 @@ #import #import +#include "rtc_base/thread.h" +#include "test/gtest.h" + #include #include "rtc_base/event.h" -#include "rtc_base/gunit.h" #import "components/audio/RTCAudioSession+Private.h" @@ -25,8 +27,9 @@ @interface RTC_OBJC_TYPE (RTCAudioSession) (UnitTesting) - @property(nonatomic, readonly) std::vector< - __weak id > delegates; + @property(nonatomic, readonly) + std::vector<__weak id > + delegates; - (instancetype)initWithAudioSession:(id)audioSession; diff --git a/sdk/objc/unittests/RTCCertificateTest.mm b/sdk/objc/unittests/RTCCertificateTest.mm index 64c68e0e45..3af2f6ab18 100644 --- a/sdk/objc/unittests/RTCCertificateTest.mm +++ b/sdk/objc/unittests/RTCCertificateTest.mm @@ -11,9 +11,9 @@ #import #import -#include +#include "test/gtest.h" -#include "rtc_base/gunit.h" +#include #import "api/peerconnection/RTCConfiguration+Private.h" #import "api/peerconnection/RTCConfiguration.h" diff --git a/sdk/objc/unittests/RTCConfigurationTest.mm b/sdk/objc/unittests/RTCConfigurationTest.mm index 5c8fca0383..2716b1ed91 100644 --- a/sdk/objc/unittests/RTCConfigurationTest.mm +++ b/sdk/objc/unittests/RTCConfigurationTest.mm @@ -11,9 +11,9 @@ #import #import -#include +#include "test/gtest.h" -#include "rtc_base/gunit.h" +#include #import "api/peerconnection/RTCConfiguration+Private.h" #import "api/peerconnection/RTCConfiguration.h" diff --git a/sdk/objc/unittests/RTCDataChannelConfigurationTest.mm b/sdk/objc/unittests/RTCDataChannelConfigurationTest.mm index ccebd74198..e2a0ab0e7c 100644 --- a/sdk/objc/unittests/RTCDataChannelConfigurationTest.mm +++ b/sdk/objc/unittests/RTCDataChannelConfigurationTest.mm @@ -11,7 +11,7 @@ #import #import -#include "rtc_base/gunit.h" +#include "test/gtest.h" #import "api/peerconnection/RTCDataChannelConfiguration+Private.h" #import "api/peerconnection/RTCDataChannelConfiguration.h" diff --git a/sdk/objc/unittests/RTCFileVideoCapturer_xctest.mm b/sdk/objc/unittests/RTCFileVideoCapturer_xctest.mm index 9e5f227913..e4a6847236 100644 --- a/sdk/objc/unittests/RTCFileVideoCapturer_xctest.mm +++ b/sdk/objc/unittests/RTCFileVideoCapturer_xctest.mm @@ -12,8 +12,9 @@ #import +#include "test/gtest.h" + #include "api/test/rtc_error_matchers.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" #include "test/wait_until.h" diff --git a/sdk/objc/unittests/RTCIceCandidateTest.mm b/sdk/objc/unittests/RTCIceCandidateTest.mm index 268d330815..b89a55de6d 100644 --- a/sdk/objc/unittests/RTCIceCandidateTest.mm +++ b/sdk/objc/unittests/RTCIceCandidateTest.mm @@ -11,9 +11,9 @@ #import #import -#include +#include "test/gtest.h" -#include "rtc_base/gunit.h" +#include #import "api/peerconnection/RTCIceCandidate+Private.h" #import "api/peerconnection/RTCIceCandidate.h" diff --git a/sdk/objc/unittests/RTCIceServerTest.mm b/sdk/objc/unittests/RTCIceServerTest.mm index 29163961da..0d1919d8bd 100644 --- a/sdk/objc/unittests/RTCIceServerTest.mm +++ b/sdk/objc/unittests/RTCIceServerTest.mm @@ -11,9 +11,9 @@ #import #import -#include +#include "test/gtest.h" -#include "rtc_base/gunit.h" +#include #import "api/peerconnection/RTCIceServer+Private.h" #import "api/peerconnection/RTCIceServer.h" diff --git a/sdk/objc/unittests/RTCMediaConstraintsTest.mm b/sdk/objc/unittests/RTCMediaConstraintsTest.mm index 60d68f3e31..7b67147d39 100644 --- a/sdk/objc/unittests/RTCMediaConstraintsTest.mm +++ b/sdk/objc/unittests/RTCMediaConstraintsTest.mm @@ -11,9 +11,9 @@ #import #import -#include +#include "test/gtest.h" -#include "rtc_base/gunit.h" +#include #import "api/peerconnection/RTCMediaConstraints+Private.h" #import "api/peerconnection/RTCMediaConstraints.h" diff --git a/sdk/objc/unittests/RTCPeerConnectionFactoryBuilderTest.mm b/sdk/objc/unittests/RTCPeerConnectionFactoryBuilderTest.mm index 115b5e200e..15eb6ca746 100644 --- a/sdk/objc/unittests/RTCPeerConnectionFactoryBuilderTest.mm +++ b/sdk/objc/unittests/RTCPeerConnectionFactoryBuilderTest.mm @@ -10,6 +10,8 @@ #import #import + +#include "test/gtest.h" #ifdef __cplusplus extern "C" { #endif @@ -28,7 +30,6 @@ extern "C" { #include "api/video_codecs/video_decoder_factory.h" #include "api/video_codecs/video_encoder_factory.h" -#include "rtc_base/gunit.h" #include "rtc_base/system/unused.h" @interface RTCPeerConnectionFactoryBuilderTests : XCTestCase diff --git a/sdk/objc/unittests/RTCPeerConnectionTest.mm b/sdk/objc/unittests/RTCPeerConnectionTest.mm index e2c05f90f7..57a089418f 100644 --- a/sdk/objc/unittests/RTCPeerConnectionTest.mm +++ b/sdk/objc/unittests/RTCPeerConnectionTest.mm @@ -11,11 +11,11 @@ #import #import +#include "test/gtest.h" + #include #include -#include "rtc_base/gunit.h" - #import "api/peerconnection/RTCConfiguration+Private.h" #import "api/peerconnection/RTCConfiguration.h" #import "api/peerconnection/RTCCryptoOptions.h" diff --git a/sdk/objc/unittests/RTCSessionDescriptionTest.mm b/sdk/objc/unittests/RTCSessionDescriptionTest.mm index d64abce614..790fcd7bda 100644 --- a/sdk/objc/unittests/RTCSessionDescriptionTest.mm +++ b/sdk/objc/unittests/RTCSessionDescriptionTest.mm @@ -11,8 +11,9 @@ #import #import +#include "test/gtest.h" + #include "api/jsep.h" -#include "rtc_base/gunit.h" #import "api/peerconnection/RTCSessionDescription+Private.h" #import "api/peerconnection/RTCSessionDescription.h" diff --git a/sdk/objc/unittests/RTCTracingTest.mm b/sdk/objc/unittests/RTCTracingTest.mm index 63008a79d1..1d613ea962 100644 --- a/sdk/objc/unittests/RTCTracingTest.mm +++ b/sdk/objc/unittests/RTCTracingTest.mm @@ -11,9 +11,9 @@ #import #import -#include +#include "test/gtest.h" -#include "rtc_base/gunit.h" +#include #import "api/peerconnection/RTCTracing.h" #import "helpers/NSString+StdString.h" diff --git a/sdk/objc/unittests/avformatmappertests.mm b/sdk/objc/unittests/avformatmappertests.mm index 06aefb4351..2d8d2d3640 100644 --- a/sdk/objc/unittests/avformatmappertests.mm +++ b/sdk/objc/unittests/avformatmappertests.mm @@ -11,7 +11,7 @@ #import #import -#include "rtc_base/gunit.h" +#include "test/gtest.h" // Width and height don't play any role so lets use predefined values throughout // the tests. diff --git a/sdk/objc/unittests/nalu_rewriter_xctest.mm b/sdk/objc/unittests/nalu_rewriter_xctest.mm index 82260a51e1..ac98010a91 100644 --- a/sdk/objc/unittests/nalu_rewriter_xctest.mm +++ b/sdk/objc/unittests/nalu_rewriter_xctest.mm @@ -12,7 +12,6 @@ #include "common_video/h264/h264_common.h" #include "components/video_codec/nalu_rewriter.h" -#include "rtc_base/gunit.h" #import @@ -212,11 +211,8 @@ static const uint8_t SPS_PPS_BUFFER[] = { CMSampleBufferRef out_sample_buffer = nil; CMVideoFormatDescriptionRef description = [self createDescription]; - Boolean result = - webrtc::H264AnnexBBufferToCMSampleBuffer(annex_b_test_data, - description, - &out_sample_buffer, - memory_pool); + Boolean result = webrtc::H264AnnexBBufferToCMSampleBuffer( + annex_b_test_data, description, &out_sample_buffer, memory_pool); XCTAssertTrue(result); diff --git a/sdk/objc/unittests/objc_video_decoder_factory_tests.mm b/sdk/objc/unittests/objc_video_decoder_factory_tests.mm index 3a8748e102..e3008a1139 100644 --- a/sdk/objc/unittests/objc_video_decoder_factory_tests.mm +++ b/sdk/objc/unittests/objc_video_decoder_factory_tests.mm @@ -12,6 +12,8 @@ #import #import +#include "test/gtest.h" + #include "sdk/objc/native/src/objc_video_decoder_factory.h" #include "api/environment/environment_factory.h" @@ -20,7 +22,6 @@ #include "media/base/codec.h" #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/include/video_error_codes.h" -#include "rtc_base/gunit.h" #import "sdk/objc/base/RTCMacros.h" id CreateDecoderFactoryReturning( diff --git a/sdk/objc/unittests/objc_video_encoder_factory_tests.mm b/sdk/objc/unittests/objc_video_encoder_factory_tests.mm index 12b9c99cb8..4c0c435ac3 100644 --- a/sdk/objc/unittests/objc_video_encoder_factory_tests.mm +++ b/sdk/objc/unittests/objc_video_encoder_factory_tests.mm @@ -12,6 +12,8 @@ #import #import +#include "test/gtest.h" + #include "sdk/objc/native/src/objc_video_encoder_factory.h" #include "api/environment/environment_factory.h" @@ -23,7 +25,6 @@ #import "components/video_frame_buffer/RTCCVPixelBuffer.h" #include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/include/video_error_codes.h" -#include "rtc_base/gunit.h" #include "sdk/objc/native/src/objc_frame_buffer.h" id CreateEncoderFactoryReturning( diff --git a/stats/BUILD.gn b/stats/BUILD.gn index a523cb8e35..5626cc5aa6 100644 --- a/stats/BUILD.gn +++ b/stats/BUILD.gn @@ -63,7 +63,6 @@ if (rtc_include_tests && !build_with_chromium) { "../api:scoped_refptr", "../api/units:timestamp", "../rtc_base:checks", - "../rtc_base:gunit_helpers", "../rtc_base:rtc_json", "../test:test_support", ] diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn index 058a6941db..20b8524eeb 100644 --- a/test/pc/e2e/BUILD.gn +++ b/test/pc/e2e/BUILD.gn @@ -348,7 +348,6 @@ if (!build_with_chromium) { "../../../modules/audio_device:audio_device_impl", "../../../pc:pc_test_utils", "../../../pc:peerconnection_wrapper", - "../../../rtc_base:gunit_helpers", "../../../rtc_base:logging", "../../../rtc_base:rtc_event", "../../../test:fileutils",