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

content/renderer/media/webmediasource_impl.cc

 // Copyright 2013 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 "content/renderer/media/webmediasource_impl.h"
 
 #include "base/guid.h"
 #include "content/renderer/media/websourcebuffer_impl.h"
 #include "media/filters/chunk_demuxer.h"
 #include "third_party/WebKit/public/platform/WebCString.h"
@@ skipping 18 matching lines @@
     : demuxer_(demuxer),
       log_cb_(log_cb) {
   DCHECK(demuxer_);
 }
 
 WebMediaSourceImpl::~WebMediaSourceImpl() {}
 
 WebMediaSource::AddStatus WebMediaSourceImpl::addSourceBuffer(
     const blink::WebString& type,
     const blink::WebVector<blink::WebString>& codecs,
+    const WebMediaSource::FrameProcessorChoice frame_processor_choice,
     blink::WebSourceBuffer** source_buffer) {
   std::string id = base::GenerateGUID();
   std::vector<std::string> new_codecs(codecs.size());
   for (size_t i = 0; i < codecs.size(); ++i)
     new_codecs[i] = codecs[i].utf8().data();
+
+  bool use_legacy_frame_processor = true;
+  switch (frame_processor_choice) {
+    case UseLegacyFrameProcessor:
+      break;
+    case UseNewFrameProcessor:
+      use_legacy_frame_processor = false;

[acolwell GONE FROM CHROMIUM, 2014/04/02 18:03:15]

nit: I would have expected a default of false and the case above to set it to
true just given the naming here.

[wolenetz, 2014/04/02 18:11:23]

Done.

+      break;
+  }
+
   WebMediaSource::AddStatus result =
       static_cast<WebMediaSource::AddStatus>(
-          demuxer_->AddId(id, type.utf8().data(), new_codecs));
+          demuxer_->AddId(id, type.utf8().data(), new_codecs,
+                          use_legacy_frame_processor));
 
   if (result == WebMediaSource::AddStatusOk)
     *source_buffer = new WebSourceBufferImpl(id, demuxer_);
 
   return result;
 }
 
 double WebMediaSourceImpl::duration() {
   return demuxer_->GetDuration();
 }
@@ skipping 19 matching lines @@
   }
 
   demuxer_->MarkEndOfStream(pipeline_status);
 }
 
 void WebMediaSourceImpl::unmarkEndOfStream() {
   demuxer_->UnmarkEndOfStream();
 }
 
 }  // namespace content