Tie multibuffers to URLs

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 989964532379f96be5117c5da06ee0296c0abe93..c5c1203fd35c707cdb883f24d8ae4537de5df67a 100644
--- a/media/blink/webmediaplayer_impl.h
+++ b/media/blink/webmediaplayer_impl.h
@@ -10,18 +10,20 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
 #include "media/base/cdm_factory.h"
-#include "media/base/media_export.h"
 #include "media/base/pipeline.h"
 #include "media/base/renderer_factory.h"
 #include "media/base/text_track.h"
 #include "media/blink/buffered_data_source.h"
 #include "media/blink/buffered_data_source_host_impl.h"
 #include "media/blink/encrypted_media_player_support.h"
+#include "media/blink/media_blink_export.h"
+#include "media/blink/multibuffer_data_source.h"
 #include "media/blink/skcanvas_video_renderer.h"
 #include "media/blink/video_frame_compositor.h"
 #include "media/blink/webmediaplayer_params.h"
@@ -54,6 +56,7 @@ class ChunkDemuxer;
 class GpuVideoAcceleratorFactories;
 class MediaLog;
 class VideoFrameCompositor;
+class ResourceMultiBuffer;
 class WebAudioSourceProviderImpl;
 class WebMediaPlayerDelegate;
 class WebTextTrackImpl;
@@ -61,7 +64,7 @@ class WebTextTrackImpl;
 // The canonical implementation of blink::WebMediaPlayer that's backed by
 // Pipeline. Handles normal resource loading, Media Source, and
 // Encrypted Media.
-class MEDIA_EXPORT WebMediaPlayerImpl
+class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
     : public NON_EXPORTED_BASE(blink::WebMediaPlayer),
       public base::SupportsWeakPtr<WebMediaPlayerImpl> {
  public:
@@ -77,6 +80,7 @@ class MEDIA_EXPORT WebMediaPlayerImpl
       base::WeakPtr<WebMediaPlayerDelegate> delegate,
       scoped_ptr<RendererFactory> renderer_factory,
       CdmFactory* cdm_factory,
+      linked_ptr<ResourceMultiBuffer> resource_multibuffer,
       const WebMediaPlayerParams& params);
   ~WebMediaPlayerImpl() override;
 
@@ -311,11 +315,12 @@ class MEDIA_EXPORT WebMediaPlayerImpl
   //
   // |demuxer_| will contain the appropriate demuxer based on which resource
   // load strategy we're using.
-  scoped_ptr<BufferedDataSource> data_source_;
+  scoped_ptr<BufferedDataSourceInterface> data_source_;
   scoped_ptr<Demuxer> demuxer_;
   ChunkDemuxer* chunk_demuxer_;
 
   BufferedDataSourceHostImpl buffered_data_source_host_;
+  linked_ptr<ResourceMultiBuffer> resource_multibuffer_;
 
   // Video rendering members.
   scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;