Take advantage of the new Pass() machinery on scoped_ptr{,_malloc}.

media/base/filter_collection.h

 // Copyright (c) 2011 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.
 
 #ifndef MEDIA_BASE_FILTER_COLLECTION_H_
 #define MEDIA_BASE_FILTER_COLLECTION_H_
 
 #include <list>
 
 #include "base/memory/ref_counted.h"
 #include "media/base/filters.h"
 #include "media/base/filter_factories.h"
 
 namespace media {
 
 // This is a collection of Filter objects used to form a media playback
 // pipeline. See src/media/base/pipeline.h for more information.
 class MEDIA_EXPORT FilterCollection {
  public:
   FilterCollection();
   ~FilterCollection();
 
   // DemuxerFactory accessor methods.
-  // FilterCollection takes ownership of the factory here.
-  void SetDemuxerFactory(DemuxerFactory* factory);
+  void SetDemuxerFactory(scoped_ptr<DemuxerFactory> factory);
   DemuxerFactory* GetDemuxerFactory();
 
   // Adds a filter to the collection.
   void AddVideoDecoder(VideoDecoder* filter);
   void AddAudioDecoder(AudioDecoder* filter);
   void AddVideoRenderer(VideoRenderer* filter);
   void AddAudioRenderer(AudioRenderer* filter);
 
   // Is the collection empty?
   bool IsEmpty() const;
@@ skipping 37 matching lines @@
 
   // Helper function that searches the filters list for a specific filter type.
   void SelectFilter(FilterType filter_type, scoped_refptr<Filter>* filter_out);
 
   DISALLOW_COPY_AND_ASSIGN(FilterCollection);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_FILTER_COLLECTION_H_