Cleanup CreateRenderer(HostedRendererType)

CreateRenderer(HostedRendererType) was left in after Create*Renderer was
added, in order to prevent breaking the internal ChromeCast build.

This CL cleans up the leftovers and should be submitted after Chromecast
interal code switches to CreateCastRenderer()

Bug: 936528
Change-Id: I29ee8104099485ed32a22aec9ccd6cff5cd63771
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1493082Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Thomas Guilbert <tguilbert@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638692}

content/browser/media/media_interface_proxy.cc

@@ -152,15 +152,6 @@ void MediaInterfaceProxy::CreateVideoDecoder(
     factory->CreateVideoDecoder(std::move(request));
 }
 
-// TODO(https://crbug.com/936528) : remove this method.
-void MediaInterfaceProxy::CreateRenderer(
-    media::mojom::HostedRendererType type,
-    const std::string& audio_device_id,
-    media::mojom::RendererRequest renderer) {
-  DCHECK_EQ(type, media::mojom::HostedRendererType::kDefault);
-  CreateDefaultRenderer(audio_device_id, std::move(renderer));
-}
-
 void MediaInterfaceProxy::CreateDefaultRenderer(
     const std::string& audio_device_id,
     media::mojom::RendererRequest request) {

content/browser/media/media_interface_proxy.h

@@ -49,10 +49,6 @@ class MediaInterfaceProxy : public media::mojom::InterfaceFactory {
   void CreateVideoDecoder(media::mojom::VideoDecoderRequest request) final;
   void CreateDefaultRenderer(const std::string& audio_device_id,
                              media::mojom::RendererRequest request) final;
-  // TODO(https://crbug.com/936528) : remove this method.
-  void CreateRenderer(media::mojom::HostedRendererType type,
-                      const std::string& audio_device_id,
-                      media::mojom::RendererRequest renderer) final;
 #if defined(OS_ANDROID)
   void CreateFlingingRenderer(const std::string& presentation_id,
                               media::mojom::RendererRequest request) final;

content/browser/media/video_decoder_proxy.cc

@@ -45,11 +45,6 @@ void VideoDecoderProxy::CreateDefaultRenderer(
     const std::string& audio_device_id,
     media::mojom::RendererRequest request) {}
 
-// TODO(https://crbug.com/936528): remove this method.
-void VideoDecoderProxy::CreateRenderer(media::mojom::HostedRendererType type,
-                                       const std::string& audio_device_id,
-                                       media::mojom::RendererRequest request) {}
-
 #if defined(OS_ANDROID)
 void VideoDecoderProxy::CreateFlingingRenderer(
     const std::string& audio_device_id,

content/browser/media/video_decoder_proxy.h

@@ -31,10 +31,6 @@ class VideoDecoderProxy : public media::mojom::InterfaceFactory {
   void CreateVideoDecoder(media::mojom::VideoDecoderRequest request) final;
   void CreateDefaultRenderer(const std::string& audio_device_id,
                              media::mojom::RendererRequest request) final;
-  // TODO(https://crbug.com/936528) : remove this method.
-  void CreateRenderer(media::mojom::HostedRendererType type,
-                      const std::string& audio_device_id,
-                      media::mojom::RendererRequest request) final;
 #if defined(OS_ANDROID)
   void CreateMediaPlayerRenderer(media::mojom::RendererRequest request) final;
   void CreateFlingingRenderer(const std::string& presentation_id,

content/renderer/media/media_interface_factory.cc

@@ -51,15 +51,6 @@ void MediaInterfaceFactory::CreateVideoDecoder(
   GetMediaInterfaceFactory()->CreateVideoDecoder(std::move(request));
 }
 
-// TODO(https://crbug.com/936528) : remove this method.
-void MediaInterfaceFactory::CreateRenderer(
-    media::mojom::HostedRendererType type,
-    const std::string& audio_device_id,
-    media::mojom::RendererRequest renderer) {
-  DCHECK_EQ(type, media::mojom::HostedRendererType::kDefault);
-  CreateDefaultRenderer(audio_device_id, std::move(renderer));
-}
-
 void MediaInterfaceFactory::CreateDefaultRenderer(
     const std::string& audio_device_id,
     media::mojom::RendererRequest request) {

content/renderer/media/media_interface_factory.h

@@ -35,10 +35,6 @@ class CONTENT_EXPORT MediaInterfaceFactory
   void CreateVideoDecoder(media::mojom::VideoDecoderRequest request) final;
   void CreateDefaultRenderer(const std::string& audio_device_id,
                              media::mojom::RendererRequest request) final;
-  // TODO(https://crbug.com/936528) : remove this method.
-  void CreateRenderer(media::mojom::HostedRendererType type,
-                      const std::string& audio_device_id,
-                      media::mojom::RendererRequest renderer) final;
 #if defined(OS_ANDROID)
   void CreateFlingingRenderer(const std::string& presentation_id,
                               media::mojom::RendererRequest request) final;

media/mojo/interfaces/interface_factory.mojom

@@ -12,36 +12,12 @@ import "media/mojo/interfaces/renderer.mojom";
 import "media/mojo/interfaces/video_decoder.mojom";
 import "mojo/public/mojom/base/token.mojom";
 
-// DEPRECATED: This will be cleaned up as part of https://crbug.com/936528.
-// It is currently left in to prevent breaking the ChromeCast build, and will
-// be removed before M74 branch.
-// Defines the types of renderers that can be hosted by a mojo Renderer.
-enum HostedRendererType {
-  // media::DefaultRenderer: Used to offload normal rendering scenarios to a
-  // different process, for stability or performance reasons.
-  kDefault,
-
-  // DEPRECATED: Use CreateMediaPlayerRenderer() instead.
-  [EnableIf=is_android]
-  kMediaPlayer,
-
-  // DEPRECATED: Use CreateFlingingRenderer() instead.
-  [EnableIf=is_android]
-  kFlinging,
-};
-
 // A factory for creating media mojo interfaces. Renderers can only access
 // ContentDecryptionModules created with the same factory.
 interface InterfaceFactory {
   CreateAudioDecoder(AudioDecoder& audio_decoder);
   CreateVideoDecoder(VideoDecoder& video_decoder);
 
-  // DEPRECATED: This will be cleaned up as part of https://crbug.com/936528.
-  // It is currently left in to prevent breaking the ChromeCast build, and will
-  // be removed before M74 branch.
-  CreateRenderer(HostedRendererType type, string audio_device_id,
-                 Renderer& renderer);
-
   // Creates a regular media::Renderer (DefaultRendererFactory).
   CreateDefaultRenderer(string audio_device_id, Renderer& renderer);
 

media/mojo/services/interface_factory_impl.cc

@@ -95,15 +95,6 @@ void InterfaceFactoryImpl::CreateVideoDecoder(
 #endif  // BUILDFLAG(ENABLE_MOJO_VIDEO_DECODER)
 }
 
-// TODO(https://crbug.com/936528) : remove this method.
-void InterfaceFactoryImpl::CreateRenderer(
-    mojom::HostedRendererType type,
-    const std::string& audio_device_id,
-    media::mojom::RendererRequest renderer) {
-  DCHECK_EQ(type, mojom::HostedRendererType::kDefault);
-  CreateDefaultRenderer(audio_device_id, std::move(renderer));
-}
-
 void InterfaceFactoryImpl::CreateDefaultRenderer(
     const std::string& audio_device_id,
     mojo::InterfaceRequest<mojom::Renderer> request) {

media/mojo/services/interface_factory_impl.h

@@ -42,10 +42,6 @@ class InterfaceFactoryImpl : public DeferredDestroy<mojom::InterfaceFactory> {
   void CreateVideoDecoder(mojom::VideoDecoderRequest request) final;
   void CreateDefaultRenderer(const std::string& audio_device_id,
                              mojom::RendererRequest request) final;
-  // TODO(https://crbug.com/936528) : remove this method.
-  void CreateRenderer(mojom::HostedRendererType type,
-                      const std::string& audio_device_id,
-                      media::mojom::RendererRequest renderer) final;
 #if defined(OS_ANDROID)
   void CreateMediaPlayerRenderer(mojom::RendererRequest request) final;
   void CreateFlingingRenderer(const std::string& presentation_id,