MediaResource refactoring to support multiple streams

media/remoting/remote_renderer_impl_unittest.cc

Index: media/remoting/remote_renderer_impl_unittest.cc
diff --git a/media/remoting/remote_renderer_impl_unittest.cc b/media/remoting/remote_renderer_impl_unittest.cc
index 66c447680156d673e71290bf3ff2aa91a1e2deae..1c3aac6855b389b34c6d0c7ac2f5b108758bf802 100644
--- a/media/remoting/remote_renderer_impl_unittest.cc
+++ b/media/remoting/remote_renderer_impl_unittest.cc
@@ -10,7 +10,7 @@
 #include "media/base/pipeline_status.h"
 #include "media/base/test_helpers.h"
 #include "media/remoting/fake_remoting_controller.h"
-#include "media/remoting/fake_remoting_demuxer_stream_provider.h"
+#include "media/remoting/fake_remoting_media_resource.h"
 #include "media/remoting/remoting_renderer_controller.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -218,7 +218,7 @@ class RemoteRendererImplTest : public testing::Test {
   void InitializeRenderer() {
     // Register media::RendererClient implementation.
     render_client_.reset(new RendererClientImpl());
-    demuxer_stream_provider_.reset(new FakeRemotingDemuxerStreamProvider());
+    media_resource_.reset(new FakeRemotingMediaResource());
     EXPECT_CALL(*render_client_, OnPipelineStatus(_)).Times(1);
     DCHECK(remote_renderer_impl_);
     // Redirect RPC message for simulate receiver scenario
@@ -227,7 +227,7 @@ class RemoteRendererImplTest : public testing::Test {
                    base::Unretained(this)));
     RunPendingTasks();
     remote_renderer_impl_->Initialize(
-        demuxer_stream_provider_.get(), render_client_.get(),
+        media_resource_.get(), render_client_.get(),
         base::Bind(&RendererClientImpl::OnPipelineStatus,
                    base::Unretained(render_client_.get())));
     RunPendingTasks();
@@ -291,7 +291,7 @@ class RemoteRendererImplTest : public testing::Test {
   base::MessageLoop message_loop_;
   std::unique_ptr<RemotingRendererController> remoting_renderer_controller_;
   std::unique_ptr<RendererClientImpl> render_client_;
-  std::unique_ptr<FakeRemotingDemuxerStreamProvider> demuxer_stream_provider_;
+  std::unique_ptr<FakeRemotingMediaResource> media_resource_;
   std::unique_ptr<RemoteRendererImpl> remote_renderer_impl_;
 
   // RPC handles.