Move Liveness from DemuxerStreamProvider to DemuxerStream.

media/base/stream_parser.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 "media/base/stream_parser.h"
 
 #include "media/base/buffers.h"
 #include "media/base/stream_parser_buffer.h"
 
 namespace media {
 
 StreamParser::InitParameters::InitParameters(base::TimeDelta duration)
     : duration(duration),
       auto_update_timestamp_offset(false),
-      liveness(Demuxer::LIVENESS_UNKNOWN) {
+      liveness(DemuxerStream::LIVENESS_UNKNOWN) {
 }
 
 StreamParser::StreamParser() {}
 
 StreamParser::~StreamParser() {}
 
 static bool MergeBufferQueuesInternal(
     const std::vector<const StreamParser::BufferQueue*>& buffer_queues,
     StreamParser::BufferQueue* merged_buffers) {
   // Instead of std::merge usage, this method implements a custom merge because:
@@ skipping 102 matching lines @@
        map_itr++) {
     if (!map_itr->second.empty())
       buffer_queues.push_back(&(map_itr->second));
   }
 
   // Do the merge.
   return MergeBufferQueuesInternal(buffer_queues, merged_buffers);
 }
 
 }  // namespace media