Remove reference counting from media::Demuxer and friends.

webkit/media/webmediaplayer_impl.h

Index: webkit/media/webmediaplayer_impl.h
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
index 46f998588e3566fc94952d34e6157eec24585419..27a78e2181563eeac7fac1074cca35dfa2e74d63 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -53,6 +53,7 @@ class MessageLoopProxy;
 
 namespace media {
 class ChunkDemuxer;
+class FFmpegDemuxer;
 class MediaLog;
 }
 
@@ -230,7 +231,9 @@ class WebMediaPlayerImpl
   void NotifyDownloading(bool is_downloading);
 
   // Finishes starting the pipeline due to a call to load().
-  void StartPipeline();
+  //
+  // A non-null |media_source| will construct a Media Source pipeline.
+  void StartPipeline(WebKit::WebMediaSource* media_source);
 
   // Helpers that set the network/ready state and notifies the client if
   // they've changed.
@@ -272,10 +275,6 @@ class WebMediaPlayerImpl
   // painted.
   void FrameReady(const scoped_refptr<media::VideoFrame>& frame);
 
-  // Builds a FilterCollection based on the current configuration of
-  // WebMediaPlayerImpl.
-  scoped_ptr<media::FilterCollection> BuildFilterCollection();
-
   WebKit::WebFrame* frame_;
 
   // TODO(hclam): get rid of these members and read from the pipeline directly.
@@ -347,10 +346,11 @@ class WebMediaPlayerImpl
   bool starting_;
 
   // These two are mutually exclusive:
-  //   |data_source_| is used for regular resource loads.
+  //   |data_source_| and |ffmpeg_demuxer_| are used for regular resource loads.
   //   |chunk_demuxer_| is used for Media Source resource loads.
   scoped_refptr<BufferedDataSource> data_source_;
-  scoped_refptr<media::ChunkDemuxer> chunk_demuxer_;
+  scoped_ptr<media::FFmpegDemuxer> ffmpeg_demuxer_;

[acolwell GONE FROM CHROMIUM, 2013/04/19 18:17:59]

WDYT about just making this scoped_ptr<media::Demuxer> demuxer_; and changing
chunk_demuxer_ to media::ChunkDemuxer* ?

[scherkus (not reviewing), 2013/04/19 23:18:45]

Works for me!

+  scoped_ptr<media::ChunkDemuxer> chunk_demuxer_;
 
   // Temporary for EME v0.1. In the future the init data type should be passed
   // through GenerateKeyRequest() directly from WebKit.