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

Unified Diff: media/filters/file_data_source_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/ffmpeg_video_decoder_unittest.cc ('k') | media/filters/test_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/file_data_source_unittest.cc
diff --git a/media/filters/file_data_source_unittest.cc b/media/filters/file_data_source_unittest.cc
index 1d2f054faf836defa2bd46bff6835eef412a78be..8ef1b4b0589113fa871198e4d32ace54b03aa3a0 100644
--- a/media/filters/file_data_source_unittest.cc
+++ b/media/filters/file_data_source_unittest.cc
@@ -25,16 +25,13 @@
using media::FileDataSource;
using media::FilterFactory;
using media::FilterFactoryCollection;
-using media::InitializationHelper;
using media::MediaFormat;
-using media::MockDemuxer;
-using media::MockAudioDecoder;
-using media::MockAudioRenderer;
-using media::MockFilterConfig;
-using media::MockFilterFactory;
using media::MockFilterHost;
using media::MockPipeline;
using media::PipelineImpl;
+using media::old_mocks::InitializationHelper;
+using media::old_mocks::MockFilterConfig;
+using media::old_mocks::MockFilterFactory;
namespace {
« no previous file with comments | « media/filters/ffmpeg_video_decoder_unittest.cc ('k') | media/filters/test_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698