| Index: media/renderers/audio_renderer_impl_unittest.cc
|
| diff --git a/media/renderers/audio_renderer_impl_unittest.cc b/media/renderers/audio_renderer_impl_unittest.cc
|
| index 3fdee31ffff59d8caf9f00ae24043b7ab7cdb96e..0f0908ae7bf1e06a6db2a5e8b993bb4cac36d411 100644
|
| --- a/media/renderers/audio_renderer_impl_unittest.cc
|
| +++ b/media/renderers/audio_renderer_impl_unittest.cc
|
| @@ -16,7 +16,6 @@
|
| #include "base/strings/stringprintf.h"
|
| #include "base/test/simple_test_tick_clock.h"
|
| #include "media/base/audio_buffer_converter.h"
|
| -#include "media/base/audio_splicer.h"
|
| #include "media/base/fake_audio_renderer_sink.h"
|
| #include "media/base/gmock_callback_support.h"
|
| #include "media/base/media_util.h"
|
| @@ -370,10 +369,6 @@ class AudioRendererImplTest : public ::testing::Test, public RendererClient {
|
| renderer_->buffer_converter_->input_frames_left_for_testing());
|
| }
|
|
|
| - bool splicer_has_next_buffer() const {
|
| - return renderer_->splicer_->HasNextBuffer();
|
| - }
|
| -
|
| base::TimeDelta CurrentMediaTime() {
|
| return renderer_->CurrentMediaTime();
|
| }
|
| @@ -673,28 +668,6 @@ TEST_F(AudioRendererImplTest, InitializeThenDestroyDuringDecoderInit) {
|
| InitializeAndDestroyDuringDecoderInit();
|
| }
|
|
|
| -TEST_F(AudioRendererImplTest, ConfigChangeDrainsConverter) {
|
| - Initialize();
|
| - Preroll();
|
| - StartTicking();
|
| -
|
| - // Drain internal buffer, we should have a pending read.
|
| - EXPECT_TRUE(ConsumeBufferedData(frames_buffered()));
|
| - WaitForPendingRead();
|
| -
|
| - // Deliver a little bit of data. Use an odd data size to ensure there is data
|
| - // left in the AudioBufferConverter. Ensure no buffers are in the splicer.
|
| - SatisfyPendingRead(InputFrames(2053));
|
| - EXPECT_FALSE(splicer_has_next_buffer());
|
| - EXPECT_GT(converter_input_frames_left().value, 0);
|
| -
|
| - // Force a config change and then ensure all buffered data has been put into
|
| - // the splicer.
|
| - force_config_change();
|
| - EXPECT_TRUE(splicer_has_next_buffer());
|
| - EXPECT_EQ(0, converter_input_frames_left().value);
|
| -}
|
| -
|
| TEST_F(AudioRendererImplTest, CurrentMediaTimeBehavior) {
|
| Initialize();
|
| Preroll();
|
|
|