Move DataSourceHost to BufferedDataSourceHost.

media/base/pipeline.h

Index: media/base/pipeline.h
diff --git a/media/base/pipeline.h b/media/base/pipeline.h
index d3af4eeaeb9bdb61c7472cff92b6e78d893b1a70..6dd294da08ae167c2b6463a607a5e88470974344 100644
--- a/media/base/pipeline.h
+++ b/media/base/pipeline.h
@@ -76,7 +76,7 @@ typedef base::Callback<void(PipelineMetadata)> PipelineMetadataCB;
 // If any error ever happens, this object will transition to the "Error" state
 // from any state. If Stop() is ever called, this object will transition to
 // "Stopped" state.
-class MEDIA_EXPORT Pipeline : public DataSourceHost, public DemuxerHost {
+class MEDIA_EXPORT Pipeline : public DemuxerHost {
  public:
   // Constructs a media pipeline that will execute on |task_runner|.
   Pipeline(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
@@ -215,13 +215,9 @@ class MEDIA_EXPORT Pipeline : public DataSourceHost, public DemuxerHost {
   // and |seek_pending_|.
   void FinishSeek();
 
-  // DataSourceHost (by way of DemuxerHost) implementation.
-  virtual void SetTotalBytes(int64 total_bytes) OVERRIDE;
-  virtual void AddBufferedByteRange(int64 start, int64 end) OVERRIDE;
+  // DemuxerHost implementaion.
   virtual void AddBufferedTimeRange(base::TimeDelta start,
                                     base::TimeDelta end) OVERRIDE;
-
-  // DemuxerHost implementaion.
   virtual void SetDuration(base::TimeDelta duration) OVERRIDE;
   virtual void OnDemuxerError(PipelineStatus error) OVERRIDE;
   virtual void AddTextStream(DemuxerStream* text_stream,
@@ -346,16 +342,12 @@ class MEDIA_EXPORT Pipeline : public DataSourceHost, public DemuxerHost {
   bool running_;
 
   // Amount of available buffered data.  Set by filters.

[scherkus (not reviewing), 2014/04/03 21:59:37]

s/Set by filters/Reported by |demuxer_|./?

[sandersd (OOO until July 31), 2014/04/04 23:48:41]

Done.

-  Ranges<int64> buffered_byte_ranges_;
   Ranges<base::TimeDelta> buffered_time_ranges_;
 
-  // True when AddBufferedByteRange() has been called more recently than
+  // True when AddBufferedTimeRange() has been called more recently than
   // DidLoadingProgress().
   mutable bool did_loading_progress_;
 
-  // Total size of the media.  Set by filters.
-  int64 total_bytes_;
-
   // Current volume level (from 0.0f to 1.0f).  This value is set immediately
   // via SetVolume() and a task is dispatched on the task runner to notify the
   // filters.