Move Liveness from DemuxerStreamProvider to DemuxerStream.

media/mojo/services/media_renderer_apptest.cc

 // Copyright 2014 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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/channel_layout.h"
 #include "media/base/demuxer_stream_provider.h"
@@ skipping 33 matching lines @@
  public:
   FakeDemuxerStream() {}
   ~FakeDemuxerStream() override {}
 
   // media::Demuxer implementation.
   media::DemuxerStream* GetStream(media::DemuxerStream::Type type) override {
     if (type == media::DemuxerStream::AUDIO)
       return this;
     return nullptr;
   }
-  media::DemuxerStreamProvider::Liveness GetLiveness() const override {
-    return media::DemuxerStreamProvider::LIVENESS_UNKNOWN;
-  }
 
   // media::DemuxerStream implementation.
   void Read(const ReadCB& read_cb) override {}
 
   media::AudioDecoderConfig audio_decoder_config() override {
     media::AudioDecoderConfig config;
     config.Initialize(media::kCodecAAC,
                       media::kSampleFormatU8,
                       media::CHANNEL_LAYOUT_SURROUND,
                       48000,
                       NULL,
                       0,
                       false,
                       false,
                       base::TimeDelta(),
                       0);
     return config;
   }
 
   media::VideoDecoderConfig video_decoder_config() override {
     NOTREACHED();
     return media::VideoDecoderConfig();
   }
 
-  media::DemuxerStream::Type type() override {
+  media::DemuxerStream::Type type() const override {
     return media::DemuxerStream::AUDIO;
   }
 
   void EnableBitstreamConverter() override {}
 
   bool SupportsConfigChanges() override { return true; }
 
   media::VideoRotation video_rotation() override {
     NOTREACHED();
     return media::VIDEO_ROTATION_0;
@@ skipping 62 matching lines @@
       media::Renderer::PaintCB(), base::Closure(),
       base::Bind(&ErrorCallback, &expected_error));
   base::MessageLoop::current()->Run();
 
   // We expect an error during initialization because MojoRendererService
   // doesn't initialize any decoders, which causes an error.
   EXPECT_EQ(PIPELINE_ERROR_COULD_NOT_RENDER, expected_error);
 }
 
 }  // namespace media