diff options
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/buffered_data_source_unittest.cc | 5 | ||||
| -rw-r--r-- | webkit/media/webmediaplayer_impl.cc | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/webkit/media/buffered_data_source_unittest.cc b/webkit/media/buffered_data_source_unittest.cc index b63a2c5..98a34d6 100644 --- a/webkit/media/buffered_data_source_unittest.cc +++ b/webkit/media/buffered_data_source_unittest.cc @@ -54,10 +54,7 @@ class MockBufferedDataSource : public BufferedDataSource { .WillByDefault(Assign(&loading_, true)); ON_CALL(*url_loader, cancel()) .WillByDefault(Assign(&loading_, false)); - scoped_ptr<NiceMock<MockWebURLLoader> > mwul(url_loader); - // TODO(fischman): replace the extra scoped_ptr+release() with Pass() when - // http://crbug.com/109026 is fixed. - scoped_ptr<WebURLLoader> wul(mwul.release()); + scoped_ptr<WebURLLoader> wul(url_loader); loader->SetURLLoaderForTest(wul.Pass()); return loader; } diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc index 8a181c7..4a24a61 100644 --- a/webkit/media/webmediaplayer_impl.cc +++ b/webkit/media/webmediaplayer_impl.cc @@ -194,8 +194,6 @@ void WebMediaPlayerImpl::Initialize(WebKit::WebFrame* frame) { data_source_factory->AddFactory(simple_data_source_factory.Pass()); scoped_ptr<media::DemuxerFactory> demuxer_factory( - // TODO(fischman): replace the extra scoped_ptr+release() with Pass() when - // http://crbug.com/109026 is fixed. new media::FFmpegDemuxerFactory(scoped_ptr<media::DataSourceFactory>( data_source_factory.release()), pipeline_message_loop)); |