Move splice frame setting to ChunkDemuxer(). Disable for now.

media/filters/chunk_demuxer.h

Index: media/filters/chunk_demuxer.h
diff --git a/media/filters/chunk_demuxer.h b/media/filters/chunk_demuxer.h
index cb90386eaa796ed0d4fe699adaa6d212493cfba6..589dbd8ccc5cba7690eab804830edc2b17aeb179 100644
--- a/media/filters/chunk_demuxer.h
+++ b/media/filters/chunk_demuxer.h
@@ -27,7 +27,7 @@ class ChunkDemuxerStream : public DemuxerStream {
  public:
   typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
 
-  explicit ChunkDemuxerStream(Type type);
+  explicit ChunkDemuxerStream(Type type, bool splice_frames_enabled);
   virtual ~ChunkDemuxerStream();
 
   // ChunkDemuxerStream control methods.
@@ -117,6 +117,7 @@ class ChunkDemuxerStream : public DemuxerStream {
   mutable base::Lock lock_;
   State state_;
   ReadCB read_cb_;
+  const bool splice_frames_enabled_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ChunkDemuxerStream);
 };
@@ -139,9 +140,13 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
   //   otherwise ignore them.
   // |log_cb| Run when parsing error messages need to be logged to the error
   //   console.
+  // |splice_frames_enabled| Indicates that it's okay to generate splice frames
+  //   per the MSE specification.  Renderers must understand DecoderBuffer's
+  //   splice_timestamp() field.
   ChunkDemuxer(const base::Closure& open_cb,
                const NeedKeyCB& need_key_cb,
-               const LogCB& log_cb);
+               const LogCB& log_cb,
+               bool splice_frames_enabled);
   virtual ~ChunkDemuxer();
 
   // Demuxer implementation.
@@ -367,6 +372,9 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
   std::string source_id_audio_;
   std::string source_id_video_;
 
+  // Indicates that splice frame generation is enabled.
+  const bool splice_frames_enabled_;
+
   DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
 };