MSE: Pick frame processor in ChunkDemuxer::AddId; prepare unit tests to pick processor

media/filters/chunk_demuxer.cc

Index: media/filters/chunk_demuxer.cc
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index caf15ba9b2bc8e56fe80919bc651829b43b28490..9242e2bda4c951f9aff2c0fc759ba2e00f23a71d 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -138,7 +138,7 @@ class SourceState {
   void SetSequenceMode(bool sequence_mode);
 
   // Returns the range of buffered data in this source, capped at |duration|.
-  // |ended| - Set to true if end of stream has been signalled and the special
+  // |ended| - Set to true if end of stream has been signaled and the special
   // end of stream range logic needs to be executed.
   Ranges<TimeDelta> GetBufferedRanges(TimeDelta duration, bool ended) const;
 
@@ -1106,9 +1106,11 @@ void ChunkDemuxer::CancelPendingSeek(TimeDelta seek_time) {
   base::ResetAndReturn(&seek_cb_).Run(PIPELINE_OK);
 }
 
-ChunkDemuxer::Status ChunkDemuxer::AddId(const std::string& id,
-                                         const std::string& type,
-                                         std::vector<std::string>& codecs) {
+ChunkDemuxer::Status ChunkDemuxer::AddId(
+    const std::string& id,
+    const std::string& type,
+    std::vector<std::string>& codecs,
+    const bool use_legacy_frame_processor) {
   base::AutoLock auto_lock(lock_);
 
   if ((state_ != WAITING_FOR_INIT && state_ != INITIALIZING) || IsValidId(id))
@@ -1133,6 +1135,8 @@ ChunkDemuxer::Status ChunkDemuxer::AddId(const std::string& id,
   if (has_video)
     source_id_video_ = id;
 
+  DCHECK(use_legacy_frame_processor);

[acolwell GONE FROM CHROMIUM, 2014/04/01 15:55:13]

nit: You might want to output a DLOG() message if this is false so that things
won't break when you land the Blink side change. My guess is that change will
have to include a way for the flag to become false to justify adding the method
to the WebMediaSource interface.

[wolenetz, 2014/04/02 01:43:41]

Done.

+
   scoped_ptr<FrameProcessorBase> frame_processor(new LegacyFrameProcessor(
       base::Bind(&ChunkDemuxer::IncreaseDurationIfNecessary,
                  base::Unretained(this))));