MediaResource refactoring to support multiple streams

media/remoting/fake_remoting_media_resource.h

Index: media/remoting/fake_remoting_media_resource.h
diff --git a/media/remoting/fake_remoting_demuxer_stream_provider.h b/media/remoting/fake_remoting_media_resource.h
similarity index 73%
rename from media/remoting/fake_remoting_demuxer_stream_provider.h
rename to media/remoting/fake_remoting_media_resource.h
index 2ae13975fd39b33f70838aaa0f493e1f46afcef6..1a67f5fd26bb1acc94a01d16fe05ebdfd9f59f7e 100644
--- a/media/remoting/fake_remoting_demuxer_stream_provider.h
+++ b/media/remoting/fake_remoting_media_resource.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_REMOTING_FAKE_REMOTING_DEMUXER_STREAM_PROVIDER_H_
-#define MEDIA_REMOTING_FAKE_REMOTING_DEMUXER_STREAM_PROVIDER_H_
+#ifndef MEDIA_REMOTING_FAKE_REMOTING_MEDIA_RESOURCE_H_
+#define MEDIA_REMOTING_FAKE_REMOTING_MEDIA_RESOURCE_H_
 
 #include <deque>
 
 #include "media/base/audio_decoder_config.h"
 #include "media/base/demuxer_stream.h"
-#include "media/base/demuxer_stream_provider.h"
+#include "media/base/media_resource.h"
 #include "media/base/video_decoder_config.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
@@ -48,20 +48,20 @@ class DummyDemuxerStream : public DemuxerStream {
 };
 
 // Audio only demuxer stream provider
-class FakeRemotingDemuxerStreamProvider : public DemuxerStreamProvider {
+class FakeRemotingMediaResource : public MediaResource {
  public:
-  FakeRemotingDemuxerStreamProvider();
-  ~FakeRemotingDemuxerStreamProvider() final;
+  FakeRemotingMediaResource();
+  ~FakeRemotingMediaResource() final;
 
-  // DemuxerStreamProvider implementation.
-  DemuxerStream* GetStream(DemuxerStream::Type type) override;
+  // MediaResource implementation.
+  std::vector<DemuxerStream*> GetStreams() override;
 
  private:
   std::unique_ptr<DummyDemuxerStream> demuxer_stream_;
 
-  DISALLOW_COPY_AND_ASSIGN(FakeRemotingDemuxerStreamProvider);
+  DISALLOW_COPY_AND_ASSIGN(FakeRemotingMediaResource);
 };
 
 }  // namespace media
 
-#endif  // MEDIA_REMOTING_FAKE_REMOTING_DEMUXER_STREAM_PROVIDER_H_
+#endif  // MEDIA_REMOTING_FAKE_REMOTING_MEDIA_RESOURCE_H_