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

media/base/filter_collection.cc

 // 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.
 
 #include "media/base/filter_collection.h"
 
 #include "base/logging.h"
 
 namespace media {
 
 FilterCollection::FilterCollection() {}
 
 FilterCollection::~FilterCollection() {}
 
-void FilterCollection::SetDemuxerFactory(DemuxerFactory* factory) {
-  DCHECK(factory);
-  demuxer_factory_.reset(factory);
+void FilterCollection::SetDemuxerFactory(scoped_ptr<DemuxerFactory> factory) {
+  DCHECK(factory.get());
+  demuxer_factory_ = factory.Pass();
 }
 
 DemuxerFactory* FilterCollection::GetDemuxerFactory() {
   return demuxer_factory_.get();
 }
 
 void FilterCollection::AddVideoDecoder(VideoDecoder* filter) {
   AddFilter(VIDEO_DECODER, filter);
 }
 
@@ skipping 60 matching lines @@
     ++it;
   }
 
   if (it != filters_.end()) {
     *filter_out = it->second.get();
     filters_.erase(it);
   }
 }
 
 }  // namespace media