Separate DemuxerHost from DataSourceHost.

media/base/data_source.h

Index: media/base/data_source.h
diff --git a/media/base/data_source.h b/media/base/data_source.h
index 9176c8e845c531720fec86ba6b0b165194fc0ec5..58587e73a9519079fb358021ec8bfb9cbc3ed000 100644
--- a/media/base/data_source.h
+++ b/media/base/data_source.h
@@ -11,6 +11,8 @@
 
 namespace media {
 
+// TODO(sandersd): Rename to BufferedDataSourceHost and move to
+// content/renderer/media/.
 class MEDIA_EXPORT DataSourceHost {
  public:
   // Set the total size of the media file.
@@ -21,10 +23,6 @@ class MEDIA_EXPORT DataSourceHost {
   // pull-based.  http://crbug.com/131444
   virtual void AddBufferedByteRange(int64 start, int64 end) = 0;
 
-  // Notify the host that time range [start,end] has been buffered.
-  virtual void AddBufferedTimeRange(base::TimeDelta start,
-                                    base::TimeDelta end) = 0;
-
  protected:
   virtual ~DataSourceHost();
 };
@@ -38,8 +36,6 @@ class MEDIA_EXPORT DataSource {
   DataSource();
   virtual ~DataSource();
 
-  virtual void set_host(DataSourceHost* host);
-
   // Reads |size| bytes from |position| into |data|. And when the read is done
   // or failed, |read_cb| is called with the number of bytes read or
   // kReadError in case of error.
@@ -62,12 +58,7 @@ class MEDIA_EXPORT DataSource {
   // Values of |bitrate| <= 0 are invalid and should be ignored.
   virtual void SetBitrate(int bitrate) = 0;
 
- protected:
-  DataSourceHost* host();
-
  private:
-  DataSourceHost* host_;
-
   DISALLOW_COPY_AND_ASSIGN(DataSource);
 };