MediaResource refactoring to support multiple streams

media/remoting/fake_media_resource.h

Index: media/remoting/fake_media_resource.h
diff --git a/media/remoting/fake_demuxer_stream_provider.h b/media/remoting/fake_media_resource.h
similarity index 75%
rename from media/remoting/fake_demuxer_stream_provider.h
rename to media/remoting/fake_media_resource.h
index dfebff96b1b5c3990bc1e8701dc113f8178ae31d..30e1a6786b6bec27d9737929392723e8e25f4d0a 100644
--- a/media/remoting/fake_demuxer_stream_provider.h
+++ b/media/remoting/fake_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_DEMUXER_STREAM_PROVIDER_H_
-#define MEDIA_REMOTING_FAKE_DEMUXER_STREAM_PROVIDER_H_
+#ifndef MEDIA_REMOTING_FAKE_MEDIA_RESOURCE_H_
+#define MEDIA_REMOTING_FAKE_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"
 
@@ -33,7 +33,6 @@ class FakeDemuxerStream : public DemuxerStream {
   VideoRotation video_rotation() override;
   bool enabled() const override;
   void set_enabled(bool enabled, base::TimeDelta timestamp) override {}
-  void SetStreamStatusChangeCB(const StreamStatusChangeCB& cb) override {}
 
   void CreateFakeFrame(size_t size, bool key_frame, int pts_ms);
 
@@ -49,21 +48,22 @@ class FakeDemuxerStream : public DemuxerStream {
 };
 
 // Audio only demuxer stream provider
-class FakeDemuxerStreamProvider : public DemuxerStreamProvider {
+class FakeMediaResource : public MediaResource {
  public:
-  FakeDemuxerStreamProvider();
-  ~FakeDemuxerStreamProvider() final;
+  FakeMediaResource();
+  ~FakeMediaResource() final;
 
-  // DemuxerStreamProvider implementation.
-  DemuxerStream* GetStream(DemuxerStream::Type type) override;
+  // MediaResource implementation.
+  std::vector<DemuxerStream*> GetStreams() override;
+  void SetStreamStatusChangeCB(const StreamStatusChangeCB& cb) override;
 
  private:
   std::unique_ptr<FakeDemuxerStream> demuxer_stream_;
 
-  DISALLOW_COPY_AND_ASSIGN(FakeDemuxerStreamProvider);
+  DISALLOW_COPY_AND_ASSIGN(FakeMediaResource);
 };
 
 }  // namespace remoting
 }  // namespace media
 
-#endif  // MEDIA_REMOTING_FAKE_DEMUXER_STREAM_PROVIDER_H_
+#endif  // MEDIA_REMOTING_FAKE_MEDIA_RESOURCE_H_