Mojify demuxers and allow running {Chunk/FFmpeg}Demuxer in a Utility Process

media/blink/webmediasource_impl.cc

Index: media/blink/webmediasource_impl.cc
diff --git a/media/blink/webmediasource_impl.cc b/media/blink/webmediasource_impl.cc
index 579937b56c429523d877f51181e9848f599091a5..88c93c7585a5633939e531e40cd260032521eb2a 100644
--- a/media/blink/webmediasource_impl.cc
+++ b/media/blink/webmediasource_impl.cc
@@ -6,8 +6,8 @@
 
 #include "base/guid.h"
 #include "media/base/mime_util.h"
+#include "media/base/source_buffer.h"
 #include "media/blink/websourcebuffer_impl.h"
-#include "media/filters/chunk_demuxer.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 
 using ::blink::WebString;
@@ -16,18 +16,18 @@ using ::blink::WebMediaSource;
 namespace media {
 
 #define STATIC_ASSERT_MATCHING_STATUS_ENUM(webkit_name, chromium_name) \
-  static_assert(static_cast<int>(WebMediaSource::webkit_name) == \
-                static_cast<int>(ChunkDemuxer::chromium_name),  \
+  static_assert(static_cast<int>(WebMediaSource::webkit_name) ==       \
+                    static_cast<int>(SourceBuffer::chromium_name),     \
                 "mismatching status enum values: " #webkit_name)
 STATIC_ASSERT_MATCHING_STATUS_ENUM(AddStatusOk, kOk);
 STATIC_ASSERT_MATCHING_STATUS_ENUM(AddStatusNotSupported, kNotSupported);
 STATIC_ASSERT_MATCHING_STATUS_ENUM(AddStatusReachedIdLimit, kReachedIdLimit);
 #undef STATIC_ASSERT_MATCHING_STATUS_ENUM
 
-WebMediaSourceImpl::WebMediaSourceImpl(ChunkDemuxer* demuxer,
+WebMediaSourceImpl::WebMediaSourceImpl(SourceBuffer* source_buffer,
                                        const scoped_refptr<MediaLog>& media_log)
-    : demuxer_(demuxer), media_log_(media_log) {
-  DCHECK(demuxer_);
+    : source_buffer_(source_buffer), media_log_(media_log) {
+  DCHECK(source_buffer_);
 }
 
 WebMediaSourceImpl::~WebMediaSourceImpl() {}
@@ -39,21 +39,21 @@ WebMediaSource::AddStatus WebMediaSourceImpl::addSourceBuffer(
   std::string id = base::GenerateGUID();
 
   WebMediaSource::AddStatus result = static_cast<WebMediaSource::AddStatus>(
-      demuxer_->AddId(id, type.utf8().data(), codecs.utf8().data()));
+      source_buffer_->AddId(id, type.utf8().data(), codecs.utf8().data()));
 
   if (result == WebMediaSource::AddStatusOk)
-    *source_buffer = new WebSourceBufferImpl(id, demuxer_);
+    *source_buffer = new WebSourceBufferImpl(id, source_buffer_);
 
   return result;
 }
 
 double WebMediaSourceImpl::duration() {
-  return demuxer_->GetDuration();
+  return source_buffer_->GetDuration();
 }
 
 void WebMediaSourceImpl::setDuration(double new_duration) {
   DCHECK_GE(new_duration, 0);
-  demuxer_->SetDuration(new_duration);
+  source_buffer_->SetDuration(new_duration);
 }
 
 void WebMediaSourceImpl::markEndOfStream(
@@ -71,11 +71,11 @@ void WebMediaSourceImpl::markEndOfStream(
       break;
   }
 
-  demuxer_->MarkEndOfStream(pipeline_status);
+  source_buffer_->MarkEndOfStream(pipeline_status);
 }
 
 void WebMediaSourceImpl::unmarkEndOfStream() {
-  demuxer_->UnmarkEndOfStream();
+  source_buffer_->UnmarkEndOfStream();
 }
 
 }  // namespace media