summaryrefslogtreecommitdiffstats
path: root/webkit/media
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-12 22:09:08 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-12 22:09:08 +0000
commit6f78ca9ab42253faad220a75e5786961d1034516 (patch)
tree89fd1f49e2dab30da6211fb24aadb45c81a4318a /webkit/media
parentb3a691ff60465d695404c0bb7ca8830e30483cda (diff)
downloadchromium_src-6f78ca9ab42253faad220a75e5786961d1034516.zip
chromium_src-6f78ca9ab42253faad220a75e5786961d1034516.tar.gz
chromium_src-6f78ca9ab42253faad220a75e5786961d1034516.tar.bz2
Remove obsolete references to http://crbug.com/109026
TBR=scherkus BUG=none TEST=none Review URL: http://codereview.chromium.org/9186041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
-rw-r--r--webkit/media/buffered_data_source_unittest.cc5
-rw-r--r--webkit/media/webmediaplayer_impl.cc2
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));