tor-browser

The Tor Browser
git clone https://git.dasho.dev/tor-browser.git
Log | Files | Refs | README | LICENSE

commit dae7b8956a8266711a3a4d90abfd4ffe9010cc4d
parent 4c90afb902806bea3ccc0a8de475fce4dd1f96eb
Author: Michael Froman <mfroman@mozilla.com>
Date:   Wed,  8 Oct 2025 17:27:01 -0500

Bug 1993083 - Vendor libwebrtc from 08837f6e91

Upstream commit: https://webrtc.googlesource.com/src/+/08837f6e91e7a1162a92f7b4c67b991d0482f3f2
    Replace usages of ScopedKeyValueConfig with CreateTestFieldTrials

    To avoid relying on global field trials string in these unittests

    Bug: webrtc:419453427
    Change-Id: I8f4f0836ae4ff0f05a69b0b728e5f9a5d0da744d
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/398282
    Reviewed-by: Harald Alvestrand <hta@webrtc.org>
    Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#45043}

Diffstat:
Mthird_party/libwebrtc/README.mozilla.last-vendor | 4++--
Mthird_party/libwebrtc/api/crypto/BUILD.gn | 3++-
Mthird_party/libwebrtc/api/crypto/crypto_options_unittest.cc | 15+++++++++++----
Mthird_party/libwebrtc/api/video/BUILD.gn | 3++-
Mthird_party/libwebrtc/api/video/frame_buffer_unittest.cc | 41+++++++++++++++++++++--------------------
Mthird_party/libwebrtc/moz-patch-stack/s0103.patch | 4++--
Mthird_party/libwebrtc/p2p/BUILD.gn | 2+-
Mthird_party/libwebrtc/p2p/base/port_unittest.cc | 7++++---
Mthird_party/libwebrtc/p2p/base/stun_port_unittest.cc | 15+++++++--------
Mthird_party/libwebrtc/p2p/base/transport_description_factory_unittest.cc | 17+++++++++++------
Mthird_party/libwebrtc/p2p/client/basic_port_allocator_unittest.cc | 7++++---
Mthird_party/libwebrtc/test/fuzzers/BUILD.gn | 2+-
Mthird_party/libwebrtc/test/fuzzers/frame_buffer_fuzzer.cc | 4++--
13 files changed, 70 insertions(+), 54 deletions(-)

diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor @@ -1,4 +1,4 @@ # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc -libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-08T22:25:33.116999+00:00. +libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-08T22:26:51.407018+00:00. # base of lastest vendoring -4a61405b8c +08837f6e91 diff --git a/third_party/libwebrtc/api/crypto/BUILD.gn b/third_party/libwebrtc/api/crypto/BUILD.gn @@ -59,8 +59,9 @@ if (rtc_include_tests) { sources = [ "crypto_options_unittest.cc" ] deps = [ ":options", + "..:field_trials", "../../rtc_base:ssl_adapter", - "../../test:scoped_key_value_config", + "../../test:create_test_field_trials", "../../test:test_support", "//testing/gtest", ] diff --git a/third_party/libwebrtc/api/crypto/crypto_options_unittest.cc b/third_party/libwebrtc/api/crypto/crypto_options_unittest.cc @@ -14,9 +14,13 @@ #include <set> #include <vector> -#include "rtc_base/openssl_stream_adapter.h" +#include "api/field_trials.h" +#include "rtc_base/openssl_stream_adapter.h" // IWYU pragma: keep +#include "test/create_test_field_trials.h" #include "test/gtest.h" -#include "test/scoped_key_value_config.h" + +namespace webrtc { +namespace { TEST(EphemeralKeyExchangeCipherGroupsTest, GetSupported) { std::set<uint16_t> expected = { @@ -123,8 +127,8 @@ TEST(EphemeralKeyExchangeCipherGroupsTest, Update) { }; webrtc::CryptoOptions::EphemeralKeyExchangeCipherGroups groups; - webrtc::test::ScopedKeyValueConfig field_trials( - "WebRTC-EnableDtlsPqc/Enabled/"); + FieldTrials field_trials = + CreateTestFieldTrials("WebRTC-EnableDtlsPqc/Enabled/"); groups.Update(&field_trials, &disable); EXPECT_EQ(groups.GetEnabled(), expected); } @@ -139,3 +143,6 @@ TEST(EphemeralKeyExchangeCipherGroupsTest, CopyCryptoOptions) { EXPECT_EQ(options, copy1); EXPECT_EQ(options, copy2); } + +} // namespace +} // namespace webrtc diff --git a/third_party/libwebrtc/api/video/BUILD.gn b/third_party/libwebrtc/api/video/BUILD.gn @@ -415,10 +415,11 @@ rtc_library("frame_buffer_unittest") { deps = [ ":frame_buffer", + "..:field_trials", "../../api/video:encoded_frame", + "../../test:create_test_field_trials", "../../test:fake_encoded_frame", "../../test:field_trial", - "../../test:scoped_key_value_config", "../../test:test_support", ] } diff --git a/third_party/libwebrtc/api/video/frame_buffer_unittest.cc b/third_party/libwebrtc/api/video/frame_buffer_unittest.cc @@ -12,10 +12,11 @@ #include <optional> #include <vector> +#include "api/field_trials.h" +#include "test/create_test_field_trials.h" #include "test/fake_encoded_frame.h" #include "test/gmock.h" #include "test/gtest.h" -#include "test/scoped_key_value_config.h" namespace webrtc { namespace { @@ -30,7 +31,7 @@ MATCHER_P(FrameWithId, id, "") { } TEST(FrameBuffer3Test, RejectInvalidRefs) { - test::ScopedKeyValueConfig field_trials; + FieldTrials field_trials = CreateTestFieldTrials(); FrameBuffer buffer(/*max_frame_slots=*/10, /*max_decode_history=*/100, field_trials); // Ref must be less than the id of this frame. @@ -47,7 +48,7 @@ TEST(FrameBuffer3Test, RejectInvalidRefs) { } TEST(FrameBuffer3Test, LastContinuousUpdatesOnInsertedFrames) { - test::ScopedKeyValueConfig field_trials; + FieldTrials field_trials = CreateTestFieldTrials(); FrameBuffer buffer(/*max_frame_slots=*/10, /*max_decode_history=*/100, field_trials); EXPECT_THAT(buffer.LastContinuousFrameId(), Eq(std::nullopt)); @@ -65,7 +66,7 @@ TEST(FrameBuffer3Test, LastContinuousUpdatesOnInsertedFrames) { } TEST(FrameBuffer3Test, LastContinuousFrameReordering) { - test::ScopedKeyValueConfig field_trials; + FieldTrials field_trials = CreateTestFieldTrials(); FrameBuffer buffer(/*max_frame_slots=*/10, /*max_decode_history=*/100, field_trials); @@ -81,7 +82,7 @@ TEST(FrameBuffer3Test, LastContinuousFrameReordering) { } TEST(FrameBuffer3Test, LastContinuousTemporalUnit) { - test::ScopedKeyValueConfig field_trials; + FieldTrials field_trials = CreateTestFieldTrials(); FrameBuffer buffer(/*max_frame_slots=*/10, /*max_decode_history=*/100, field_trials); @@ -94,7 +95,7 @@ TEST(FrameBuffer3Test, LastContinuousTemporalUnit) { } TEST(FrameBuffer3Test, LastContinuousTemporalUnitReordering) { - test::ScopedKeyValueConfig field_trials; + FieldTrials field_trials = CreateTestFieldTrials(); FrameBuffer buffer(/*max_frame_slots=*/10, /*max_decode_history=*/100, field_trials); @@ -112,7 +113,7 @@ TEST(FrameBuffer3Test, LastContinuousTemporalUnitReordering) { } TEST(FrameBuffer3Test, NextDecodable) { - test::ScopedKeyValueConfig field_trials; + FieldTrials field_trials = CreateTestFieldTrials(); FrameBuffer buffer(/*max_frame_slots=*/10, /*max_decode_history=*/100, field_trials); @@ -123,7 +124,7 @@ TEST(FrameBuffer3Test, NextDecodable) { } TEST(FrameBuffer3Test, AdvanceNextDecodableOnExtraction) { - test::ScopedKeyValueConfig field_trials; + FieldTrials field_trials = CreateTestFieldTrials(); FrameBuffer buffer(/*max_frame_slots=*/10, /*max_decode_history=*/100, field_trials); @@ -146,7 +147,7 @@ TEST(FrameBuffer3Test, AdvanceNextDecodableOnExtraction) { } TEST(FrameBuffer3Test, AdvanceLastDecodableOnExtraction) { - test::ScopedKeyValueConfig field_trials; + FieldTrials field_trials = CreateTestFieldTrials(); FrameBuffer buffer(/*max_frame_slots=*/10, /*max_decode_history=*/100, field_trials); @@ -164,7 +165,7 @@ TEST(FrameBuffer3Test, AdvanceLastDecodableOnExtraction) { } TEST(FrameBuffer3Test, FrameUpdatesNextDecodable) { - test::ScopedKeyValueConfig field_trials; + FieldTrials field_trials = CreateTestFieldTrials(); FrameBuffer buffer(/*max_frame_slots=*/10, /*max_decode_history=*/100, field_trials); @@ -178,7 +179,7 @@ TEST(FrameBuffer3Test, FrameUpdatesNextDecodable) { } TEST(FrameBuffer3Test, KeyframeClearsFullBuffer) { - test::ScopedKeyValueConfig field_trials; + FieldTrials field_trials = CreateTestFieldTrials(); FrameBuffer buffer(/*max_frame_slots=*/5, /*max_decode_history=*/10, field_trials); EXPECT_TRUE(buffer.InsertFrame( @@ -204,7 +205,7 @@ TEST(FrameBuffer3Test, KeyframeClearsFullBuffer) { } TEST(FrameBuffer3Test, DropNextDecodableTemporalUnit) { - test::ScopedKeyValueConfig field_trials; + FieldTrials field_trials = CreateTestFieldTrials(); FrameBuffer buffer(/*max_frame_slots=*/10, /*max_decode_history=*/100, field_trials); EXPECT_TRUE(buffer.InsertFrame( @@ -221,7 +222,7 @@ TEST(FrameBuffer3Test, DropNextDecodableTemporalUnit) { } TEST(FrameBuffer3Test, OldFramesAreIgnored) { - test::ScopedKeyValueConfig field_trials; + FieldTrials field_trials = CreateTestFieldTrials(); FrameBuffer buffer(/*max_frame_slots=*/10, /*max_decode_history=*/100, field_trials); EXPECT_TRUE(buffer.InsertFrame( @@ -243,7 +244,7 @@ TEST(FrameBuffer3Test, OldFramesAreIgnored) { } TEST(FrameBuffer3Test, ReturnFullTemporalUnitKSVC) { - test::ScopedKeyValueConfig field_trials; + FieldTrials field_trials = CreateTestFieldTrials(); FrameBuffer buffer(/*max_frame_slots=*/10, /*max_decode_history=*/100, field_trials); EXPECT_TRUE( @@ -262,7 +263,7 @@ TEST(FrameBuffer3Test, ReturnFullTemporalUnitKSVC) { } TEST(FrameBuffer3Test, InterleavedStream) { - test::ScopedKeyValueConfig field_trials; + FieldTrials field_trials = CreateTestFieldTrials(); FrameBuffer buffer(/*max_frame_slots=*/10, /*max_decode_history=*/100, field_trials); EXPECT_TRUE(buffer.InsertFrame( @@ -302,8 +303,8 @@ TEST(FrameBuffer3Test, InterleavedStream) { TEST(FrameBuffer3Test, LegacyFrameIdJumpBehavior) { { - test::ScopedKeyValueConfig field_trials( - "WebRTC-LegacyFrameIdJumpBehavior/Disabled/"); + FieldTrials field_trials = + CreateTestFieldTrials("WebRTC-LegacyFrameIdJumpBehavior/Disabled/"); FrameBuffer buffer(/*max_frame_slots=*/10, /*max_decode_history=*/100, field_trials); @@ -318,7 +319,7 @@ TEST(FrameBuffer3Test, LegacyFrameIdJumpBehavior) { { // WebRTC-LegacyFrameIdJumpBehavior is disabled by default. - test::ScopedKeyValueConfig field_trials; + FieldTrials field_trials = CreateTestFieldTrials(); FrameBuffer buffer(/*max_frame_slots=*/10, /*max_decode_history=*/100, field_trials); @@ -337,7 +338,7 @@ TEST(FrameBuffer3Test, LegacyFrameIdJumpBehavior) { } TEST(FrameBuffer3Test, TotalNumberOfContinuousTemporalUnits) { - test::ScopedKeyValueConfig field_trials; + FieldTrials field_trials = CreateTestFieldTrials(); FrameBuffer buffer(/*max_frame_slots=*/10, /*max_decode_history=*/100, field_trials); EXPECT_THAT(buffer.GetTotalNumberOfContinuousTemporalUnits(), Eq(0)); @@ -363,7 +364,7 @@ TEST(FrameBuffer3Test, TotalNumberOfContinuousTemporalUnits) { } TEST(FrameBuffer3Test, TotalNumberOfDroppedFrames) { - test::ScopedKeyValueConfig field_trials; + FieldTrials field_trials = CreateTestFieldTrials(); FrameBuffer buffer(/*max_frame_slots=*/10, /*max_decode_history=*/100, field_trials); EXPECT_THAT(buffer.GetTotalNumberOfDroppedFrames(), Eq(0)); diff --git a/third_party/libwebrtc/moz-patch-stack/s0103.patch b/third_party/libwebrtc/moz-patch-stack/s0103.patch @@ -246,7 +246,7 @@ index 40714b196e..2c6b39f59e 100644 if (rtc_include_tests) { diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn -index d0af76a6a0..40d3be5e30 100644 +index 7ff6932db1..aadc46a5c8 100644 --- a/api/video/BUILD.gn +++ b/api/video/BUILD.gn @@ -8,8 +8,8 @@ @@ -782,7 +782,7 @@ index 1dda47bb61..c1ae6bba46 100644 deps = [ ":google_test_runner_delegate" ] } diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn -index 3c2038d64b..058c82509d 100644 +index 62d0a537f4..8e5908a193 100644 --- a/test/fuzzers/BUILD.gn +++ b/test/fuzzers/BUILD.gn @@ -6,7 +6,7 @@ diff --git a/third_party/libwebrtc/p2p/BUILD.gn b/third_party/libwebrtc/p2p/BUILD.gn @@ -1288,8 +1288,8 @@ if (rtc_include_tests) { "../rtc_base/network:sent_packet", "../rtc_base/third_party/sigslot", "../system_wrappers:metrics", + "../test:create_test_field_trials", "../test:explicit_key_value_config", - "../test:scoped_key_value_config", "../test:test_support", "../test:wait_until", "//third_party/abseil-cpp/absl/algorithm:container", diff --git a/third_party/libwebrtc/p2p/base/port_unittest.cc b/third_party/libwebrtc/p2p/base/port_unittest.cc @@ -29,6 +29,7 @@ #include "api/candidate.h" #include "api/environment/environment.h" #include "api/environment/environment_factory.h" +#include "api/field_trials.h" #include "api/packet_socket_factory.h" #include "api/rtc_error.h" #include "api/test/rtc_error_matchers.h" @@ -71,9 +72,9 @@ #include "rtc_base/thread.h" #include "rtc_base/time_utils.h" #include "rtc_base/virtual_socket_server.h" +#include "test/create_test_field_trials.h" #include "test/gmock.h" #include "test/gtest.h" -#include "test/scoped_key_value_config.h" #include "test/wait_until.h" using ::testing::Eq; @@ -2808,7 +2809,7 @@ TEST_F(PortTest, TestComputeCandidatePriority) { } TEST_F(PortTest, TestComputeCandidatePriorityWithPriorityAdjustment) { - test::ScopedKeyValueConfig field_trials( + FieldTrials field_trials = CreateTestFieldTrials( "WebRTC-IncreaseIceCandidatePriorityHostSrflx/Enabled/"); auto port = CreateTestPort(kLocalAddr1, "name", "pass", &field_trials); port->SetIceTiebreaker(kTiebreakerDefault); @@ -3025,7 +3026,7 @@ TEST_F(PortTest, TestConnectionPriority) { // Test the Connection priority is calculated correctly. TEST_F(PortTest, TestConnectionPriorityWithPriorityAdjustment) { - test::ScopedKeyValueConfig field_trials( + FieldTrials field_trials = CreateTestFieldTrials( "WebRTC-IncreaseIceCandidatePriorityHostSrflx/Enabled/"); auto lport = CreateTestPort(kLocalAddr1, "lfrag", "lpass", &field_trials); lport->SetIceTiebreaker(kTiebreakerDefault); diff --git a/third_party/libwebrtc/p2p/base/stun_port_unittest.cc b/third_party/libwebrtc/p2p/base/stun_port_unittest.cc @@ -22,6 +22,7 @@ #include "absl/strings/string_view.h" #include "api/candidate.h" #include "api/environment/environment_factory.h" +#include "api/field_trials.h" #include "api/field_trials_view.h" #include "api/packet_socket_factory.h" #include "api/test/mock_async_dns_resolver.h" @@ -56,11 +57,12 @@ #include "rtc_base/thread.h" #include "rtc_base/virtual_socket_server.h" #include "system_wrappers/include/metrics.h" +#include "test/create_test_field_trials.h" #include "test/gmock.h" #include "test/gtest.h" -#include "test/scoped_key_value_config.h" #include "test/wait_until.h" +namespace webrtc { namespace { using ::testing::_; @@ -70,10 +72,6 @@ using ::testing::IsTrue; using ::testing::Return; using ::testing::ReturnPointee; using ::testing::SetArgPointee; -using ::webrtc::CreateEnvironment; -using ::webrtc::IceCandidateType; -using ::webrtc::ServerAddresses; -using ::webrtc::SocketAddress; const SocketAddress kPrivateIP("192.168.1.12", 0); const SocketAddress kMsdnAddress("unittest-mdns-host-name.local", 0); @@ -459,7 +457,7 @@ TEST_F(StunPortWithMockDnsResolverTest, TestPrepareAddressHostname) { TEST_F(StunPortWithMockDnsResolverTest, TestPrepareAddressHostnameWithPriorityAdjustment) { - webrtc::test::ScopedKeyValueConfig field_trials( + FieldTrials field_trials = CreateTestFieldTrials( "WebRTC-IncreaseIceCandidatePriorityHostSrflx/Enabled/"); SetDnsResolverExpectations( [](webrtc::MockAsyncDnsResolver* resolver, @@ -474,7 +472,7 @@ TEST_F(StunPortWithMockDnsResolverTest, EXPECT_CALL(*resolver_result, GetResolvedAddress(AF_INET, _)) .WillOnce(DoAll(SetArgPointee<1>(kStunServerAddr1), Return(true))); }); - CreateStunPort(kValidHostnameAddr); + CreateStunPort(kValidHostnameAddr, &field_trials); PrepareAddress(); EXPECT_THAT( webrtc::WaitUntil([&] { return done(); }, IsTrue(), @@ -972,7 +970,7 @@ TEST_F(StunIPv6PortTestWithMockDnsResolver, TestPrepareAddressHostname) { // Same as before but with a field trial that changes the priority. TEST_F(StunIPv6PortTestWithMockDnsResolver, TestPrepareAddressHostnameWithPriorityAdjustment) { - webrtc::test::ScopedKeyValueConfig field_trials( + FieldTrials field_trials = CreateTestFieldTrials( "WebRTC-IncreaseIceCandidatePriorityHostSrflx/Enabled/"); SetDnsResolverExpectations( [](webrtc::MockAsyncDnsResolver* resolver, @@ -1033,3 +1031,4 @@ INSTANTIATE_TEST_SUITE_P(All, ::testing::ValuesIn(kAllIPv6AddressTypeTestConfigs)); } // namespace +} // namespace webrtc diff --git a/third_party/libwebrtc/p2p/base/transport_description_factory_unittest.cc b/third_party/libwebrtc/p2p/base/transport_description_factory_unittest.cc @@ -16,6 +16,7 @@ #include <vector> #include "absl/strings/string_view.h" +#include "api/field_trials.h" #include "api/scoped_refptr.h" #include "p2p/base/ice_credentials_iterator.h" #include "p2p/base/p2p_constants.h" @@ -26,21 +27,22 @@ #include "rtc_base/ssl_certificate.h" #include "rtc_base/ssl_fingerprint.h" #include "rtc_base/ssl_identity.h" +#include "test/create_test_field_trials.h" #include "test/gmock.h" #include "test/gtest.h" -#include "test/scoped_key_value_config.h" + +namespace webrtc { +namespace { using ::testing::Contains; using ::testing::Not; using ::testing::NotNull; -using ::webrtc::TransportDescription; -using ::webrtc::TransportDescriptionFactory; -using ::webrtc::TransportOptions; class TransportDescriptionFactoryTest : public ::testing::Test { public: TransportDescriptionFactoryTest() - : ice_credentials_({}), + : field_trials_(CreateTestFieldTrials()), + ice_credentials_({}), f1_(field_trials_), f2_(field_trials_), cert1_( @@ -178,7 +180,7 @@ class TransportDescriptionFactoryTest : public ::testing::Test { f2_.set_certificate(nullptr); } - webrtc::test::ScopedKeyValueConfig field_trials_; + FieldTrials field_trials_; webrtc::IceCredentialsIterator ice_credentials_; TransportDescriptionFactory f1_; TransportDescriptionFactory f2_; @@ -398,3 +400,6 @@ TEST_F(TransportDescriptionFactoryTest, CreateAnswerToDtlsPassiveOffer) { f2_.CreateAnswer(offer.get(), options, false, nullptr, &ice_credentials_); EXPECT_EQ(answer->connection_role, webrtc::CONNECTIONROLE_ACTIVE); } + +} // namespace +} // namespace webrtc diff --git a/third_party/libwebrtc/p2p/client/basic_port_allocator_unittest.cc b/third_party/libwebrtc/p2p/client/basic_port_allocator_unittest.cc @@ -23,6 +23,7 @@ #include "api/candidate.h" #include "api/environment/environment.h" #include "api/environment/environment_factory.h" +#include "api/field_trials.h" #include "api/test/rtc_error_matchers.h" #include "api/transport/enums.h" #include "api/units/time_delta.h" @@ -56,9 +57,9 @@ #include "rtc_base/thread.h" #include "rtc_base/virtual_socket_server.h" #include "system_wrappers/include/metrics.h" +#include "test/create_test_field_trials.h" #include "test/gmock.h" #include "test/gtest.h" -#include "test/scoped_key_value_config.h" #include "test/wait_until.h" using ::testing::Contains; @@ -2727,8 +2728,8 @@ TEST_F(BasicPortAllocatorTest, TestUseTurnServerAsStunSever) { } TEST_F(BasicPortAllocatorTest, TestDoNotUseTurnServerAsStunSever) { - test::ScopedKeyValueConfig field_trials( - "WebRTC-UseTurnServerAsStunServer/Disabled/"); + FieldTrials field_trials = + CreateTestFieldTrials("WebRTC-UseTurnServerAsStunServer/Disabled/"); ServerAddresses stun_servers; stun_servers.insert(kStunAddr); PortConfiguration port_config(stun_servers, "" /* user_name */, diff --git a/third_party/libwebrtc/test/fuzzers/BUILD.gn b/third_party/libwebrtc/test/fuzzers/BUILD.gn @@ -702,10 +702,10 @@ webrtc_fuzzer_test("frame_buffer_fuzzer") { deps = [ ":fuzz_data_helper", "../../api:array_view", + "../../api:field_trials", "../../api/video:encoded_frame", "../../api/video:frame_buffer", "../../rtc_base:rtc_numerics", - "../../test:scoped_key_value_config", ] } diff --git a/third_party/libwebrtc/test/fuzzers/frame_buffer_fuzzer.cc b/third_party/libwebrtc/test/fuzzers/frame_buffer_fuzzer.cc @@ -14,11 +14,11 @@ #include <utility> #include "api/array_view.h" +#include "api/field_trials.h" #include "api/video/encoded_frame.h" #include "api/video/frame_buffer.h" #include "rtc_base/numerics/sequence_number_unwrapper.h" #include "test/fuzzers/fuzz_data_helper.h" -#include "test/scoped_key_value_config.h" namespace webrtc { namespace { @@ -37,7 +37,7 @@ void FuzzOneInput(const uint8_t* data, size_t size) { return; } - test::ScopedKeyValueConfig field_trials; + FieldTrials field_trials(""); FrameBuffer buffer(/*max_frame_slots=*/100, /*max_decode_history=*/1000, field_trials); test::FuzzDataHelper helper(webrtc::MakeArrayView(data, size));