Replace uses of blink::Platform::GetWebRtcWorkerThread

.. by calling PeerConnectionDependencyFactory::GetWebRtcWorkerThread
directly.

This is now possible, after [1], where
peer_connection_dependency_factory.cc|h is moved to Blink.

[1] https://crrev.com/c/1805159

Note that to match the actual return type (base::SingleThreadTaskRunner)
the PCDF method is renamed to GetWebRtcWorkerTaskRunner().

BUG=787254
R=guidou@chromium.org, haraken@chromium.org

Change-Id: I56d4dd2720150cd86a85d98c8cfae1dfd9c711ee
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1806846
Commit-Queue: Henrik Boström <hbos@chromium.org>
Reviewed-by: Henrik Boström <hbos@chromium.org>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714415}

content/renderer/renderer_blink_platform_impl.cc

@@ -527,16 +527,6 @@ bool RendererBlinkPlatformImpl::RTCSmoothnessAlgorithmEnabled() {
 
 //------------------------------------------------------------------------------
 
-scoped_refptr<base::SingleThreadTaskRunner>
-RendererBlinkPlatformImpl::GetWebRtcWorkerThread() {
-  auto* rtc_dependency_factory =
-      blink::PeerConnectionDependencyFactory::GetInstance();
-  rtc_dependency_factory->EnsureInitialized();
-  return rtc_dependency_factory->GetWebRtcWorkerThread();
-}
-
-//------------------------------------------------------------------------------
-
 base::Optional<double>
 RendererBlinkPlatformImpl::GetWebRtcMaxCaptureFrameRate() {
   const std::string max_fps_str =

content/renderer/renderer_blink_platform_impl.h

@@ -126,7 +126,6 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
       const media::AudioSourceParameters& params) override;
   viz::ContextProvider* SharedMainThreadContextProvider() override;
   bool RTCSmoothnessAlgorithmEnabled() override;
-  scoped_refptr<base::SingleThreadTaskRunner> GetWebRtcWorkerThread() override;
   base::Optional<double> GetWebRtcMaxCaptureFrameRate() override;
   scoped_refptr<media::AudioRendererSink> NewAudioRendererSink(
       blink::WebAudioDeviceSourceType source_type,

third_party/blink/public/platform/platform.h

@@ -550,13 +550,6 @@ class BLINK_PLATFORM_EXPORT Platform {
 
   // WebRTC ----------------------------------------------------------
 
-  // Returns the SingleThreadTaskRunner suitable for running WebRTC networking.
-  // An rtc::Thread will have already been created.
-  // May return null if WebRTC functionality is not implemented.
-  virtual scoped_refptr<base::SingleThreadTaskRunner> GetWebRtcWorkerThread() {
-    return nullptr;
-  }
-
   // Checks if the default minimum starting volume value for the AGC is
   // overridden on the command line.
   virtual base::Optional<double> GetWebRtcMaxCaptureFrameRate() {

third_party/blink/public/web/modules/peerconnection/peer_connection_dependency_factory.h

@@ -117,7 +117,10 @@ class BLINK_MODULES_EXPORT PeerConnectionDependencyFactory
   blink::WebRtcAudioDeviceImpl* GetWebRtcAudioDevice();
 
   void EnsureInitialized();
-  scoped_refptr<base::SingleThreadTaskRunner> GetWebRtcWorkerThread() const;
+
+  // Returns the SingleThreadTaskRunner suitable for running WebRTC networking.
+  // An rtc::Thread will have already been created.
+  scoped_refptr<base::SingleThreadTaskRunner> GetWebRtcWorkerTaskRunner();
 
   // Returns the rtc::Thread instance associated with the WebRTC worker thread.
   // TODO(bugs.webrtc.org/9419): Remove once WebRTC can be built as a component.

third_party/blink/renderer/modules/peerconnection/media_stream_video_webrtc_sink.cc

@@ -267,7 +267,8 @@ MediaStreamVideoWebRtcSink::MediaStreamVideoWebRtcSink(
   video_track_->set_enabled(track.IsEnabled());
 
   source_adapter_ = base::MakeRefCounted<WebRtcVideoSourceAdapter>(
-      factory->GetWebRtcWorkerThread(), video_source_.get(), refresh_interval,
+      factory->GetWebRtcWorkerTaskRunner(), video_source_.get(),
+      refresh_interval,
       base::Bind(&MediaStreamVideoWebRtcSink::RequestRefreshFrame,
                  weak_factory_.GetWeakPtr()),
       std::move(task_runner));

third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc

@@ -602,7 +602,7 @@ void PeerConnectionDependencyFactory::EnsureInitialized() {
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
-PeerConnectionDependencyFactory::GetWebRtcWorkerThread() const {
+PeerConnectionDependencyFactory::GetWebRtcWorkerTaskRunner() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   return chrome_worker_thread_.IsRunning() ? chrome_worker_thread_.task_runner()
                                            : nullptr;

third_party/blink/renderer/modules/peerconnection/rtc_certificate_generator.cc

@@ -94,7 +94,7 @@ void GenerateCertificateWithOptionalExpiration(
 
   scoped_refptr<RTCCertificateGeneratorRequest> request =
       base::MakeRefCounted<RTCCertificateGeneratorRequest>(
-          task_runner, pc_dependency_factory->GetWebRtcWorkerThread());
+          task_runner, pc_dependency_factory->GetWebRtcWorkerTaskRunner());
   request->GenerateCertificateAsync(key_params, expires_ms,
                                     std::move(completion_callback));
 }

third_party/blink/renderer/modules/peerconnection/rtc_dtls_transport.cc

@@ -7,7 +7,7 @@
 #include <memory>
 
 #include "third_party/blink/public/common/features.h"
-#include "third_party/blink/public/platform/platform.h"
+#include "third_party/blink/public/web/modules/peerconnection/peer_connection_dependency_factory.h"
 #include "third_party/blink/public/web/web_local_frame.h"
 #include "third_party/blink/renderer/core/dom/document.h"
 #include "third_party/blink/renderer/core/dom/events/event.h"
@@ -57,7 +57,9 @@ std::unique_ptr<DtlsTransportProxy> CreateProxy(
   scoped_refptr<base::SingleThreadTaskRunner> proxy_thread =
       frame->GetTaskRunner(TaskType::kNetworking);
   scoped_refptr<base::SingleThreadTaskRunner> host_thread =
-      Platform::Current()->GetWebRtcWorkerThread();
+      PeerConnectionDependencyFactory::GetInstance()
+          ->GetWebRtcWorkerTaskRunner();
+
   return DtlsTransportProxy::Create(*frame, proxy_thread, host_thread,
                                     native_transport, delegate);
 }

third_party/blink/renderer/modules/peerconnection/rtc_ice_transport.cc

@@ -122,8 +122,11 @@ RTCIceTransport* RTCIceTransport::Create(ExecutionContext* context) {
   LocalFrame* frame = To<Document>(context)->GetFrame();
   scoped_refptr<base::SingleThreadTaskRunner> proxy_thread =
       frame->GetTaskRunner(TaskType::kNetworking);
+
+  PeerConnectionDependencyFactory::GetInstance()->EnsureInitialized();
   scoped_refptr<base::SingleThreadTaskRunner> host_thread =
-      Platform::Current()->GetWebRtcWorkerThread();
+      PeerConnectionDependencyFactory::GetInstance()
+          ->GetWebRtcWorkerTaskRunner();
   return MakeGarbageCollected<RTCIceTransport>(
       context, std::move(proxy_thread), std::move(host_thread),
       std::make_unique<DefaultIceTransportAdapterCrossThreadFactory>());
@@ -136,8 +139,11 @@ RTCIceTransport* RTCIceTransport::Create(
   LocalFrame* frame = To<Document>(context)->GetFrame();
   scoped_refptr<base::SingleThreadTaskRunner> proxy_thread =
       frame->GetTaskRunner(TaskType::kNetworking);
+
+  PeerConnectionDependencyFactory::GetInstance()->EnsureInitialized();
   scoped_refptr<base::SingleThreadTaskRunner> host_thread =
-      Platform::Current()->GetWebRtcWorkerThread();
+      PeerConnectionDependencyFactory::GetInstance()
+          ->GetWebRtcWorkerTaskRunner();
   return MakeGarbageCollected<RTCIceTransport>(
       context, std::move(proxy_thread), std::move(host_thread),
       std::make_unique<DtlsIceTransportAdapterCrossThreadFactory>(

third_party/blink/renderer/modules/peerconnection/rtc_quic_transport.cc

@@ -7,6 +7,7 @@
 #include "net/quic/platform/impl/quic_chromium_clock.h"
 #include "net/quic/quic_chromium_alarm_factory.h"
 #include "third_party/blink/public/platform/platform.h"
+#include "third_party/blink/public/web/modules/peerconnection/peer_connection_dependency_factory.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
 #include "third_party/blink/renderer/core/dom/document.h"
 #include "third_party/blink/renderer/core/dom/dom_high_res_time_stamp.h"
@@ -90,7 +91,8 @@ RTCQuicTransport* RTCQuicTransport::Create(
     ExceptionState& exception_state) {
   return Create(context, transport, certificates, exception_state,
                 std::make_unique<DefaultP2PQuicTransportFactory>(
-                    Platform::Current()->GetWebRtcWorkerThread()));
+                    PeerConnectionDependencyFactory::GetInstance()
+                        ->GetWebRtcWorkerTaskRunner()));
 }
 
 RTCQuicTransport* RTCQuicTransport::Create(

third_party/blink/renderer/modules/peerconnection/rtc_sctp_transport.cc

@@ -7,7 +7,7 @@
 #include <limits>
 #include <memory>
 
-#include "third_party/blink/public/platform/platform.h"
+#include "third_party/blink/public/web/modules/peerconnection/peer_connection_dependency_factory.h"
 #include "third_party/blink/public/web/web_local_frame.h"
 #include "third_party/blink/renderer/core/dom/document.h"
 #include "third_party/blink/renderer/core/dom/events/event.h"
@@ -70,7 +70,8 @@ RTCSctpTransport::RTCSctpTransport(
                        native_transport,
                        To<Document>(context)->GetFrame()->GetTaskRunner(
                            TaskType::kNetworking),
-                       Platform::Current()->GetWebRtcWorkerThread()) {}
+                       PeerConnectionDependencyFactory::GetInstance()
+                           ->GetWebRtcWorkerTaskRunner()) {}
 
 RTCSctpTransport::RTCSctpTransport(
     ExecutionContext* context,