Remove ContentRendererClient::CreateMediaStreamRendererFactory().

Bug: 704136
Change-Id: I243aaaad02bf864251b036079ff85bce0a38b452
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1911740
Commit-Queue: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Peter Beverloo <peter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#717636}

content/public/renderer/content_renderer_client.cc

@@ -7,7 +7,6 @@
 #include "media/base/renderer_factory.h"
 #include "third_party/blink/public/platform/web_audio_device.h"
 #include "third_party/blink/public/platform/web_rtc_peer_connection_handler.h"
-#include "third_party/blink/public/web/modules/mediastream/web_media_stream_renderer_factory.h"
 #include "ui/gfx/icc_profile.h"
 #include "url/gurl.h"
 
@@ -164,11 +163,6 @@ bool ContentRendererClient::IsSupportedBitstreamAudioCodec(
   return false;
 }
 
-std::unique_ptr<blink::WebMediaStreamRendererFactory>
-ContentRendererClient::CreateMediaStreamRendererFactory() {
-  return nullptr;
-}
-
 bool ContentRendererClient::ShouldReportDetailedMessageForSource(
     const base::string16& source) {
   return false;

content/public/renderer/content_renderer_client.h

@@ -46,7 +46,6 @@ class WebLocalFrame;
 class WebPlugin;
 class WebPrescientNetworking;
 class WebServiceWorkerContextProxy;
-class WebMediaStreamRendererFactory;
 class WebThemeEngine;
 class WebURL;
 class WebURLRequest;
@@ -255,10 +254,6 @@ class CONTENT_EXPORT ContentRendererClient {
   // language.
   virtual bool IsOriginIsolatedPepperPlugin(const base::FilePath& plugin_path);
 
-  // Allows an embedder to provide a blink::WebMediaStreamRendererFactory.
-  virtual std::unique_ptr<blink::WebMediaStreamRendererFactory>
-  CreateMediaStreamRendererFactory();
-
   // Allows embedder to register the key system(s) it supports by populating
   // |key_systems|.
   virtual void AddSupportedKeySystems(

content/renderer/media/media_factory.cc

@@ -572,7 +572,7 @@ blink::WebMediaPlayer* MediaFactory::CreateWebMediaPlayerForMediaStream(
 
   return new blink::WebMediaPlayerMS(
       frame, client, GetWebMediaPlayerDelegate(), std::move(media_log),
-      CreateMediaStreamRendererFactory(),
+      blink::CreateWebMediaStreamRendererFactory(),
       render_frame_->GetTaskRunner(blink::TaskType::kInternalMedia),
       render_thread->GetIOTaskRunner(), video_frame_compositor_task_runner,
       render_thread->GetMediaThreadTaskRunner(),
@@ -592,15 +592,6 @@ MediaFactory::GetWebMediaPlayerDelegate() {
   return media_player_delegate_;
 }
 
-std::unique_ptr<blink::WebMediaStreamRendererFactory>
-MediaFactory::CreateMediaStreamRendererFactory() {
-  std::unique_ptr<blink::WebMediaStreamRendererFactory> factory =
-      GetContentClient()->renderer()->CreateMediaStreamRendererFactory();
-  if (factory.get())
-    return factory;
-  return blink::CreateWebMediaStreamRendererFactory();
-}
-
 media::DecoderFactory* MediaFactory::GetDecoderFactory() {
   if (!decoder_factory_) {
     std::unique_ptr<media::DecoderFactory> external_decoder_factory;

content/renderer/media/media_factory.h

@@ -36,7 +36,6 @@ class WebLocalFrame;
 class WebMediaPlayer;
 class WebMediaPlayerClient;
 class WebMediaPlayerEncryptedMediaClient;
-class WebMediaStreamRendererFactory;
 }
 
 namespace cc {
@@ -140,11 +139,6 @@ class MediaFactory {
   // |media_player_delegate_| is NULL, one is created.
   media::RendererWebMediaPlayerDelegate* GetWebMediaPlayerDelegate();
 
-  // Creates a blink::WebMediaStreamRendererFactory used for creating audio and
-  // video renderers for blink::WebMediaPlayerMS.
-  std::unique_ptr<blink::WebMediaStreamRendererFactory>
-  CreateMediaStreamRendererFactory();
-
   media::DecoderFactory* GetDecoderFactory();
 
 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)

content/shell/renderer/web_test/web_test_content_renderer_client.cc

@@ -47,8 +47,6 @@ using blink::WebFrame;
 using blink::WebLocalFrame;
 using blink::WebPlugin;
 using blink::WebPluginParams;
-using blink::WebRTCPeerConnectionHandler;
-using blink::WebRTCPeerConnectionHandlerClient;
 using blink::WebThemeEngine;
 
 namespace content {
@@ -77,11 +75,6 @@ void WebTestContentRendererClient::RenderViewCreated(RenderView* render_view) {
   test_runner->Reset(false /* for_new_test */);
 }
 
-std::unique_ptr<blink::WebMediaStreamRendererFactory>
-WebTestContentRendererClient::CreateMediaStreamRendererFactory() {
-  return blink::CreateWebMediaStreamRendererFactory();
-}
-
 std::unique_ptr<content::WebSocketHandshakeThrottleProvider>
 WebTestContentRendererClient::CreateWebSocketHandshakeThrottleProvider() {
   return std::make_unique<TestWebSocketHandshakeThrottleProvider>();

content/shell/renderer/web_test/web_test_content_renderer_client.h

@@ -22,8 +22,6 @@ class WebTestContentRendererClient : public ShellContentRendererClient {
   void RenderThreadStarted() override;
   void RenderFrameCreated(RenderFrame* render_frame) override;
   void RenderViewCreated(RenderView* render_view) override;
-  std::unique_ptr<blink::WebMediaStreamRendererFactory>
-  CreateMediaStreamRendererFactory() override;
   std::unique_ptr<content::WebSocketHandshakeThrottleProvider>
   CreateWebSocketHandshakeThrottleProvider() override;
   void DidInitializeWorkerContextOnWorkerThread(