MediaResource refactoring to support multiple streams

media/base/demuxer_stream.h

Index: media/base/demuxer_stream.h
diff --git a/media/base/demuxer_stream.h b/media/base/demuxer_stream.h
index 82d5d048318fad1994c5b8fd445fad527f39e93c..54aa745e42570c4e6b7a14f00ab87f6e6da5e31c 100644
--- a/media/base/demuxer_stream.h
+++ b/media/base/demuxer_stream.h
@@ -94,6 +94,9 @@ class MEDIA_EXPORT DemuxerStream {
 
   virtual VideoRotation video_rotation() = 0;
 
+  // TODO(servolk): Remove enabled / set_enabled methods from DemuxerStream
+  // interface, since those are only called from demuxers.
+
   // Indicates whether a DemuxerStream is currently enabled (i.e. should be
   // decoded and rendered) or not.
   virtual bool enabled() const = 0;
@@ -104,13 +107,6 @@ class MEDIA_EXPORT DemuxerStream {
   // reading data from a key frame preceeding the |timestamp|.
   virtual void set_enabled(bool enabled, base::TimeDelta timestamp) = 0;
 
-  // The StreamStatusChangeCB allows DemuxerStream clients to receive
-  // notifications about the stream being disabled or enabled.
-  // The first parameter indicates whether the stream is enabled or disabled.
-  // The second parameter is the playback position when the change occured.
-  using StreamStatusChangeCB = base::Callback<void(bool, base::TimeDelta)>;
-  virtual void SetStreamStatusChangeCB(const StreamStatusChangeCB& cb) = 0;
-
  protected:
   // Only allow concrete implementations to get deleted.
   virtual ~DemuxerStream();