aboutsummaryrefslogtreecommitdiff
path: root/media
diff options
context:
space:
mode:
authorphilipel <philipel@webrtc.org>2022-11-23 10:36:27 +0100
committerWebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-11-23 10:08:20 +0000
commit46e2d103b4edc76b65a8e71a5de372c213cfb5c3 (patch)
treef2329603bc171f5846e2d352ee216be6b6f2e6bd /media
parent6a8776a1084edfd33a139e7788d4465f8ea8a9d2 (diff)
downloadwebrtc-46e2d103b4edc76b65a8e71a5de372c213cfb5c3.tar.gz
Use ScopedFieldTrials instead of InitFieldTrialsFromString in InternalDecoderFactoryTest.
Bug: webrtc:14698 Change-Id: I47ec906b258cd2b613c863cad6a0318d71a1fa32 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/284840 Reviewed-by: Erik Språng <sprang@webrtc.org> Commit-Queue: Philip Eliasson <philipel@webrtc.org> Cr-Commit-Position: refs/heads/main@{#38717}
Diffstat (limited to 'media')
-rw-r--r--media/engine/internal_decoder_factory_unittest.cc3
1 files changed, 2 insertions, 1 deletions
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<VideoDecoder> decoder = factory.CreateVideoDecoder(
SdpVideoFormat(cricket::kAv1CodecName,