| Index: media/blink/multibuffer_data_source_unittest.cc
|
| diff --git a/media/blink/multibuffer_data_source_unittest.cc b/media/blink/multibuffer_data_source_unittest.cc
|
| index 993aa921a1e913d7b466a669fc6056e59ea9953a..4fb90d9c6f25ed982d9ddb3ac9f9d8af615e314d 100644
|
| --- a/media/blink/multibuffer_data_source_unittest.cc
|
| +++ b/media/blink/multibuffer_data_source_unittest.cc
|
| @@ -1109,10 +1109,6 @@ TEST_F(MultibufferDataSourceTest, LocalResource_DeferStrategy) {
|
| data_source_->MediaIsPlaying();
|
| CheckCapacityDefer();
|
|
|
| - data_source_->SetBufferingStrategy(
|
| - MultibufferDataSource::BUFFERING_STRATEGY_AGGRESSIVE);
|
| - CheckCapacityDefer();
|
| -
|
| Stop();
|
| }
|
|
|
| @@ -1127,10 +1123,6 @@ TEST_F(MultibufferDataSourceTest, LocalResource_PreloadMetadata_DeferStrategy) {
|
| data_source_->MediaIsPlaying();
|
| CheckCapacityDefer();
|
|
|
| - data_source_->SetBufferingStrategy(
|
| - MultibufferDataSource::BUFFERING_STRATEGY_AGGRESSIVE);
|
| - CheckCapacityDefer();
|
| -
|
| Stop();
|
| }
|
|
|
| @@ -1145,10 +1137,6 @@ TEST_F(MultibufferDataSourceTest, ExternalResource_Reponse200_DeferStrategy) {
|
| data_source_->MediaIsPlaying();
|
| CheckCapacityDefer();
|
|
|
| - data_source_->SetBufferingStrategy(
|
| - MultibufferDataSource::BUFFERING_STRATEGY_AGGRESSIVE);
|
| - CheckCapacityDefer();
|
| -
|
| Stop();
|
| }
|
|
|
| @@ -1165,10 +1153,6 @@ TEST_F(MultibufferDataSourceTest,
|
| data_source_->MediaIsPlaying();
|
| CheckCapacityDefer();
|
|
|
| - data_source_->SetBufferingStrategy(
|
| - MultibufferDataSource::BUFFERING_STRATEGY_AGGRESSIVE);
|
| - CheckCapacityDefer();
|
| -
|
| Stop();
|
| }
|
|
|
| @@ -1182,21 +1166,11 @@ TEST_F(MultibufferDataSourceTest, ExternalResource_Reponse206_DeferStrategy) {
|
|
|
| data_source_->MediaIsPlaying();
|
| CheckCapacityDefer();
|
| - set_might_be_reused_from_cache_in_future(true);
|
| - data_source_->SetBufferingStrategy(
|
| - MultibufferDataSource::BUFFERING_STRATEGY_AGGRESSIVE);
|
| - CheckNeverDefer();
|
|
|
| - data_source_->SetBufferingStrategy(
|
| - MultibufferDataSource::BUFFERING_STRATEGY_NORMAL);
|
| + set_might_be_reused_from_cache_in_future(true);
|
| data_source_->MediaIsPlaying();
|
| CheckCapacityDefer();
|
|
|
| - set_might_be_reused_from_cache_in_future(false);
|
| - data_source_->SetBufferingStrategy(
|
| - MultibufferDataSource::BUFFERING_STRATEGY_AGGRESSIVE);
|
| - CheckCapacityDefer();
|
| -
|
| Stop();
|
| }
|
|
|
| @@ -1214,17 +1188,10 @@ TEST_F(MultibufferDataSourceTest,
|
| CheckCapacityDefer();
|
|
|
| set_might_be_reused_from_cache_in_future(true);
|
| - data_source_->SetBufferingStrategy(
|
| - MultibufferDataSource::BUFFERING_STRATEGY_AGGRESSIVE);
|
| - CheckNeverDefer();
|
| -
|
| - data_source_->SetBufferingStrategy(
|
| - MultibufferDataSource::BUFFERING_STRATEGY_NORMAL);
|
| data_source_->MediaIsPlaying();
|
| CheckCapacityDefer();
|
| +
|
| set_might_be_reused_from_cache_in_future(false);
|
| - data_source_->SetBufferingStrategy(
|
| - MultibufferDataSource::BUFFERING_STRATEGY_AGGRESSIVE);
|
| CheckCapacityDefer();
|
|
|
| Stop();
|
|
|