| Index: media/blink/webmediaplayer_impl.h
|
| diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
|
| index f12d951ce8eb8a280bd3643b4dbfbad6dd8476e0..7c3da6389a8cadf684fc1fc93365e2a2f8730588 100644
|
| --- a/media/blink/webmediaplayer_impl.h
|
| +++ b/media/blink/webmediaplayer_impl.h
|
| @@ -25,7 +25,6 @@
|
| #include "media/base/renderer_factory.h"
|
| #include "media/base/surface_manager.h"
|
| #include "media/base/text_track.h"
|
| -#include "media/blink/buffered_data_source.h"
|
| #include "media/blink/buffered_data_source_host_impl.h"
|
| #include "media/blink/media_blink_export.h"
|
| #include "media/blink/multibuffer_data_source.h"
|
| @@ -369,11 +368,11 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
|
| blink::WebMediaPlayer::ReadyState highest_ready_state_;
|
|
|
| // Preload state for when |data_source_| is created after setPreload().
|
| - BufferedDataSource::Preload preload_;
|
| + MultibufferDataSource::Preload preload_;
|
|
|
| // Buffering strategy for when |data_source_| is created after
|
| // setBufferingStrategy().
|
| - BufferedDataSource::BufferingStrategy buffering_strategy_;
|
| + MultibufferDataSource::BufferingStrategy buffering_strategy_;
|
|
|
| // Task runner for posting tasks on Chrome's main thread. Also used
|
| // for DCHECKs so methods calls won't execute in the wrong thread.
|
| @@ -470,7 +469,7 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
|
| //
|
| // |demuxer_| will contain the appropriate demuxer based on which resource
|
| // load strategy we're using.
|
| - std::unique_ptr<BufferedDataSourceInterface> data_source_;
|
| + std::unique_ptr<MultibufferDataSource> data_source_;
|
| std::unique_ptr<Demuxer> demuxer_;
|
| ChunkDemuxer* chunk_demuxer_;
|
|
|
|
|