| Index: media/filters/pipeline_integration_test.cc
|
| diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
|
| index 5f8076770048c71c0e16fc5138a2d29559bf36a8..afdbe2fca8f43eb62bcbe368defbd9337d9fa082 100644
|
| --- a/media/filters/pipeline_integration_test.cc
|
| +++ b/media/filters/pipeline_integration_test.cc
|
| @@ -223,10 +223,10 @@ class MockMediaSource {
|
| file_data_ = ReadTestDataFile(filename);
|
|
|
| if (initial_append_size_ == kAppendWholeFile)
|
| - initial_append_size_ = file_data_->GetDataSize();
|
| + initial_append_size_ = file_data_->get_data_size();
|
|
|
| DCHECK_GT(initial_append_size_, 0);
|
| - DCHECK_LE(initial_append_size_, file_data_->GetDataSize());
|
| + DCHECK_LE(initial_append_size_, file_data_->get_data_size());
|
| }
|
|
|
| virtual ~MockMediaSource() {}
|
| @@ -243,7 +243,7 @@ class MockMediaSource {
|
| chunk_demuxer_->Abort(kSourceId);
|
|
|
| DCHECK_GE(new_position, 0);
|
| - DCHECK_LT(new_position, file_data_->GetDataSize());
|
| + DCHECK_LT(new_position, file_data_->get_data_size());
|
| current_position_ = new_position;
|
|
|
| AppendData(seek_append_size);
|
| @@ -251,10 +251,10 @@ class MockMediaSource {
|
|
|
| void AppendData(int size) {
|
| DCHECK(chunk_demuxer_);
|
| - DCHECK_LT(current_position_, file_data_->GetDataSize());
|
| - DCHECK_LE(current_position_ + size, file_data_->GetDataSize());
|
| + DCHECK_LT(current_position_, file_data_->get_data_size());
|
| + DCHECK_LE(current_position_ + size, file_data_->get_data_size());
|
| chunk_demuxer_->AppendData(
|
| - kSourceId, file_data_->GetData() + current_position_, size);
|
| + kSourceId, file_data_->get_data() + current_position_, size);
|
| current_position_ += size;
|
| }
|
|
|
| @@ -501,7 +501,7 @@ TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_WebM) {
|
| ReadTestDataFile("bear-640x360.webm");
|
|
|
| source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
|
| - second_file->GetData(), second_file->GetDataSize());
|
| + second_file->get_data(), second_file->get_data_size());
|
|
|
| source.EndOfStream();
|
|
|
| @@ -527,7 +527,7 @@ TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_Encrypted_WebM) {
|
| ReadTestDataFile("bear-640x360-av_enc-av.webm");
|
|
|
| source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
|
| - second_file->GetData(), second_file->GetDataSize());
|
| + second_file->get_data(), second_file->get_data_size());
|
|
|
| source.EndOfStream();
|
|
|
| @@ -555,7 +555,7 @@ TEST_F(PipelineIntegrationTest,
|
| ReadTestDataFile("bear-640x360-av_enc-av.webm");
|
|
|
| source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
|
| - second_file->GetData(), second_file->GetDataSize());
|
| + second_file->get_data(), second_file->get_data_size());
|
|
|
| source.EndOfStream();
|
|
|
| @@ -586,7 +586,7 @@ TEST_F(PipelineIntegrationTest,
|
| ReadTestDataFile("bear-640x360.webm");
|
|
|
| source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
|
| - second_file->GetData(), second_file->GetDataSize());
|
| + second_file->get_data(), second_file->get_data_size());
|
|
|
| source.EndOfStream();
|
|
|
| @@ -611,7 +611,7 @@ TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_MP4) {
|
| ReadTestDataFile("bear-1280x720-av_frag.mp4");
|
|
|
| source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
|
| - second_file->GetData(), second_file->GetDataSize());
|
| + second_file->get_data(), second_file->get_data_size());
|
|
|
| source.EndOfStream();
|
|
|
| @@ -638,7 +638,7 @@ TEST_F(PipelineIntegrationTest,
|
| ReadTestDataFile("bear-1280x720-v_frag-cenc.mp4");
|
|
|
| source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
|
| - second_file->GetData(), second_file->GetDataSize());
|
| + second_file->get_data(), second_file->get_data_size());
|
|
|
| source.EndOfStream();
|
|
|
| @@ -667,7 +667,7 @@ TEST_F(PipelineIntegrationTest,
|
| ReadTestDataFile("bear-1280x720-v_frag-cenc.mp4");
|
|
|
| source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
|
| - second_file->GetData(), second_file->GetDataSize());
|
| + second_file->get_data(), second_file->get_data_size());
|
|
|
| source.EndOfStream();
|
|
|
| @@ -698,7 +698,7 @@ TEST_F(PipelineIntegrationTest,
|
| ReadTestDataFile("bear-1280x720-av_frag.mp4");
|
|
|
| source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
|
| - second_file->GetData(), second_file->GetDataSize());
|
| + second_file->get_data(), second_file->get_data_size());
|
|
|
| source.EndOfStream();
|
|
|
|
|