From 46e2d103b4edc76b65a8e71a5de372c213cfb5c3 Mon Sep 17 00:00:00 2001 From: philipel Date: Wed, 23 Nov 2022 10:36:27 +0100 Subject: [PATCH] Use ScopedFieldTrials instead of InitFieldTrialsFromString in InternalDecoderFactoryTest. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:14698 Change-Id: I47ec906b258cd2b613c863cad6a0318d71a1fa32 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/284840 Reviewed-by: Erik Språng Commit-Queue: Philip Eliasson Cr-Commit-Position: refs/heads/main@{#38717} --- media/engine/internal_decoder_factory_unittest.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media/engine/internal_decoder_factory_unittest.cc b/media/engine/internal_decoder_factory_unittest.cc index d37c1a8247..53811b4879 100644 --- a/media/engine/internal_decoder_factory_unittest.cc +++ b/media/engine/internal_decoder_factory_unittest.cc @@ -16,6 +16,7 @@ #include "api/video_codecs/vp9_profile.h" #include "media/base/media_constants.h" #include "system_wrappers/include/field_trial.h" +#include "test/field_trial.h" #include "test/gmock.h" #include "test/gtest.h" @@ -122,7 +123,7 @@ TEST(InternalDecoderFactoryTest, Av1Profile1_Dav1dDecoderTrialEnabled) { } TEST(InternalDecoderFactoryTest, Av1Profile1_Dav1dDecoderTrialDisabled) { - InitFieldTrialsFromString(kDav1dDecoderFieldTrialDisabled); + test::ScopedFieldTrials disable_dav1d(kDav1dDecoderFieldTrialDisabled); InternalDecoderFactory factory; std::unique_ptr decoder = factory.CreateVideoDecoder( SdpVideoFormat(cricket::kAv1CodecName,