Remove reference counting from media::Demuxer and friends.

webkit/media/webmediasourceclient_impl.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/webmediasourceclient_impl.h"
 
 #include "base/guid.h"
 #include "media/filters/chunk_demuxer.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
 #include "webkit/media/websourcebuffer_impl.h"
 
 using ::WebKit::WebString;
 using ::WebKit::WebMediaSourceClient;
 
 namespace webkit_media {
 
 #define COMPILE_ASSERT_MATCHING_STATUS_ENUM(webkit_name, chromium_name) \
   COMPILE_ASSERT(static_cast<int>(WebMediaSourceClient::webkit_name) == \
                  static_cast<int>(media::ChunkDemuxer::chromium_name),  \
                  mismatching_status_enums)
 COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusOk, kOk);
 COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusNotSupported, kNotSupported);
 COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusReachedIdLimit, kReachedIdLimit);
 #undef COMPILE_ASSERT_MATCHING_STATUS_ENUM
 
 WebMediaSourceClientImpl::WebMediaSourceClientImpl(
-    const scoped_refptr<media::ChunkDemuxer>& demuxer,
-    media::LogCB log_cb)
+    media::ChunkDemuxer* demuxer, media::LogCB log_cb)
     : demuxer_(demuxer),
       log_cb_(log_cb) {
   DCHECK(demuxer_);
 }
 
 WebMediaSourceClientImpl::~WebMediaSourceClientImpl() {}
 
 WebMediaSourceClient::AddStatus WebMediaSourceClientImpl::addSourceBuffer(
     const WebKit::WebString& type,
     const WebKit::WebVector<WebKit::WebString>& codecs,
@@ skipping 36 matching lines @@
       break;
     default:
       NOTIMPLEMENTED();
   }
 
   if (!demuxer_->EndOfStream(pipeline_status))
     DVLOG(1) << "EndOfStream call failed.";
 }
 
 }  // namespace webkit_media