Integrate Surface requests with MediaPlayerRenderer

media/mojo/services/mojo_renderer_service.cc

Index: media/mojo/services/mojo_renderer_service.cc
diff --git a/media/mojo/services/mojo_renderer_service.cc b/media/mojo/services/mojo_renderer_service.cc
index deec2d1d543e3663bd45ac08e04f55eda27e9c76..1da7c6cb4dfce653522bdc1ccb184b9ef15750a1 100644
--- a/media/mojo/services/mojo_renderer_service.cc
+++ b/media/mojo/services/mojo_renderer_service.cc
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "base/bind.h"
+#include "base/optional.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/media_keys.h"
 #include "media/base/media_url_demuxer.h"
@@ -24,13 +25,15 @@ MojoRendererService::MojoRendererService(
     base::WeakPtr<MojoCdmServiceContext> mojo_cdm_service_context,
     scoped_refptr<AudioRendererSink> audio_sink,
     std::unique_ptr<VideoRendererSink> video_sink,
-    std::unique_ptr<media::Renderer> renderer)
+    std::unique_ptr<media::Renderer> renderer,
+    InitiateSurfaceRequestCB initiate_surface_request_cb)
     : mojo_cdm_service_context_(mojo_cdm_service_context),
       state_(STATE_UNINITIALIZED),
       playback_rate_(0),
       audio_sink_(std::move(audio_sink)),
       video_sink_(std::move(video_sink)),
       renderer_(std::move(renderer)),
+      initiate_surface_request_cb_(initiate_surface_request_cb),
       weak_factory_(this) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(renderer_);
@@ -238,4 +241,14 @@ void MojoRendererService::OnCdmAttached(
   callback.Run(success);
 }
 
+void MojoRendererService::InitiateScopedSurfaceRequest(
+    const InitiateScopedSurfaceRequestCallback& callback) {
+  if (initiate_surface_request_cb_.is_null()) {
+    // |renderer_| is likely not of type MediaPlayerRenderer.

[dcheng, 2016/10/04 06:28:39]

Given the previous comments, does hitting this mean the renderer is misbheaving
and should be killed?

[tguilbert, 2016/10/05 01:30:11]

The MojoRendererService can be used in the browser, the GPU and the utility
process. I changed this to close the connection (by calling "delete this")
because mojo::ReportBadMessage does not work in all of those cases.

Is there a better alternative? I also updated the function to no longer use a
base::Optional<>

+    callback.Run(base::nullopt);
+    return;
+  }
+
+  callback.Run(initiate_surface_request_cb_.Run());
+}
 }  // namespace media