Move DataSourceHost to BufferedDataSourceHost.

content/renderer/media/buffered_data_source.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_H_
 #define CONTENT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "content/common/content_export.h"
 #include "content/renderer/media/buffered_resource_loader.h"
 #include "content/renderer/media/preload.h"
 #include "media/base/data_source.h"
 #include "media/base/ranges.h"
 #include "url/gurl.h"
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace media {
 class MediaLog;
 }
 
 namespace content {
 
+class CONTENT_EXPORT BufferedDataSourceHost {
+ public:
+  // Set the total size of the media file.

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

we should tweak this similar to below ("Notify the host that the size of the
media file is known", etc...)

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

Done.

+  virtual void SetTotalBytes(int64 total_bytes) = 0;
+
+  // Notify the host that byte range [start,end] has been buffered.
+  // TODO(fischman): remove this method when demuxing is push-based instead of
+  // pull-based.  http://crbug.com/131444
+  virtual void AddBufferedByteRange(int64 start, int64 end) = 0;
+
+ protected:
+  virtual ~BufferedDataSourceHost();

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

it's ok to inline this:
http://dev.chromium.org/developers/coding-style/cpp-dos-and-donts#TOC-When-yo....

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

Done.

+};
+
 // A data source capable of loading URLs and buffering the data using an
 // in-memory sliding window.
 //
 // BufferedDataSource must be created and initialized on the render thread
 // before being passed to other threads. It may be deleted on any thread.
 class CONTENT_EXPORT BufferedDataSource : public media::DataSource {
  public:
   typedef base::Callback<void(bool)> DownloadingCB;
 
   // Buffered byte range changes will be reported to |host|. |downloading_cb|
   // will be called whenever the downloading/paused state of the source changes.
-  // TODO(sandersd): Move media::DataSourceHost to
-  // content::BufferedDataSourceHost.
   BufferedDataSource(const scoped_refptr<base::MessageLoopProxy>& render_loop,
                      blink::WebFrame* frame,
                      media::MediaLog* media_log,
-                     media::DataSourceHost* host,
+                     BufferedDataSourceHost* host,
                      const DownloadingCB& downloading_cb);
   virtual ~BufferedDataSource();
 
   // Initialize this object using |url| and |cors_mode|, executing |init_cb|
   // with the result of initialization when it has completed.
   //
   // Method called on the render thread.
   typedef base::Callback<void(bool)> InitializeCB;
   void Initialize(
       const GURL& url,
@@ skipping 142 matching lines @@
 
   // Bitrate of the content, 0 if unknown.
   int bitrate_;
 
   // Current playback rate.
   float playback_rate_;
 
   scoped_refptr<media::MediaLog> media_log_;
 
   // Host object to report buffered byte range changes to.
-  media::DataSourceHost* host_;
+  BufferedDataSourceHost* host_;
 
   DownloadingCB downloading_cb_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<BufferedDataSource> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferedDataSource);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_BUFFERED_DATA_SOURCE_H_