Refactor P2PTransportChannel unittests to propagate field trials
Propagate field trials using Environment with intent to change various types, BasicPortAllocator in particular, to take Environment at construction. Bug: webrtc:42220378 Change-Id: I488aa82aa606e38f16aa22a032c60f4d191ede72 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/377040 Reviewed-by: Per Kjellander <perkj@webrtc.org> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43887}
This commit is contained in:
parent
29e62c84ac
commit
4b2176aa86
13
p2p/BUILD.gn
13
p2p/BUILD.gn
@ -1031,8 +1031,6 @@ if (rtc_include_tests) {
|
|||||||
"dtls/dtls_utils_unittest.cc",
|
"dtls/dtls_utils_unittest.cc",
|
||||||
]
|
]
|
||||||
deps = [
|
deps = [
|
||||||
":active_ice_controller_factory_interface",
|
|
||||||
":active_ice_controller_interface",
|
|
||||||
":async_stun_tcp_socket",
|
":async_stun_tcp_socket",
|
||||||
":basic_ice_controller",
|
":basic_ice_controller",
|
||||||
":basic_packet_socket_factory",
|
":basic_packet_socket_factory",
|
||||||
@ -1075,15 +1073,17 @@ if (rtc_include_tests) {
|
|||||||
"../api:async_dns_resolver",
|
"../api:async_dns_resolver",
|
||||||
"../api:candidate",
|
"../api:candidate",
|
||||||
"../api:dtls_transport_interface",
|
"../api:dtls_transport_interface",
|
||||||
|
"../api:field_trials",
|
||||||
"../api:field_trials_view",
|
"../api:field_trials_view",
|
||||||
"../api:ice_transport_interface",
|
"../api:ice_transport_interface",
|
||||||
"../api:libjingle_peerconnection_api",
|
|
||||||
"../api:mock_async_dns_resolver",
|
"../api:mock_async_dns_resolver",
|
||||||
"../api:packet_socket_factory",
|
"../api:packet_socket_factory",
|
||||||
"../api:rtc_error",
|
"../api:rtc_error",
|
||||||
"../api:rtc_error_matchers",
|
"../api:rtc_error_matchers",
|
||||||
"../api:scoped_refptr",
|
"../api:scoped_refptr",
|
||||||
"../api/crypto:options",
|
"../api/crypto:options",
|
||||||
|
"../api/environment",
|
||||||
|
"../api/environment:environment_factory",
|
||||||
"../api/task_queue",
|
"../api/task_queue",
|
||||||
"../api/task_queue:pending_task_safety_flag",
|
"../api/task_queue:pending_task_safety_flag",
|
||||||
"../api/transport:enums",
|
"../api/transport:enums",
|
||||||
@ -1096,7 +1096,6 @@ if (rtc_include_tests) {
|
|||||||
"../rtc_base:checks",
|
"../rtc_base:checks",
|
||||||
"../rtc_base:copy_on_write_buffer",
|
"../rtc_base:copy_on_write_buffer",
|
||||||
"../rtc_base:crypto_random",
|
"../rtc_base:crypto_random",
|
||||||
"../rtc_base:digest",
|
|
||||||
"../rtc_base:dscp",
|
"../rtc_base:dscp",
|
||||||
"../rtc_base:gunit_helpers",
|
"../rtc_base:gunit_helpers",
|
||||||
"../rtc_base:ip_address",
|
"../rtc_base:ip_address",
|
||||||
@ -1113,12 +1112,10 @@ if (rtc_include_tests) {
|
|||||||
"../rtc_base:socket",
|
"../rtc_base:socket",
|
||||||
"../rtc_base:socket_adapters",
|
"../rtc_base:socket_adapters",
|
||||||
"../rtc_base:socket_address",
|
"../rtc_base:socket_address",
|
||||||
"../rtc_base:socket_address_pair",
|
|
||||||
"../rtc_base:socket_server",
|
"../rtc_base:socket_server",
|
||||||
"../rtc_base:ssl",
|
"../rtc_base:ssl",
|
||||||
"../rtc_base:ssl_adapter",
|
"../rtc_base:ssl_adapter",
|
||||||
"../rtc_base:stream",
|
"../rtc_base:stream",
|
||||||
"../rtc_base:stringutils",
|
|
||||||
"../rtc_base:testclient",
|
"../rtc_base:testclient",
|
||||||
"../rtc_base:threading",
|
"../rtc_base:threading",
|
||||||
"../rtc_base:timeutils",
|
"../rtc_base:timeutils",
|
||||||
@ -1126,13 +1123,11 @@ if (rtc_include_tests) {
|
|||||||
"../rtc_base/network:sent_packet",
|
"../rtc_base/network:sent_packet",
|
||||||
"../rtc_base/third_party/sigslot",
|
"../rtc_base/third_party/sigslot",
|
||||||
"../system_wrappers:metrics",
|
"../system_wrappers:metrics",
|
||||||
"../test:field_trial",
|
|
||||||
"../test:rtc_expect_death",
|
|
||||||
"../test:scoped_key_value_config",
|
"../test:scoped_key_value_config",
|
||||||
"../test:test_support",
|
"../test:test_support",
|
||||||
"../test:wait_until",
|
"../test:wait_until",
|
||||||
"//testing/gtest",
|
|
||||||
"//third_party/abseil-cpp/absl/algorithm:container",
|
"//third_party/abseil-cpp/absl/algorithm:container",
|
||||||
|
"//third_party/abseil-cpp/absl/base:nullability",
|
||||||
"//third_party/abseil-cpp/absl/functional:any_invocable",
|
"//third_party/abseil-cpp/absl/functional:any_invocable",
|
||||||
"//third_party/abseil-cpp/absl/memory",
|
"//third_party/abseil-cpp/absl/memory",
|
||||||
"//third_party/abseil-cpp/absl/strings",
|
"//third_party/abseil-cpp/absl/strings",
|
||||||
|
|||||||
@ -231,12 +231,12 @@ class FakePortAllocator : public cricket::PortAllocator {
|
|||||||
public:
|
public:
|
||||||
FakePortAllocator(rtc::Thread* network_thread,
|
FakePortAllocator(rtc::Thread* network_thread,
|
||||||
rtc::PacketSocketFactory* factory,
|
rtc::PacketSocketFactory* factory,
|
||||||
webrtc::FieldTrialsView* field_trials)
|
const webrtc::FieldTrialsView* field_trials)
|
||||||
: FakePortAllocator(network_thread, factory, nullptr, field_trials) {}
|
: FakePortAllocator(network_thread, factory, nullptr, field_trials) {}
|
||||||
|
|
||||||
FakePortAllocator(rtc::Thread* network_thread,
|
FakePortAllocator(rtc::Thread* network_thread,
|
||||||
std::unique_ptr<rtc::PacketSocketFactory> factory,
|
std::unique_ptr<rtc::PacketSocketFactory> factory,
|
||||||
webrtc::FieldTrialsView* field_trials)
|
const webrtc::FieldTrialsView* field_trials)
|
||||||
: FakePortAllocator(network_thread,
|
: FakePortAllocator(network_thread,
|
||||||
nullptr,
|
nullptr,
|
||||||
std::move(factory),
|
std::move(factory),
|
||||||
@ -268,7 +268,7 @@ class FakePortAllocator : public cricket::PortAllocator {
|
|||||||
FakePortAllocator(rtc::Thread* network_thread,
|
FakePortAllocator(rtc::Thread* network_thread,
|
||||||
rtc::PacketSocketFactory* factory,
|
rtc::PacketSocketFactory* factory,
|
||||||
std::unique_ptr<rtc::PacketSocketFactory> owned_factory,
|
std::unique_ptr<rtc::PacketSocketFactory> owned_factory,
|
||||||
webrtc::FieldTrialsView* field_trials)
|
const webrtc::FieldTrialsView* field_trials)
|
||||||
: network_thread_(network_thread),
|
: network_thread_(network_thread),
|
||||||
factory_(std::move(owned_factory), factory),
|
factory_(std::move(owned_factory), factory),
|
||||||
field_trials_(field_trials) {
|
field_trials_(field_trials) {
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user