Reland r136679, reverted in r136753: Delete MockDataSource, remove IsLocalSource & IsSeekable from Demuxer/Pipeline.

MockDataSource was completely unused, and Is{LocalSource,Seekable} being in the
Demuxer is leftover craxy from the DataSourceFactory / DemuxerFactory /
DownloadRateMonitor days, may they forever RIP.

BUG=120426
TBR=scherkus

Review URL: https://chromiumcodereview.appspot.com/10392069

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136770 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 24 deletions

diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc
index 56d39ff..888b962 100644
--- a/media/base/pipeline_unittest.cc
+++ b/media/base/pipeline_unittest.cc
@@ -36,8 +36,6 @@ namespace media {
 static const int kTotalBytes = 1024;
 static const int kBufferedBytes = 1024;
 static const int kBitrate = 1234;
-static const bool kLocalSource = false;
-static const bool kSeekable = true;
 
 ACTION_P(InitializeDemuxerWithError, error) {
   arg1.Run(error);
@@ -117,10 +115,6 @@ class PipelineTest : public ::testing::Test {
     // Demuxer properties.
     EXPECT_CALL(*mocks_->demuxer(), GetBitrate())
         .WillRepeatedly(Return(kBitrate));
-    EXPECT_CALL(*mocks_->demuxer(), IsLocalSource())
-        .WillRepeatedly(Return(kLocalSource));
-    EXPECT_CALL(*mocks_->demuxer(), IsSeekable())
-        .WillRepeatedly(Return(kSeekable));
 
     // Configure the demuxer to return the streams.
     for (size_t i = 0; i < streams->size(); ++i) {
@@ -800,24 +794,6 @@ TEST_F(PipelineTest, StartTimeIsNonZero) {
   EXPECT_EQ(kStartTime, pipeline_->GetCurrentTime());
 }
 
-TEST_F(PipelineTest, DemuxerProperties) {
-  CreateAudioStream();
-  CreateVideoStream();
-  MockDemuxerStreamVector streams;
-  streams.push_back(audio_stream());
-  streams.push_back(video_stream());
-
-  InitializeDemuxer(&streams);
-  InitializeAudioDecoder(audio_stream());
-  InitializeAudioRenderer();
-  InitializeVideoDecoder(video_stream());
-  InitializeVideoRenderer();
-  InitializePipeline(PIPELINE_OK);
-
-  EXPECT_EQ(kLocalSource, pipeline_->IsLocalSource());
-  EXPECT_NE(kSeekable, pipeline_->IsStreaming());
-}
-
 class FlexibleCallbackRunner : public base::DelegateSimpleThread::Delegate {
  public:
   FlexibleCallbackRunner(base::TimeDelta delay, PipelineStatus status,