MediaResource refactoring to support multiple streams

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 c391692ae2b3671bf554657a75b0f823dbbe47c1..167985cdf7b7e647390b138e90c5a8362dedcfa6 100644
--- a/media/mojo/services/mojo_renderer_service.cc
+++ b/media/mojo/services/mojo_renderer_service.cc
@@ -14,7 +14,7 @@
 #include "media/base/media_url_demuxer.h"
 #include "media/base/renderer.h"
 #include "media/base/video_renderer_sink.h"
-#include "media/mojo/services/demuxer_stream_provider_shim.h"
+#include "media/mojo/services/media_resource_shim.h"
 #include "media/mojo/services/mojo_cdm_service_context.h"
 
 namespace media {
@@ -88,7 +88,7 @@ void MojoRendererService::Initialize(
   state_ = STATE_INITIALIZING;
 
   if (media_url == base::nullopt) {
-    stream_provider_.reset(new DemuxerStreamProviderShim(
+    media_resource_.reset(new MediaResourceShim(
         std::move(streams),
         base::Bind(&MojoRendererService::OnStreamReady, weak_this_, callback)));
     return;
@@ -96,10 +96,10 @@ void MojoRendererService::Initialize(
 
   DCHECK(!media_url.value().is_empty());
   DCHECK(first_party_for_cookies);
-  stream_provider_.reset(new MediaUrlDemuxer(nullptr, media_url.value(),
-                                             first_party_for_cookies.value()));
+  media_resource_.reset(new MediaUrlDemuxer(nullptr, media_url.value(),
+                                            first_party_for_cookies.value()));
   renderer_->Initialize(
-      stream_provider_.get(), this,
+      media_resource_.get(), this,
       base::Bind(&MojoRendererService::OnRendererInitializeDone, weak_this_,
                  callback));
 }
@@ -204,7 +204,7 @@ void MojoRendererService::OnStreamReady(
   DCHECK_EQ(state_, STATE_INITIALIZING);
 
   renderer_->Initialize(
-      stream_provider_.get(), this,
+      media_resource_.get(), this,
       base::Bind(&MojoRendererService::OnRendererInitializeDone, weak_this_,
                  callback));
 }