Move DataSourceHost to BufferedDataSourceHost.

content/renderer/media/webmediaplayer_impl.h

Index: content/renderer/media/webmediaplayer_impl.h
diff --git a/content/renderer/media/webmediaplayer_impl.h b/content/renderer/media/webmediaplayer_impl.h
index d59b7c2a390fe0a6d82ec322f3886447643abe0b..a2c0c1898ac443c83560b0a9f6a98884948e0931 100644
--- a/content/renderer/media/webmediaplayer_impl.h
+++ b/content/renderer/media/webmediaplayer_impl.h
@@ -13,6 +13,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
+#include "content/common/content_export.h"
+#include "content/renderer/media/buffered_data_source.h"
 #include "content/renderer/media/crypto/proxy_decryptor.h"
 #include "content/renderer/media/video_frame_compositor.h"
 #include "media/base/audio_renderer_sink.h"
@@ -63,7 +65,7 @@ class WebTextTrackImpl;
 // The canonical implementation of blink::WebMediaPlayer that's backed by
 // media::Pipeline. Handles normal resource loading, Media Source, and
 // Encrypted Media.
-class WebMediaPlayerImpl
+class CONTENT_EXPORT WebMediaPlayerImpl
     : public blink::WebMediaPlayer,
       public base::SupportsWeakPtr<WebMediaPlayerImpl> {
  public:
@@ -114,6 +116,8 @@ class WebMediaPlayerImpl
   virtual blink::WebMediaPlayer::NetworkState networkState() const;
   virtual blink::WebMediaPlayer::ReadyState readyState() const;
 
+  // TODO(sandersd): Change this to non-const in blink::WebMediaPlayer.
+  // http://crbug.com/360251
   virtual bool didLoadingProgress() const;
 
   virtual bool hasSingleSecurityOrigin() const;
@@ -244,9 +248,6 @@ class WebMediaPlayerImpl
   blink::WebMediaPlayer::NetworkState network_state_;
   blink::WebMediaPlayer::ReadyState ready_state_;
 
-  // Keep a list of buffered time ranges.
-  blink::WebTimeRanges buffered_;
-
   // Message loops for posting tasks on Chrome's main thread. Also used
   // for DCHECKs so methods calls won't execute in the wrong thread.
   const scoped_refptr<base::MessageLoopProxy> main_loop_;
@@ -320,6 +321,8 @@ class WebMediaPlayerImpl
   scoped_ptr<media::Demuxer> demuxer_;
   media::ChunkDemuxer* chunk_demuxer_;
 
+  BufferedDataSourceHostImpl buffered_;
+
   // Temporary for EME v0.1. In the future the init data type should be passed
   // through GenerateKeyRequest() directly from WebKit.
   std::string init_data_type_;