From ab39b57192c34854d1157b042cdcc8fb4ed9a2c2 Mon Sep 17 00:00:00 2001
From: Michael Froman <mfroman@mozilla.com>
Date: Thu, 13 Jul 2023 19:07:08 +0000
Subject: [PATCH] Bug 1843217 - remove deprecated use of
 webrtc::WebRtcKeyValueConfig in favor of webrtc::FieldTrialsView. r=dbaker

WebRtcKeyValueConfig was just a typdef for FieldTrialsView, so they are
functionally equivalent.

Differential Revision: https://phabricator.services.mozilla.com/D183458
---
 dom/media/webrtc/jsapi/PeerConnectionCtx.cpp | 4 ++--
 media/webrtc/signaling/gtest/MockCall.h      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dom/media/webrtc/jsapi/PeerConnectionCtx.cpp b/dom/media/webrtc/jsapi/PeerConnectionCtx.cpp
index 9a8f27fb59c4..33dc44dff377 100644
--- a/dom/media/webrtc/jsapi/PeerConnectionCtx.cpp
+++ b/dom/media/webrtc/jsapi/PeerConnectionCtx.cpp
@@ -165,7 +165,7 @@ SharedWebrtcState::SharedWebrtcState(
     RefPtr<AbstractThread> aCallWorkerThread,
     webrtc::AudioState::Config&& aAudioStateConfig,
     RefPtr<webrtc::AudioDecoderFactory> aAudioDecoderFactory,
-    UniquePtr<webrtc::WebRtcKeyValueConfig> aTrials)
+    UniquePtr<webrtc::FieldTrialsView> aTrials)
     : mCallWorkerThread(std::move(aCallWorkerThread)),
       mAudioStateConfig(std::move(aAudioStateConfig)),
       mAudioDecoderFactory(std::move(aAudioDecoderFactory)),
@@ -486,7 +486,7 @@ void PeerConnectionCtx::AddPeerConnection(const std::string& aKey,
                            MediaThreadType::WEBRTC_CALL_THREAD)
                        .release());
 
-    UniquePtr<webrtc::WebRtcKeyValueConfig> trials =
+    UniquePtr<webrtc::FieldTrialsView> trials =
         WrapUnique(new NoTrialsConfig());
 
     mSharedWebrtcState = MakeAndAddRef<SharedWebrtcState>(
diff --git a/media/webrtc/signaling/gtest/MockCall.h b/media/webrtc/signaling/gtest/MockCall.h
index dd0a34d341fd..e0e9e92dcb23 100644
--- a/media/webrtc/signaling/gtest/MockCall.h
+++ b/media/webrtc/signaling/gtest/MockCall.h
@@ -306,7 +306,7 @@ class MockCall : public webrtc::Call {
         width, height, *mVideoSendEncoderConfig);
   }
 
-  virtual const webrtc::WebRtcKeyValueConfig& trials() const override {
+  virtual const webrtc::FieldTrialsView& trials() const override {
     return mUnusedConfig;
   }