summaryrefslogtreecommitdiffstats
path: root/media/base
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-06 20:53:33 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-06 20:53:33 +0000
commitd51052575e84344fb934c87c14d3dde2037a0284 (patch)
treefe196140305308749d3c8e5d4b52e4986f566a97 /media/base
parented2c9c3d1e75a88c273020be59820d1735af39f0 (diff)
downloadchromium_src-d51052575e84344fb934c87c14d3dde2037a0284.zip
chromium_src-d51052575e84344fb934c87c14d3dde2037a0284.tar.gz
chromium_src-d51052575e84344fb934c87c14d3dde2037a0284.tar.bz2
Remove explicit casting needed from the .Pass() switchover, now that PassAs() exists.
BUG=none TEST=none Review URL: http://codereview.chromium.org/9317115 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120607 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
-rw-r--r--media/base/mock_filters.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/media/base/mock_filters.cc b/media/base/mock_filters.cc
index 9c116b7..bf07511 100644
--- a/media/base/mock_filters.cc
+++ b/media/base/mock_filters.cc
@@ -149,8 +149,7 @@ scoped_ptr<FilterCollection> MockFilterCollection::filter_collection(
if (run_build)
EXPECT_CALL(*demuxer_factory, Build(_, _));
- collection->SetDemuxerFactory(scoped_ptr<DemuxerFactory>(
- demuxer_factory.release()));
+ collection->SetDemuxerFactory(demuxer_factory.PassAs<DemuxerFactory>());
collection->AddVideoDecoder(video_decoder_);
collection->AddAudioDecoder(audio_decoder_);
collection->AddVideoRenderer(video_renderer_);