Skip to content

Commit 1f251dd

Browse files
sam-viWebRTC LUCI CQ
sam-vi
authored and
WebRTC LUCI CQ
committed
Default enable WebRTC-IPv6NetworkResolutionFixes
Fully launched on mobile and approved for chrome launch. Removed tests for feature enablement with field trial. Bug: webrtc:14334 Change-Id: I7ca7183ff618835fef8c820cfd52863e1c7fa25e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/301163 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Jonas Oreland <jonaso@webrtc.org> Commit-Queue: Sameer Vijaykar <samvi@google.com> Cr-Commit-Position: refs/heads/main@{#39879}
1 parent 45eae34 commit 1f251dd

File tree

10 files changed

+20
-295
lines changed

10 files changed

+20
-295
lines changed

‎p2p/base/port_unittest.cc‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -545,12 +545,11 @@ class PortTest : public ::testing::Test, public sigslot::has_slots<> {
545545
std::unique_ptr<UDPPort> CreateUdpPortMultipleAddrs(
546546
const SocketAddress& global_addr,
547547
const SocketAddress& link_local_addr,
548-
PacketSocketFactory* socket_factory,
549-
const webrtc::test::ScopedKeyValueConfig& field_trials) {
548+
PacketSocketFactory* socket_factory) {
550549
auto port = UDPPort::Create(
551550
&main_, socket_factory,
552-
MakeNetworkMultipleAddrs(global_addr, link_local_addr, &field_trials),
553-
0, 0, username_, password_, true, absl::nullopt, &field_trials);
551+
MakeNetworkMultipleAddrs(global_addr, link_local_addr, &field_trials_),
552+
0, 0, username_, password_, true, absl::nullopt, &field_trials_);
554553
port->SetIceTiebreaker(kTiebreakerDefault);
555554
return port;
556555
}
@@ -1770,9 +1769,6 @@ TEST_F(PortTest, TestUdpSingleAddressV6CrossTypePorts) {
17701769
}
17711770

17721771
TEST_F(PortTest, TestUdpMultipleAddressesV6CrossTypePorts) {
1773-
webrtc::test::ScopedKeyValueConfig field_trials(
1774-
"WebRTC-IPv6NetworkResolutionFixes/"
1775-
"Enabled,PreferGlobalIPv6Address:true/");
17761772
FakePacketSocketFactory factory;
17771773
std::unique_ptr<Port> ports[5];
17781774
SocketAddress addresses[5] = {
@@ -1782,8 +1778,8 @@ TEST_F(PortTest, TestUdpMultipleAddressesV6CrossTypePorts) {
17821778
for (int i = 0; i < 5; i++) {
17831779
FakeAsyncPacketSocket* socket = new FakeAsyncPacketSocket();
17841780
factory.set_next_udp_socket(socket);
1785-
ports[i] = CreateUdpPortMultipleAddrs(addresses[i], kLinkLocalIPv6Addr,
1786-
&factory, field_trials);
1781+
ports[i] =
1782+
CreateUdpPortMultipleAddrs(addresses[i], kLinkLocalIPv6Addr, &factory);
17871783
ports[i]->SetIceTiebreaker(kTiebreakerDefault);
17881784
socket->set_state(AsyncPacketSocket::STATE_BINDING);
17891785
socket->SignalAddressReady(socket, addresses[i]);

‎p2p/base/stun_port.cc‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,8 @@ namespace cricket {
3232
namespace {
3333

3434
bool ResolveStunHostnameForFamily(const webrtc::FieldTrialsView& field_trials) {
35-
// Bug fix for STUN hostname resolution on IPv6.
36-
// Field trial key reserved in bugs.webrtc.org/14334
37-
static constexpr char field_trial_name[] =
38-
"WebRTC-IPv6NetworkResolutionFixes";
39-
if (!field_trials.IsEnabled(field_trial_name)) {
40-
return false;
41-
}
42-
43-
webrtc::FieldTrialParameter<bool> resolve_stun_hostname_for_family(
44-
"ResolveStunHostnameForFamily", /*default_value=*/false);
45-
webrtc::ParseFieldTrial({&resolve_stun_hostname_for_family},
46-
field_trials.Lookup(field_trial_name));
47-
return resolve_stun_hostname_for_family;
35+
// TODO(bugs.webrtc.org/14334) cleanup
36+
return true;
4837
}
4938

5039
} // namespace

‎p2p/base/stun_port_unittest.cc‎

Lines changed: 3 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,8 @@ TEST_F(StunPortWithMockDnsResolverTest, TestPrepareAddressHostname) {
317317
SetDnsResolverExpectations(
318318
[](webrtc::MockAsyncDnsResolver* resolver,
319319
webrtc::MockAsyncDnsResolverResult* resolver_result) {
320-
EXPECT_CALL(*resolver, Start(kValidHostnameAddr, _))
321-
.WillOnce(InvokeArgument<1>());
320+
EXPECT_CALL(*resolver, Start(kValidHostnameAddr, /*family=*/AF_INET, _))
321+
.WillOnce(InvokeArgument<2>());
322322
EXPECT_CALL(*resolver, result)
323323
.WillRepeatedly(ReturnPointee(resolver_result));
324324
EXPECT_CALL(*resolver_result, GetError).WillOnce(Return(0));
@@ -666,84 +666,6 @@ TEST_F(StunIPv6PortTestWithMockDnsResolver, TestPrepareAddressHostname) {
666666
SetDnsResolverExpectations(
667667
[](webrtc::MockAsyncDnsResolver* resolver,
668668
webrtc::MockAsyncDnsResolverResult* resolver_result) {
669-
// Expect to call Resolver::Start without family arg.
670-
EXPECT_CALL(*resolver, Start(kValidHostnameAddr, _))
671-
.WillOnce(InvokeArgument<1>());
672-
EXPECT_CALL(*resolver, result)
673-
.WillRepeatedly(ReturnPointee(resolver_result));
674-
EXPECT_CALL(*resolver_result, GetError).WillOnce(Return(0));
675-
EXPECT_CALL(*resolver_result, GetResolvedAddress(AF_INET6, _))
676-
.WillOnce(DoAll(SetArgPointee<1>(SocketAddress("::1", 5000)),
677-
Return(true)));
678-
});
679-
CreateStunPort(kValidHostnameAddr);
680-
PrepareAddress();
681-
EXPECT_TRUE_SIMULATED_WAIT(done(), kTimeoutMs, fake_clock);
682-
ASSERT_EQ(1U, port()->Candidates().size());
683-
EXPECT_TRUE(kIPv6LocalAddr.EqualIPs(port()->Candidates()[0].address()));
684-
EXPECT_EQ(kIPv6StunCandidatePriority, port()->Candidates()[0].priority());
685-
}
686-
687-
TEST_F(StunIPv6PortTestWithMockDnsResolver,
688-
TestPrepareAddressHostnameFamilyFieldTrialDisabled) {
689-
webrtc::test::ScopedKeyValueConfig field_trials(
690-
"WebRTC-IPv6NetworkResolutionFixes/Disabled/");
691-
SetDnsResolverExpectations(
692-
[](webrtc::MockAsyncDnsResolver* resolver,
693-
webrtc::MockAsyncDnsResolverResult* resolver_result) {
694-
// Expect to call Resolver::Start without family arg.
695-
EXPECT_CALL(*resolver, Start(kValidHostnameAddr, _))
696-
.WillOnce(InvokeArgument<1>());
697-
EXPECT_CALL(*resolver, result)
698-
.WillRepeatedly(ReturnPointee(resolver_result));
699-
EXPECT_CALL(*resolver_result, GetError).WillOnce(Return(0));
700-
EXPECT_CALL(*resolver_result, GetResolvedAddress(AF_INET6, _))
701-
.WillOnce(DoAll(SetArgPointee<1>(SocketAddress("::1", 5000)),
702-
Return(true)));
703-
});
704-
CreateStunPort(kValidHostnameAddr, &field_trials);
705-
PrepareAddress();
706-
EXPECT_TRUE_SIMULATED_WAIT(done(), kTimeoutMs, fake_clock);
707-
ASSERT_EQ(1U, port()->Candidates().size());
708-
EXPECT_TRUE(kIPv6LocalAddr.EqualIPs(port()->Candidates()[0].address()));
709-
EXPECT_EQ(kIPv6StunCandidatePriority, port()->Candidates()[0].priority());
710-
}
711-
712-
TEST_F(StunIPv6PortTestWithMockDnsResolver,
713-
TestPrepareAddressHostnameFamilyFieldTrialParamDisabled) {
714-
webrtc::test::ScopedKeyValueConfig field_trials(
715-
"WebRTC-IPv6NetworkResolutionFixes/"
716-
"Enabled,ResolveStunHostnameForFamily:false/");
717-
SetDnsResolverExpectations(
718-
[](webrtc::MockAsyncDnsResolver* resolver,
719-
webrtc::MockAsyncDnsResolverResult* resolver_result) {
720-
// Expect to call Resolver::Start without family arg.
721-
EXPECT_CALL(*resolver, Start(kValidHostnameAddr, _))
722-
.WillOnce(InvokeArgument<1>());
723-
EXPECT_CALL(*resolver, result)
724-
.WillRepeatedly(ReturnPointee(resolver_result));
725-
EXPECT_CALL(*resolver_result, GetError).WillOnce(Return(0));
726-
EXPECT_CALL(*resolver_result, GetResolvedAddress(AF_INET6, _))
727-
.WillOnce(DoAll(SetArgPointee<1>(SocketAddress("::1", 5000)),
728-
Return(true)));
729-
});
730-
CreateStunPort(kValidHostnameAddr, &field_trials);
731-
PrepareAddress();
732-
EXPECT_TRUE_SIMULATED_WAIT(done(), kTimeoutMs, fake_clock);
733-
ASSERT_EQ(1U, port()->Candidates().size());
734-
EXPECT_TRUE(kIPv6LocalAddr.EqualIPs(port()->Candidates()[0].address()));
735-
EXPECT_EQ(kIPv6StunCandidatePriority, port()->Candidates()[0].priority());
736-
}
737-
738-
TEST_F(StunIPv6PortTestWithMockDnsResolver,
739-
TestPrepareAddressHostnameFamilyFieldTrialEnabled) {
740-
webrtc::test::ScopedKeyValueConfig field_trials(
741-
"WebRTC-IPv6NetworkResolutionFixes/"
742-
"Enabled,ResolveStunHostnameForFamily:true/");
743-
SetDnsResolverExpectations(
744-
[](webrtc::MockAsyncDnsResolver* resolver,
745-
webrtc::MockAsyncDnsResolverResult* resolver_result) {
746-
// Expect to call Resolver::Start _with_ family arg.
747669
EXPECT_CALL(*resolver,
748670
Start(kValidHostnameAddr, /*family=*/AF_INET6, _))
749671
.WillOnce(InvokeArgument<2>());
@@ -754,7 +676,7 @@ TEST_F(StunIPv6PortTestWithMockDnsResolver,
754676
.WillOnce(DoAll(SetArgPointee<1>(SocketAddress("::1", 5000)),
755677
Return(true)));
756678
});
757-
CreateStunPort(kValidHostnameAddr, &field_trials);
679+
CreateStunPort(kValidHostnameAddr);
758680
PrepareAddress();
759681
EXPECT_TRUE_SIMULATED_WAIT(done(), kTimeoutMs, fake_clock);
760682
ASSERT_EQ(1U, port()->Candidates().size());

‎p2p/base/turn_port.cc‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,8 @@ namespace cricket {
3737
namespace {
3838

3939
bool ResolveTurnHostnameForFamily(const webrtc::FieldTrialsView& field_trials) {
40-
// Bug fix for TURN hostname resolution on IPv6.
41-
// Field trial key reserved in bugs.webrtc.org/14334
42-
static constexpr char field_trial_name[] =
43-
"WebRTC-IPv6NetworkResolutionFixes";
44-
if (!field_trials.IsEnabled(field_trial_name)) {
45-
return false;
46-
}
47-
48-
webrtc::FieldTrialParameter<bool> resolve_turn_hostname_for_family(
49-
"ResolveTurnHostnameForFamily", /*default_value=*/false);
50-
webrtc::ParseFieldTrial({&resolve_turn_hostname_for_family},
51-
field_trials.Lookup(field_trial_name));
52-
return resolve_turn_hostname_for_family;
40+
// TODO(bugs.webrtc.org/14334) cleanup
41+
return true;
5342
}
5443

5544
} // namespace

‎p2p/base/turn_port_unittest.cc‎

Lines changed: 2 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1912,8 +1912,8 @@ TEST_F(TurnPortWithMockDnsResolverTest, TestHostnameResolved) {
19121912
SetDnsResolverExpectations(
19131913
[](webrtc::MockAsyncDnsResolver* resolver,
19141914
webrtc::MockAsyncDnsResolverResult* resolver_result) {
1915-
EXPECT_CALL(*resolver, Start(kTurnValidAddr, _))
1916-
.WillOnce(InvokeArgument<1>());
1915+
EXPECT_CALL(*resolver, Start(kTurnValidAddr, /*family=*/AF_INET, _))
1916+
.WillOnce(InvokeArgument<2>());
19171917
EXPECT_CALL(*resolver, result)
19181918
.WillRepeatedly(ReturnPointee(resolver_result));
19191919
EXPECT_CALL(*resolver_result, GetError).WillRepeatedly(Return(0));
@@ -1932,85 +1932,6 @@ TEST_F(TurnPortWithMockDnsResolverTest, TestHostnameResolvedIPv6Network) {
19321932
SetDnsResolverExpectations(
19331933
[](webrtc::MockAsyncDnsResolver* resolver,
19341934
webrtc::MockAsyncDnsResolverResult* resolver_result) {
1935-
EXPECT_CALL(*resolver, Start(kTurnValidAddr, _))
1936-
.WillOnce(InvokeArgument<1>());
1937-
EXPECT_CALL(*resolver, result)
1938-
.WillRepeatedly(ReturnPointee(resolver_result));
1939-
EXPECT_CALL(*resolver_result, GetError).WillRepeatedly(Return(0));
1940-
EXPECT_CALL(*resolver_result, GetResolvedAddress(AF_INET6, _))
1941-
.WillOnce(
1942-
DoAll(SetArgPointee<1>(kTurnUdpIPv6IntAddr), Return(true)));
1943-
});
1944-
TestTurnAllocateSucceeds(kSimulatedRtt * 2);
1945-
}
1946-
1947-
// Test an allocation from a TURN server specified by a hostname on an IPv6
1948-
// network, without network family-specific resolution.
1949-
TEST_F(TurnPortWithMockDnsResolverTest,
1950-
TestHostnameResolvedIPv6NetworkFamilyFieldTrialDisabled) {
1951-
webrtc::test::ScopedKeyValueConfig override_field_trials(
1952-
field_trials_, "WebRTC-IPv6NetworkResolutionFixes/Disabled/");
1953-
turn_server_.AddInternalSocket(kTurnUdpIPv6IntAddr, PROTO_UDP);
1954-
CreateTurnPort(kLocalIPv6Addr, kTurnUsername, kTurnPassword,
1955-
kTurnPortValidHostnameProtoAddr);
1956-
SetDnsResolverExpectations(
1957-
[](webrtc::MockAsyncDnsResolver* resolver,
1958-
webrtc::MockAsyncDnsResolverResult* resolver_result) {
1959-
// Expect to call Resolver::Start without family arg.
1960-
EXPECT_CALL(*resolver, Start(kTurnValidAddr, _))
1961-
.WillOnce(InvokeArgument<1>());
1962-
EXPECT_CALL(*resolver, result)
1963-
.WillRepeatedly(ReturnPointee(resolver_result));
1964-
EXPECT_CALL(*resolver_result, GetError).WillRepeatedly(Return(0));
1965-
EXPECT_CALL(*resolver_result, GetResolvedAddress(AF_INET6, _))
1966-
.WillOnce(
1967-
DoAll(SetArgPointee<1>(kTurnUdpIPv6IntAddr), Return(true)));
1968-
});
1969-
TestTurnAllocateSucceeds(kSimulatedRtt * 2);
1970-
}
1971-
1972-
// Test an allocation from a TURN server specified by a hostname on an IPv6
1973-
// network, without network family-specific resolution.
1974-
TEST_F(TurnPortWithMockDnsResolverTest,
1975-
TestHostnameResolvedIPv6NetworkFamilyFieldTrialParamDisabled) {
1976-
webrtc::test::ScopedKeyValueConfig override_field_trials(
1977-
field_trials_,
1978-
"WebRTC-IPv6NetworkResolutionFixes/"
1979-
"Enabled,ResolveTurnHostnameForFamily:false/");
1980-
turn_server_.AddInternalSocket(kTurnUdpIPv6IntAddr, PROTO_UDP);
1981-
CreateTurnPort(kLocalIPv6Addr, kTurnUsername, kTurnPassword,
1982-
kTurnPortValidHostnameProtoAddr);
1983-
SetDnsResolverExpectations(
1984-
[](webrtc::MockAsyncDnsResolver* resolver,
1985-
webrtc::MockAsyncDnsResolverResult* resolver_result) {
1986-
// Expect to call Resolver::Start without family arg.
1987-
EXPECT_CALL(*resolver, Start(kTurnValidAddr, _))
1988-
.WillOnce(InvokeArgument<1>());
1989-
EXPECT_CALL(*resolver, result)
1990-
.WillRepeatedly(ReturnPointee(resolver_result));
1991-
EXPECT_CALL(*resolver_result, GetError).WillRepeatedly(Return(0));
1992-
EXPECT_CALL(*resolver_result, GetResolvedAddress(AF_INET6, _))
1993-
.WillOnce(
1994-
DoAll(SetArgPointee<1>(kTurnUdpIPv6IntAddr), Return(true)));
1995-
});
1996-
TestTurnAllocateSucceeds(kSimulatedRtt * 2);
1997-
}
1998-
1999-
// Test an allocation from a TURN server specified by a hostname on an IPv6
2000-
// network, with network family-specific resolution.
2001-
TEST_F(TurnPortWithMockDnsResolverTest,
2002-
TestHostnameResolvedIPv6NetworkFieldTrialEnabled) {
2003-
webrtc::test::ScopedKeyValueConfig override_field_trials(
2004-
field_trials_,
2005-
"WebRTC-IPv6NetworkResolutionFixes/"
2006-
"Enabled,ResolveTurnHostnameForFamily:true/");
2007-
turn_server_.AddInternalSocket(kTurnUdpIPv6IntAddr, PROTO_UDP);
2008-
CreateTurnPort(kLocalIPv6Addr, kTurnUsername, kTurnPassword,
2009-
kTurnPortValidHostnameProtoAddr);
2010-
SetDnsResolverExpectations(
2011-
[](webrtc::MockAsyncDnsResolver* resolver,
2012-
webrtc::MockAsyncDnsResolverResult* resolver_result) {
2013-
// Expect to call Resolver::Start _with_ family arg.
20141935
EXPECT_CALL(*resolver, Start(kTurnValidAddr, /*family=*/AF_INET6, _))
20151936
.WillOnce(InvokeArgument<2>());
20161937
EXPECT_CALL(*resolver, result)

‎p2p/client/basic_port_allocator.cc‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,8 @@ std::string NetworksToString(const std::vector<const rtc::Network*>& networks) {
156156

157157
bool IsDiversifyIpv6InterfacesEnabled(
158158
const webrtc::FieldTrialsView* field_trials) {
159-
// webrtc:14334: Improve IPv6 network resolution and candidate creation
160-
if (field_trials &&
161-
field_trials->IsEnabled("WebRTC-IPv6NetworkResolutionFixes")) {
162-
webrtc::FieldTrialParameter<bool> diversify_ipv6_interfaces(
163-
"DiversifyIpv6Interfaces", false);
164-
webrtc::ParseFieldTrial(
165-
{&diversify_ipv6_interfaces},
166-
field_trials->Lookup("WebRTC-IPv6NetworkResolutionFixes"));
167-
return diversify_ipv6_interfaces;
168-
}
169-
return false;
159+
// TODO(bugs.webrtc.org/14334) cleanup
160+
return true;
170161
}
171162

172163
} // namespace

‎p2p/client/basic_port_allocator_unittest.cc‎

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -2649,69 +2649,8 @@ TEST_F(BasicPortAllocatorTest, IPv6EtherAndWifiHaveHigherPriorityThanOthers) {
26492649
EXPECT_TRUE(HasNetwork(networks, ethe1));
26502650
}
26512651

2652-
// Do not change the default IPv6 selection behavior if
2653-
// IPv6NetworkResolutionFixes is disabled.
2654-
TEST_F(BasicPortAllocatorTest,
2655-
NotDiversifyIPv6NetworkTypesIfIPv6NetworkResolutionFixesDisabled) {
2656-
webrtc::test::ScopedKeyValueConfig field_trials(
2657-
field_trials_, "WebRTC-IPv6NetworkResolutionFixes/Disabled/");
2658-
// Add three IPv6 network interfaces, but tell the allocator to only use two.
2659-
allocator().set_max_ipv6_networks(2);
2660-
AddInterface(kClientIPv6Addr, "ethe1", rtc::ADAPTER_TYPE_ETHERNET);
2661-
AddInterface(kClientIPv6Addr2, "ethe2", rtc::ADAPTER_TYPE_ETHERNET);
2662-
AddInterface(kClientIPv6Addr3, "wifi1", rtc::ADAPTER_TYPE_WIFI);
2663-
// To simplify the test, only gather UDP host candidates.
2664-
allocator().set_flags(PORTALLOCATOR_ENABLE_IPV6 | PORTALLOCATOR_DISABLE_TCP |
2665-
PORTALLOCATOR_DISABLE_STUN |
2666-
PORTALLOCATOR_DISABLE_RELAY |
2667-
PORTALLOCATOR_ENABLE_IPV6_ON_WIFI);
2668-
2669-
ASSERT_TRUE(CreateSession(cricket::ICE_CANDIDATE_COMPONENT_RTP));
2670-
session_->StartGettingPorts();
2671-
EXPECT_TRUE_SIMULATED_WAIT(candidate_allocation_done_,
2672-
kDefaultAllocationTimeout, fake_clock);
2673-
2674-
EXPECT_EQ(2U, candidates_.size());
2675-
// Wifi1 was not selected because it comes after ethe1 and ethe2.
2676-
EXPECT_FALSE(HasCandidate(candidates_, "local", "udp", kClientIPv6Addr3));
2677-
}
2678-
2679-
// Do not change the default IPv6 selection behavior if
2680-
// IPv6NetworkResolutionFixes is enabled but DiversifyIpv6Interfaces is not
2681-
// enabled.
2682-
TEST_F(BasicPortAllocatorTest,
2683-
NotDiversifyIPv6NetworkTypesIfDiversifyIpv6InterfacesDisabled) {
2684-
webrtc::test::ScopedKeyValueConfig field_trials(
2685-
field_trials_,
2686-
"WebRTC-IPv6NetworkResolutionFixes/"
2687-
"Enabled,DiversifyIpv6Interfaces:false/");
2688-
// Add three IPv6 network interfaces, but tell the allocator to only use two.
2689-
allocator().set_max_ipv6_networks(2);
2690-
AddInterface(kClientIPv6Addr, "ethe1", rtc::ADAPTER_TYPE_ETHERNET);
2691-
AddInterface(kClientIPv6Addr2, "ethe2", rtc::ADAPTER_TYPE_ETHERNET);
2692-
AddInterface(kClientIPv6Addr3, "wifi1", rtc::ADAPTER_TYPE_WIFI);
2693-
// To simplify the test, only gather UDP host candidates.
2694-
allocator().set_flags(PORTALLOCATOR_ENABLE_IPV6 | PORTALLOCATOR_DISABLE_TCP |
2695-
PORTALLOCATOR_DISABLE_STUN |
2696-
PORTALLOCATOR_DISABLE_RELAY |
2697-
PORTALLOCATOR_ENABLE_IPV6_ON_WIFI);
2698-
2699-
ASSERT_TRUE(CreateSession(cricket::ICE_CANDIDATE_COMPONENT_RTP));
2700-
session_->StartGettingPorts();
2701-
EXPECT_TRUE_SIMULATED_WAIT(candidate_allocation_done_,
2702-
kDefaultAllocationTimeout, fake_clock);
2703-
2704-
EXPECT_EQ(2U, candidates_.size());
2705-
// Wifi1 was not selected because it comes after ethe1 and ethe2.
2706-
EXPECT_FALSE(HasCandidate(candidates_, "local", "udp", kClientIPv6Addr3));
2707-
}
2708-
27092652
TEST_F(BasicPortAllocatorTest,
27102653
Select2DifferentIntefacesIfDiversifyIpv6InterfacesEnabled) {
2711-
webrtc::test::ScopedKeyValueConfig field_trials(
2712-
field_trials_,
2713-
"WebRTC-IPv6NetworkResolutionFixes/"
2714-
"Enabled,DiversifyIpv6Interfaces:true/");
27152654
allocator().set_max_ipv6_networks(2);
27162655
AddInterface(kClientIPv6Addr, "ethe1", rtc::ADAPTER_TYPE_ETHERNET);
27172656
AddInterface(kClientIPv6Addr2, "ethe2", rtc::ADAPTER_TYPE_ETHERNET);
@@ -2738,10 +2677,6 @@ TEST_F(BasicPortAllocatorTest,
27382677

27392678
TEST_F(BasicPortAllocatorTest,
27402679
Select3DifferentIntefacesIfDiversifyIpv6InterfacesEnabled) {
2741-
webrtc::test::ScopedKeyValueConfig field_trials(
2742-
field_trials_,
2743-
"WebRTC-IPv6NetworkResolutionFixes/"
2744-
"Enabled,DiversifyIpv6Interfaces:true/");
27452680
allocator().set_max_ipv6_networks(3);
27462681
AddInterface(kClientIPv6Addr, "ethe1", rtc::ADAPTER_TYPE_ETHERNET);
27472682
AddInterface(kClientIPv6Addr2, "ethe2", rtc::ADAPTER_TYPE_ETHERNET);
@@ -2769,10 +2704,6 @@ TEST_F(BasicPortAllocatorTest,
27692704

27702705
TEST_F(BasicPortAllocatorTest,
27712706
Select4DifferentIntefacesIfDiversifyIpv6InterfacesEnabled) {
2772-
webrtc::test::ScopedKeyValueConfig field_trials(
2773-
field_trials_,
2774-
"WebRTC-IPv6NetworkResolutionFixes/"
2775-
"Enabled,DiversifyIpv6Interfaces:true/");
27762707
allocator().set_max_ipv6_networks(4);
27772708
AddInterface(kClientIPv6Addr, "ethe1", rtc::ADAPTER_TYPE_ETHERNET);
27782709
AddInterface(kClientIPv6Addr2, "ethe2", rtc::ADAPTER_TYPE_ETHERNET);

0 commit comments

Comments
 (0)