Remove rtc_video_{encoder,decoder}_factory_util.h from Blink API

Now that their solely client [1] has been Onion soup'ed, it is
possible to bypass (and remove) these helpers in favor of accessing
blink::RtcVideoDecoderFactory's and RtcVideoEncoderFactory's ctors directly.

[1] //third_party/blink/renderer/platform/peerconnection/video_codec_factory.cc

BUG=787254, 919392

Change-Id: Ieb090709080de71fb98d8b2be68afa57ad88fee5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1807714
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697700}

third_party/blink/public/BUILD.gn

@@ -152,8 +152,6 @@ source_set("blink_headers") {
     "platform/modules/peerconnection/audio_codec_factory.h",
     "platform/modules/peerconnection/rtc_event_log_output_sink.h",
     "platform/modules/peerconnection/rtc_event_log_output_sink_proxy_util.h",
-    "platform/modules/peerconnection/rtc_video_decoder_factory_util.h",
-    "platform/modules/peerconnection/rtc_video_encoder_factory_util.h",
     "platform/modules/peerconnection/two_keys_adapter_map.h",
     "platform/modules/peerconnection/video_codec_factory.h",
     "platform/modules/peerconnection/webrtc_audio_sink.h",

third_party/blink/public/platform/modules/peerconnection/rtc_video_decoder_factory_util.h

-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_PEERCONNECTION_RTC_VIDEO_DECODER_FACTORY_UTIL_H_
-#define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_PEERCONNECTION_RTC_VIDEO_DECODER_FACTORY_UTIL_H_
-
-#include <memory>
-
-#include "third_party/blink/public/platform/web_common.h"
-
-namespace media {
-class GpuVideoAcceleratorFactories;
-}
-
-namespace webrtc {
-class VideoDecoderFactory;
-}
-
-namespace blink {
-
-// TODO(crbug.com/787254): Remove this API when its clients are Onion souped.
-BLINK_PLATFORM_EXPORT std::unique_ptr<webrtc::VideoDecoderFactory>
-CreateRTCVideoDecoderFactory(
-    media::GpuVideoAcceleratorFactories* gpu_factories);
-
-}  // namespace blink
-
-#endif  // THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_PEERCONNECTION_RTC_VIDEO_DECODER_FACTORY_UTIL_H_

third_party/blink/public/platform/modules/peerconnection/rtc_video_encoder_factory_util.h

-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_PEERCONNECTION_RTC_VIDEO_ENCODER_FACTORY_UTIL_H_
-#define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_PEERCONNECTION_RTC_VIDEO_ENCODER_FACTORY_UTIL_H_
-
-#include <memory>
-
-#include "third_party/blink/public/platform/web_common.h"
-
-namespace media {
-class GpuVideoAcceleratorFactories;
-}
-
-namespace webrtc {
-class VideoEncoderFactory;
-}
-
-namespace blink {
-
-// TODO(crbug.com/787254): Remove this API when its clients are Onion souped.
-BLINK_PLATFORM_EXPORT std::unique_ptr<webrtc::VideoEncoderFactory>
-CreateRTCVideoEncoderFactory(
-    media::GpuVideoAcceleratorFactories* gpu_factories);
-
-}  // namespace blink
-
-#endif  // THIRD_PARTY_BLINK_PUBLIC_PLATFORM_MODULES_PEERCONNECTION_RTC_VIDEO_ENCODER_FACTORY_UTIL_H_

third_party/blink/renderer/platform/peerconnection/rtc_video_decoder_factory.cc

@@ -10,7 +10,6 @@
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "media/video/gpu_video_accelerator_factories.h"
-#include "third_party/blink/public/platform/modules/peerconnection/rtc_video_decoder_factory_util.h"
 #include "third_party/blink/renderer/platform/peerconnection/rtc_video_decoder_adapter.h"
 
 namespace blink {
@@ -59,11 +58,6 @@ class ScopedVideoDecoder : public webrtc::VideoDecoder {
 
 }  // namespace
 
-std::unique_ptr<webrtc::VideoDecoderFactory> CreateRTCVideoDecoderFactory(
-    media::GpuVideoAcceleratorFactories* gpu_factories) {
-  return std::make_unique<RTCVideoDecoderFactory>(gpu_factories);
-}
-
 RTCVideoDecoderFactory::RTCVideoDecoderFactory(
     media::GpuVideoAcceleratorFactories* gpu_factories)
     : gpu_factories_(gpu_factories) {

third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc

@@ -11,7 +11,6 @@
 #include "media/media_buildflags.h"
 #include "media/video/gpu_video_accelerator_factories.h"
 #include "third_party/blink/public/common/features.h"
-#include "third_party/blink/public/platform/modules/peerconnection/rtc_video_encoder_factory_util.h"
 #include "third_party/blink/renderer/platform/peerconnection/rtc_video_encoder.h"
 #include "third_party/webrtc/api/video_codecs/sdp_video_format.h"
 #include "third_party/webrtc/api/video_codecs/video_encoder.h"
@@ -104,11 +103,6 @@ bool IsSameFormat(const webrtc::SdpVideoFormat& format1,
 
 }  // anonymous namespace
 
-std::unique_ptr<webrtc::VideoEncoderFactory> CreateRTCVideoEncoderFactory(
-    media::GpuVideoAcceleratorFactories* gpu_factories) {
-  return std::make_unique<RTCVideoEncoderFactory>(gpu_factories);
-}
-
 RTCVideoEncoderFactory::RTCVideoEncoderFactory(
     media::GpuVideoAcceleratorFactories* gpu_factories)
     : gpu_factories_(gpu_factories) {

third_party/blink/renderer/platform/peerconnection/video_codec_factory.cc

@@ -7,9 +7,9 @@
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "media/video/gpu_video_accelerator_factories.h"
-#include "third_party/blink/public/platform/modules/peerconnection/rtc_video_decoder_factory_util.h"
-#include "third_party/blink/public/platform/modules/peerconnection/rtc_video_encoder_factory_util.h"
 #include "third_party/blink/public/platform/platform.h"
+#include "third_party/blink/renderer/platform/peerconnection/rtc_video_decoder_factory.h"
+#include "third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.h"
 #include "third_party/webrtc/api/video_codecs/video_decoder_software_fallback_wrapper.h"
 #include "third_party/webrtc/api/video_codecs/video_encoder_software_fallback_wrapper.h"
 #include "third_party/webrtc/media/base/codec.h"
@@ -178,7 +178,7 @@ std::unique_ptr<webrtc::VideoEncoderFactory> CreateWebrtcVideoEncoderFactory(
 
   if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() &&
       Platform::Current()->IsWebRtcHWEncodingEnabled()) {
-    encoder_factory = blink::CreateRTCVideoEncoderFactory(gpu_factories);
+    encoder_factory = std::make_unique<RTCVideoEncoderFactory>(gpu_factories);
   }
 
 #if defined(OS_ANDROID)
@@ -195,7 +195,7 @@ std::unique_ptr<webrtc::VideoDecoderFactory> CreateWebrtcVideoDecoderFactory(
 
   if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() &&
       Platform::Current()->IsWebRtcHWDecodingEnabled()) {
-    decoder_factory = blink::CreateRTCVideoDecoderFactory(gpu_factories);
+    decoder_factory = std::make_unique<RTCVideoDecoderFactory>(gpu_factories);
   }
 
   return std::make_unique<DecoderAdapter>(std::move(decoder_factory));