media: Delete renderer/demuxer splicing code.

media/filters/video_frame_stream_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 100 matching lines @@
     decoder3_ = NULL;
     video_frame_stream_.reset();
     base::RunLoop().RunUntilIdle();
 
     DCHECK(!pending_initialize_);
     DCHECK(!pending_read_);
     DCHECK(!pending_reset_);
     DCHECK(!pending_stop_);
   }
 
-  MOCK_METHOD1(OnNewSpliceBuffer, void(base::TimeDelta));
   MOCK_METHOD0(OnWaitingForDecryptionKey, void(void));
 
   void OnStatistics(const PipelineStatistics& statistics) {
     num_decoded_bytes_unreported_ -= statistics.video_bytes_decoded;
   }
 
   void OnBytesDecoded(int count) {
     num_decoded_bytes_unreported_ += count;
   }
 
@@ skipping 481 matching lines @@
   Read();
 }
 
 TEST_P(VideoFrameStreamTest, Reset_AfterNormalRead) {
   Initialize();
   Read();
   Reset();
   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);
   SatisfyPendingCallback(DEMUXER_READ_CONFIG_CHANGE);
   Reset();
   Read();
 }
 
 TEST_P(VideoFrameStreamTest, Reset_AfterEndOfStream) {
   Initialize();
@@ skipping 474 matching lines @@
 
 TEST_P(VideoFrameStreamTest, Destroy_DuringFallbackDecoderSelection) {
   Initialize();
   decoder1_->SimulateFailureToInit();
   EnterPendingState(DECODER_REINIT);
   decoder2_->HoldNextInit();
   SatisfyPendingCallback(DECODER_REINIT);
 }
 
 }  // namespace media