Delete deprecated variant of the VideoDecoderSoftwareFallbackWrapper without Environment

Bug: webrtc:15791
Change-Id: I8efa1eb7a8393f322f5adaa7c62d8f6bb7d090a0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/340061
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41779}

api/video_codecs/video_decoder_software_fallback_wrapper.cc

diff --git a/api/video_codecs/video_decoder_software_fallback_wrapper.cc b/api/video_codecs/video_decoder_software_fallback_wrapper.cc
index 623888b..7f01ea5 100644
--- a/api/video_codecs/video_decoder_software_fallback_wrapper.cc
+++ b/api/video_codecs/video_decoder_software_fallback_wrapper.cc
@@ -23,7 +23,6 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/trace_event.h"
-#include "system_wrappers/include/field_trial.h"
 #include "system_wrappers/include/metrics.h"
 
 namespace webrtc {
@@ -35,9 +34,9 @@
 class VideoDecoderSoftwareFallbackWrapper final : public VideoDecoder {
  public:
   VideoDecoderSoftwareFallbackWrapper(
+      const Environment& env,
       std::unique_ptr<VideoDecoder> sw_fallback_decoder,
-      std::unique_ptr<VideoDecoder> hw_decoder,
-      bool force_sw_decoder_fallback);
+      std::unique_ptr<VideoDecoder> hw_decoder);
   ~VideoDecoderSoftwareFallbackWrapper() override;
 
   bool Configure(const Settings& settings) override;
@@ -79,12 +78,13 @@
 };
 
 VideoDecoderSoftwareFallbackWrapper::VideoDecoderSoftwareFallbackWrapper(
+    const Environment& env,
     std::unique_ptr<VideoDecoder> sw_fallback_decoder,
-    std::unique_ptr<VideoDecoder> hw_decoder,
-    bool force_sw_decoder_fallback)
+    std::unique_ptr<VideoDecoder> hw_decoder)
     : decoder_type_(DecoderType::kNone),
       hw_decoder_(std::move(hw_decoder)),
-      force_sw_decoder_fallback_(force_sw_decoder_fallback),
+      force_sw_decoder_fallback_(
+          env.field_trials().IsEnabled("WebRTC-Video-ForcedSwDecoderFallback")),
       fallback_decoder_(std::move(sw_fallback_decoder)),
       fallback_implementation_name_(
           fallback_decoder_->GetDecoderInfo().implementation_name +
@@ -285,16 +285,7 @@
     std::unique_ptr<VideoDecoder> sw_fallback_decoder,
     std::unique_ptr<VideoDecoder> hw_decoder) {
   return std::make_unique<VideoDecoderSoftwareFallbackWrapper>(
-      std::move(sw_fallback_decoder), std::move(hw_decoder),
-      env.field_trials().IsEnabled("WebRTC-Video-ForcedSwDecoderFallback"));
-}
-
-std::unique_ptr<VideoDecoder> CreateVideoDecoderSoftwareFallbackWrapper(
-    std::unique_ptr<VideoDecoder> sw_fallback_decoder,
-    std::unique_ptr<VideoDecoder> hw_decoder) {
-  return std::make_unique<VideoDecoderSoftwareFallbackWrapper>(
-      std::move(sw_fallback_decoder), std::move(hw_decoder),
-      webrtc::field_trial::IsEnabled("WebRTC-Video-ForcedSwDecoderFallback"));
+      env, std::move(sw_fallback_decoder), std::move(hw_decoder));
 }
 
 }  // namespace webrtc

api/video_codecs/video_decoder_software_fallback_wrapper.h

diff --git a/api/video_codecs/video_decoder_software_fallback_wrapper.h b/api/video_codecs/video_decoder_software_fallback_wrapper.h
index 4fbc9a0..fa42517 100644
--- a/api/video_codecs/video_decoder_software_fallback_wrapper.h
+++ b/api/video_codecs/video_decoder_software_fallback_wrapper.h
@@ -28,12 +28,6 @@
     std::unique_ptr<VideoDecoder> sw_fallback_decoder,
     std::unique_ptr<VideoDecoder> hw_decoder);
 
-// TODO: bugs.webrtc.org/15791 - Deprecated, remove when not used by chromium.
-RTC_EXPORT std::unique_ptr<VideoDecoder>
-CreateVideoDecoderSoftwareFallbackWrapper(
-    std::unique_ptr<VideoDecoder> sw_fallback_decoder,
-    std::unique_ptr<VideoDecoder> hw_decoder);
-
 }  // namespace webrtc
 
 #endif  // API_VIDEO_CODECS_VIDEO_DECODER_SOFTWARE_FALLBACK_WRAPPER_H_