Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(992)

Unified Diff: media/filters/video_decoder_unittest.cc

Issue 126170: Make the generated stubs weak. Enable the unittests that had conflicting symbols. (Closed)
Patch Set: Fix indent.w Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/test_video_decoder.h ('k') | media/filters/video_renderer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/video_decoder_unittest.cc
diff --git a/media/filters/video_decoder_unittest.cc b/media/filters/video_decoder_unittest.cc
index d400d2fe02b7e436f48f81545da757d845d2fad1..621371c6faa0f1224b6c0a47e752d905de17536e 100644
--- a/media/filters/video_decoder_unittest.cc
+++ b/media/filters/video_decoder_unittest.cc
@@ -15,16 +15,11 @@
using media::FilterFactoryCollection;
using media::InstanceFilterFactory;
-using media::MockAudioDecoder;
-using media::MockAudioRenderer;
-using media::MockDataSource;
-using media::MockDemuxer;
-using media::MockFilterConfig;
-using media::MockFilterFactory;
-using media::MockVideoRenderer;
using media::PipelineImpl;
using media::TestVideoDecoder;
-using media::VideoFrame;
+using media::old_mocks::InitializationHelper;
+using media::old_mocks::MockFilterConfig;
+using media::old_mocks::MockFilterFactory;
TEST(VideoDecoder, CreateTestDecoder) {
std::string url("");
@@ -34,7 +29,7 @@ TEST(VideoDecoder, CreateTestDecoder) {
scoped_refptr<FilterFactoryCollection> c = new FilterFactoryCollection();
c->AddFactory(new InstanceFilterFactory<TestVideoDecoder>(test_decoder));
c->AddFactory(new MockFilterFactory(&config));
- media::InitializationHelper h;
+ InitializationHelper h;
h.Start(&p, c, url);
p.SetPlaybackRate(1.0f);
p.Stop();
« no previous file with comments | « media/filters/test_video_decoder.h ('k') | media/filters/video_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698