Add MediaPlayerRenderer/MediaPlayerRendererClient

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 7646b83d06e22df692653886c24dd3d8c5ed732f..e31b4d6b59a27c75764079da222fc1f9f9b0d07e 100644
--- a/media/mojo/services/mojo_renderer_service.cc
+++ b/media/mojo/services/mojo_renderer_service.cc
@@ -8,6 +8,7 @@
 
 #include "base/bind.h"
 #include "media/base/media_keys.h"
+#include "media/base/media_url_demuxer.h"
 #include "media/base/renderer.h"
 #include "media/mojo/services/demuxer_stream_provider_shim.h"
 #include "media/mojo/services/mojo_cdm_service_context.h"
@@ -33,20 +34,33 @@ MojoRendererService::MojoRendererService(
   weak_this_ = weak_factory_.GetWeakPtr();
 }
 
-MojoRendererService::~MojoRendererService() {
-}
+MojoRendererService::~MojoRendererService() {}
 
 void MojoRendererService::Initialize(mojom::RendererClientPtr client,
                                      mojom::DemuxerStreamPtr audio,
                                      mojom::DemuxerStreamPtr video,
+                                     const GURL& url,
                                      const InitializeCallback& callback) {
   DVLOG(1) << __FUNCTION__;
   DCHECK_EQ(state_, STATE_UNINITIALIZED);
   client_ = std::move(client);
   state_ = STATE_INITIALIZING;
-  stream_provider_.reset(new DemuxerStreamProviderShim(
-      std::move(audio), std::move(video),
-      base::Bind(&MojoRendererService::OnStreamReady, weak_this_, callback)));
+
+  // TODO(tguilbert): FOR REVIEWERS: Should I instead pass the
+  // DemuxerProviderType via Initialize(), or create a new InitializeFromUrl()?
+  if (url.is_empty()) {

[DaleCurtis, 2016/08/10 21:14:06]

This is fine, but early return if empty instead of else block.

[tguilbert, 2016/08/11 00:29:00]

Done.

+    stream_provider_.reset(new DemuxerStreamProviderShim(
+        std::move(audio), std::move(video),
+        base::Bind(&MojoRendererService::OnStreamReady, weak_this_, callback)));
+  } else {
+    DCHECK(!audio);
+    DCHECK(!video);
+    stream_provider_.reset(new MediaUrlDemuxer(nullptr, url));
+    renderer_->Initialize(
+        stream_provider_.get(), this,
+        base::Bind(&MojoRendererService::OnRendererInitializeDone, weak_this_,
+                   callback));
+  }
 }
 
 void MojoRendererService::Flush(const FlushCallback& callback) {