MediaResource refactoring to support multiple streams

media/remoting/courier_renderer_unittest.cc

Index: media/remoting/courier_renderer_unittest.cc
diff --git a/media/remoting/courier_renderer_unittest.cc b/media/remoting/courier_renderer_unittest.cc
index 5ac656189b329489af43fb5cb4a6bdb4b40a1d61..027ba749ba05162fd2de3b0cf76e8fa668e78138 100644
--- a/media/remoting/courier_renderer_unittest.cc
+++ b/media/remoting/courier_renderer_unittest.cc
@@ -10,7 +10,7 @@
 #include "media/base/pipeline_status.h"
 #include "media/base/renderer_client.h"
 #include "media/base/test_helpers.h"
-#include "media/remoting/fake_demuxer_stream_provider.h"
+#include "media/remoting/fake_media_resource.h"
 #include "media/remoting/fake_remoter.h"
 #include "media/remoting/renderer_controller.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -211,14 +211,14 @@ class CourierRendererTest : public testing::Test {
   void InitializeRenderer() {
     // Register media::RendererClient implementation.
     render_client_.reset(new RendererClientImpl());
-    demuxer_stream_provider_.reset(new FakeDemuxerStreamProvider());
+    media_resource_.reset(new FakeMediaResource());
     EXPECT_CALL(*render_client_, OnPipelineStatus(_)).Times(1);
     DCHECK(renderer_);
     // Redirect RPC message for simulate receiver scenario
     controller_->GetRpcBroker()->SetMessageCallbackForTesting(base::Bind(
         &CourierRendererTest::RpcMessageResponseBot, base::Unretained(this)));
     RunPendingTasks();
-    renderer_->Initialize(demuxer_stream_provider_.get(), render_client_.get(),
+    renderer_->Initialize(media_resource_.get(), render_client_.get(),
                           base::Bind(&RendererClientImpl::OnPipelineStatus,
                                      base::Unretained(render_client_.get())));
     RunPendingTasks();
@@ -274,7 +274,7 @@ class CourierRendererTest : public testing::Test {
   base::MessageLoop message_loop_;
   std::unique_ptr<RendererController> controller_;
   std::unique_ptr<RendererClientImpl> render_client_;
-  std::unique_ptr<FakeDemuxerStreamProvider> demuxer_stream_provider_;
+  std::unique_ptr<FakeMediaResource> media_resource_;
   std::unique_ptr<CourierRenderer> renderer_;
 
   // RPC handles.