media: Merge MojoRendererService::Create() variants

Currently we have two versions of MojoRendererService::Create() which
are very similar. This CL merges them to avoid confusion.

Bug: 586211
Change-Id: I82a6d14b7723f7f4280905f4842aa6e69a02c863
Reviewed-on: https://chromium-review.googlesource.com/1056128Reviewed-by: Thomas Guilbert <tguilbert@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558060}

content/browser/media/media_interface_proxy.cc

@@ -168,7 +168,7 @@ void MediaInterfaceProxy::CreateRenderer(
         FlingingRenderer::Create(render_frame_host_, type_specific_id);
 
     media::MojoRendererService::Create(
-        std::move(renderer),
+        nullptr, std::move(renderer),
         media::MojoRendererService::InitiateSurfaceRequestCB(),
         std::move(request));
     return;
@@ -406,8 +406,8 @@ void MediaInterfaceProxy::CreateMediaPlayerRenderer(
       base::BindRepeating(&MediaPlayerRenderer::InitiateScopedSurfaceRequest,
                           base::Unretained(renderer.get()));
 
-  media::MojoRendererService::Create(std::move(renderer), surface_request_cb,
-                                     std::move(request));
+  media::MojoRendererService::Create(nullptr, std::move(renderer),
+                                     surface_request_cb, std::move(request));
 }
 #endif  // defined(OS_ANDROID)
 

media/mojo/services/mojo_renderer_service.cc

@@ -50,16 +50,6 @@ mojo::StrongBindingPtr<mojom::Renderer> MojoRendererService::Create(
   return binding;
 }
 
-// static
-mojo::StrongBindingPtr<mojom::Renderer> MojoRendererService::Create(
-    std::unique_ptr<media::Renderer> renderer,
-    const InitiateSurfaceRequestCB& initiate_surface_request_cb,
-    mojo::InterfaceRequest<mojom::Renderer> request) {
-  return MojoRendererService::Create(nullptr, std::move(renderer),
-                                     initiate_surface_request_cb,
-                                     std::move(request));
-}
-
 MojoRendererService::MojoRendererService(
     MojoCdmServiceContext* mojo_cdm_service_context,
     std::unique_ptr<media::Renderer> renderer,

media/mojo/services/mojo_renderer_service.h

@@ -45,16 +45,6 @@ class MEDIA_MOJO_EXPORT MojoRendererService : public mojom::Renderer,
       const InitiateSurfaceRequestCB& initiate_surface_request_cb,
       mojo::InterfaceRequest<mojom::Renderer> request);
 
-  // Helper function to bind MojoRendererService with a StrongBinding,
-  // which is safely accessible via the returned StrongBindingPtr.
-  // NOTE: Some media::Renderers don't support encrypted content. This function
-  // serves the same purpose as the one above, but without forcing classes to
-  // define the forward declared MojoCdmServiceContext.
-  static mojo::StrongBindingPtr<mojom::Renderer> Create(
-      std::unique_ptr<media::Renderer> renderer,
-      const InitiateSurfaceRequestCB& initiate_surface_request_cb,
-      mojo::InterfaceRequest<mojom::Renderer> request);
-
   // |mojo_cdm_service_context| can be used to find the CDM to support
   // encrypted media. If null, encrypted media is not supported.
   MojoRendererService(MojoCdmServiceContext* mojo_cdm_service_context,