| Index: media/filters/file_data_source.cc
|
| diff --git a/media/filters/file_data_source.cc b/media/filters/file_data_source.cc
|
| index 8fb310091754f73180bacd029ac9bab8a49ed9b0..e8b3292898f5d9d6c62feb260ed29695f44ed759 100644
|
| --- a/media/filters/file_data_source.cc
|
| +++ b/media/filters/file_data_source.cc
|
| @@ -18,25 +18,12 @@ FileDataSource::FileDataSource()
|
| FileDataSource::FileDataSource(base::File file)
|
| : force_read_errors_(false),
|
| force_streaming_(false) {
|
| - if (!file_.Initialize(file.Pass()))
|
| - return;
|
| -
|
| - UpdateHostBytes();
|
| + file_.Initialize(file.Pass());
|
| }
|
|
|
| bool FileDataSource::Initialize(const base::FilePath& file_path) {
|
| DCHECK(!file_.IsValid());
|
| -
|
| - if (!file_.Initialize(file_path))
|
| - return false;
|
| -
|
| - UpdateHostBytes();
|
| - return true;
|
| -}
|
| -
|
| -void FileDataSource::set_host(DataSourceHost* host) {
|
| - DataSource::set_host(host);
|
| - UpdateHostBytes();
|
| + return file_.Initialize(file_path);
|
| }
|
|
|
| void FileDataSource::Stop(const base::Closure& callback) {
|
| @@ -77,11 +64,4 @@ void FileDataSource::SetBitrate(int bitrate) {}
|
|
|
| FileDataSource::~FileDataSource() {}
|
|
|
| -void FileDataSource::UpdateHostBytes() {
|
| - if (host() && file_.IsValid()) {
|
| - host()->SetTotalBytes(file_.length());
|
| - host()->AddBufferedByteRange(0, file_.length());
|
| - }
|
| -}
|
| -
|
| } // namespace media
|
|
|