Index: media/filters/video_frame_stream_unittest.cc |
diff --git a/media/filters/video_frame_stream_unittest.cc b/media/filters/video_frame_stream_unittest.cc |
index 2ccd7cad7e96858b29832e8e929574cd2953031f..8dedd93eea35be338e05f9a40f0ce884031bbe95 100644 |
--- a/media/filters/video_frame_stream_unittest.cc |
+++ b/media/filters/video_frame_stream_unittest.cc |
@@ -118,7 +118,6 @@ class VideoFrameStreamTest |
DCHECK(!pending_stop_); |
} |
- MOCK_METHOD1(OnNewSpliceBuffer, void(base::TimeDelta)); |
MOCK_METHOD0(OnWaitingForDecryptionKey, void(void)); |
void OnStatistics(const PipelineStatistics& statistics) { |
@@ -620,26 +619,6 @@ TEST_P(VideoFrameStreamTest, Reset_AfterNormalRead) { |
Read(); |
} |
-TEST_P(VideoFrameStreamTest, Reset_AfterNormalReadWithActiveSplice) { |
- video_frame_stream_->set_splice_observer(base::Bind( |
- &VideoFrameStreamTest::OnNewSpliceBuffer, base::Unretained(this))); |
- Initialize(); |
- |
- // Send buffers with a splice timestamp, which sets the active splice flag. |
- const base::TimeDelta splice_timestamp = base::TimeDelta(); |
- demuxer_stream_->set_splice_timestamp(splice_timestamp); |
- EXPECT_CALL(*this, OnNewSpliceBuffer(splice_timestamp)).Times(AnyNumber()); |
- Read(); |
- |
- // Issue an explicit Reset() and clear the splice timestamp. |
- Reset(); |
- demuxer_stream_->set_splice_timestamp(kNoTimestamp); |
- |
- // Ensure none of the upcoming calls indicate they have a splice timestamp. |
- EXPECT_CALL(*this, OnNewSpliceBuffer(_)).Times(0); |
- Read(); |
-} |
- |
TEST_P(VideoFrameStreamTest, Reset_AfterDemuxerRead_ConfigChange) { |
Initialize(); |
EnterPendingState(DEMUXER_READ_CONFIG_CHANGE); |