Remove reference counting from media::Demuxer and friends.

webkit/media/websourcebuffer_impl.h

Index: webkit/media/websourcebuffer_impl.h
diff --git a/webkit/media/websourcebuffer_impl.h b/webkit/media/websourcebuffer_impl.h
index e4718f3a4a0c6dfc1edef71b3d84aee1b8be3ffe..bd80c44df324da529e555c7f1d04c42147bdd76e 100644
--- a/webkit/media/websourcebuffer_impl.h
+++ b/webkit/media/websourcebuffer_impl.h
@@ -7,7 +7,8 @@
 
 #include <string>
 
-#include "base/memory/ref_counted.h"
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSourceBuffer.h"
 
 namespace media {
@@ -18,8 +19,7 @@ namespace webkit_media {
 
 class WebSourceBufferImpl : public WebKit::WebSourceBuffer {
  public:
-  WebSourceBufferImpl(const std::string& id,
-                      scoped_refptr<media::ChunkDemuxer> demuxer);
+  WebSourceBufferImpl(const std::string& id, media::ChunkDemuxer* demuxer);
   virtual ~WebSourceBufferImpl();
 
   // WebKit::WebSourceBuffer implementation.
@@ -31,7 +31,7 @@ class WebSourceBufferImpl : public WebKit::WebSourceBuffer {
 
  private:
   std::string id_;
-  scoped_refptr<media::ChunkDemuxer> demuxer_;
+  media::ChunkDemuxer* demuxer_;  // Owned by WebMediaPlayerImpl::pipeline_.

[scherkus (not reviewing), 2013/04/17 17:21:59]

is there a UAF bug here if pipeline hits an error?

[acolwell GONE FROM CHROMIUM, 2013/04/17 20:24:53]

yes.

 
   DISALLOW_COPY_AND_ASSIGN(WebSourceBufferImpl);
 };