Move Liveness from DemuxerStreamProvider to DemuxerStream.

media/mojo/services/mojo_demuxer_stream_adapter.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 "media/mojo/services/mojo_demuxer_stream_adapter.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "media/base/decoder_buffer.h"
 #include "media/mojo/services/media_type_converters.h"
@@ skipping 29 matching lines @@
   DCHECK(!audio_config_queue_.empty());
   return audio_config_queue_.front();
 }
 
 VideoDecoderConfig MojoDemuxerStreamAdapter::video_decoder_config() {
   DCHECK_EQ(type_, DemuxerStream::VIDEO);
   DCHECK(!video_config_queue_.empty());
   return video_config_queue_.front();
 }
 
-DemuxerStream::Type MojoDemuxerStreamAdapter::type() {
+DemuxerStream::Type MojoDemuxerStreamAdapter::type() const {
   return type_;
 }
 
 void MojoDemuxerStreamAdapter::EnableBitstreamConverter() {
   NOTIMPLEMENTED();
 }
 
 bool MojoDemuxerStreamAdapter::SupportsConfigChanges() {
   return true;
 }
 
 VideoRotation MojoDemuxerStreamAdapter::video_rotation() {
   NOTIMPLEMENTED();
   return VIDEO_ROTATION_0;
 }
 
+// TODO(xhwang): Pass liveness here.
 void MojoDemuxerStreamAdapter::OnStreamReady(
     mojo::ScopedDataPipeConsumerHandle pipe) {
   DVLOG(1) << __FUNCTION__;
   // TODO(tim): We don't support pipe streaming yet.
   DCHECK(!pipe.is_valid());
   DCHECK_NE(type_, DemuxerStream::UNKNOWN);
   stream_ready_cb_.Run();
 }
 
 void MojoDemuxerStreamAdapter::OnAudioDecoderConfigChanged(
@@ skipping 51 matching lines @@
       if (video_config_queue_.empty())
         return;
     }
   }
 
   read_cb_.Run(media_status, media_buffer);
   read_cb_.Reset();
 }
 
 }  // namespace media