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

media/blink/webmediaplayer_impl.h

Index: media/blink/webmediaplayer_impl.h
diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
index 1b184a88858d488d68fbde6c0f5684c791cad08d..281fc0da1e06af737963b393eeb047b4fbffbe02 100644
--- a/media/blink/webmediaplayer_impl.h
+++ b/media/blink/webmediaplayer_impl.h
@@ -25,6 +25,7 @@
 #include "base/timer/elapsed_timer.h"
 #include "base/timer/timer.h"
 #include "build/build_config.h"
+#include "media/base/demuxer_factory.h"
 #include "media/base/media_observer.h"
 #include "media/base/media_tracks.h"
 #include "media/base/pipeline_impl.h"
@@ -72,7 +73,7 @@ class GLES2Interface;
 }
 
 namespace media {
-class ChunkDemuxer;
+class SourceBuffer;
 class ContentDecryptionModule;
 class MediaLog;
 class UrlIndex;
@@ -97,6 +98,7 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
       blink::WebMediaPlayerClient* client,
       blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
       WebMediaPlayerDelegate* delegate,
+      std::unique_ptr<DemuxerFactory> demuxer_factory,
       std::unique_ptr<RendererFactory> renderer_factory,
       linked_ptr<UrlIndex> url_index,
       const WebMediaPlayerParams& params);
@@ -290,6 +292,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
   void OnSurfaceRequested(bool decoder_requires_restart_for_overlay,
                           const SurfaceCreatedCB& surface_created_cb);
 
+  std::unique_ptr<Demuxer> CreateDemuxer();
+
   // Creates a Renderer via the |renderer_factory_|.
   std::unique_ptr<Renderer> CreateRenderer();
 
@@ -570,7 +574,7 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
   // load strategy we're using.
   std::unique_ptr<MultibufferDataSource> data_source_;
   std::unique_ptr<Demuxer> demuxer_;
-  ChunkDemuxer* chunk_demuxer_;
+  media::SourceBuffer* source_buffer_;
 
   std::unique_ptr<base::MemoryPressureListener> memory_pressure_listener_;
 
@@ -607,6 +611,7 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
   double volume_;
   double volume_multiplier_;
 
+  std::unique_ptr<DemuxerFactory> demuxer_factory_;
   std::unique_ptr<RendererFactory> renderer_factory_;
 
   // For requesting surfaces on behalf of the Android H/W decoder in fullscreen.