MediaResource refactoring to support multiple streams

media/base/fake_demuxer_stream.h

Index: media/base/fake_demuxer_stream.h
diff --git a/media/base/fake_demuxer_stream.h b/media/base/fake_demuxer_stream.h
index d090fe6ac50479bb405682a63e76051e91789f77..58b7531b2849532e810d1925b03fd7777f4db08c 100644
--- a/media/base/fake_demuxer_stream.h
+++ b/media/base/fake_demuxer_stream.h
@@ -9,7 +9,7 @@
 #include "base/memory/ref_counted.h"
 #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"
 
 namespace base {
@@ -103,21 +103,21 @@ class FakeDemuxerStream : public DemuxerStream {
   DISALLOW_COPY_AND_ASSIGN(FakeDemuxerStream);
 };
 
-class FakeDemuxerStreamProvider : public DemuxerStreamProvider {
+class FakeMediaResource : public MediaResource {
  public:
   // Note: FakeDemuxerStream currently only supports a fake video DemuxerStream.
-  FakeDemuxerStreamProvider(int num_video_configs,
-                            int num_video_buffers_in_one_config,
-                            bool is_video_encrypted);
-  ~FakeDemuxerStreamProvider() override;
+  FakeMediaResource(int num_video_configs,
+                    int num_video_buffers_in_one_config,
+                    bool is_video_encrypted);
+  ~FakeMediaResource() override;
 
-  // DemuxerStreamProvider implementation.
-  DemuxerStream* GetStream(DemuxerStream::Type type) override;
+  // MediaResource implementation.
+  std::vector<DemuxerStream*> GetStreams() override;
 
  private:
   FakeDemuxerStream fake_video_stream_;
 
-  DISALLOW_COPY_AND_ASSIGN(FakeDemuxerStreamProvider);
+  DISALLOW_COPY_AND_ASSIGN(FakeMediaResource);
 };
 
 }  // namespace media